Skip to content

Commit

Permalink
Release 1.0.34
Browse files Browse the repository at this point in the history
  • Loading branch information
Simon Schurter committed Feb 19, 2019
1 parent 846080d commit 3f1e5ed
Show file tree
Hide file tree
Showing 13 changed files with 24 additions and 20 deletions.
2 changes: 1 addition & 1 deletion Controller/Adminhtml/Order/DownloadRefund.php
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ private function getRefundByExternalId($spaceId, $externalId)
if (! empty($result)) {
return \current($result);
} else {
throw new LocalizedException('The refund could not be found.');
throw new LocalizedException(\__('The refund could not be found.'));
}
}
}
4 changes: 2 additions & 2 deletions Controller/Transaction.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ protected function getOrder()
{
$orderId = $this->getRequest()->getParam('order_id');
if (empty($orderId)) {
throw new LocalizedException('The order ID has been provided.');
throw new LocalizedException(\__('The order ID has been provided.'));
}
$order = $this->orderRepository->get($orderId);

$token = $order->getWalleeSecurityToken();
if (empty($token) || $token != $this->getRequest()->getParam('token')) {
throw new LocalizedException('The wallee security token is invalid.');
throw new LocalizedException(\__('The wallee security token is invalid.'));
}

return $order;
Expand Down
6 changes: 3 additions & 3 deletions Model/Service/LineItemReductionService.php
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,8 @@ private function distributeRoundingDifference(array $reductions, $index, $remain
return $this->distributeRoundingDifference($reductions, $index + 1, $newRemainder, $baseLineItems,
$currencyCode);
} else {
if ($newRemainder != 0) {
throw new LocalizedException('Could not distribute the rounding difference.');
if ($newRemainder <= \pow(0.1, $digits + 1)) {
throw new LocalizedException(\__('Could not distribute the rounding difference.'));
} else {
return $reductions;
}
Expand Down Expand Up @@ -356,7 +356,7 @@ private function getTransactionInvoice($spaceId, $transactionId)
if (! empty($result)) {
return $result[0];
} else {
throw new LocalizedException('The transaction invoice could not be found.');
throw new LocalizedException(\__('The transaction invoice could not be found.'));
}
}

Expand Down
2 changes: 1 addition & 1 deletion Model/Service/Order/TransactionService.php
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ protected function buildUrl($route, Order $order)
$token = $order->getWalleeSecurityToken();
if (empty($token)) {
throw new LocalizedException(
'The wallee security token needs to be set on the order to build the URL.');
\__('The wallee security token needs to be set on the order to build the URL.'));
}

return $order->getStore()->getUrl($route,
Expand Down
12 changes: 8 additions & 4 deletions Model/Webhook/Listener/AbstractOrderRelatedListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -170,13 +170,17 @@ private function loadOrder($orderId)
* Gets the ID of the order linked to the given entity.
*
* @param mixed $entity
* @return int
* @return int|NULL
*/
private function getOrderId($entity)
{
$transactionInfo = $this->transactionInfoRepository->getByTransactionId($entity->getLinkedSpaceId(),
$this->getTransactionId($entity));
return $transactionInfo->getOrderId();
try {
$transactionInfo = $this->transactionInfoRepository->getByTransactionId($entity->getLinkedSpaceId(),
$this->getTransactionId($entity));
return $transactionInfo->getOrderId();
} catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
return null;
}
}

/**
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ This repository contains the Magento 2.3 extension that enables to process payme

## Documentation

* [Documentation](https://plugin-documentation.wallee.com/wallee-payment/magento-2.3/1.0.33/docs/en/documentation.html)
* [Documentation](https://plugin-documentation.wallee.com/wallee-payment/magento-2.3/1.0.34/docs/en/documentation.html)

## License

Please see the [license file](https://github.com/wallee-payment/magento-2.3/blob/1.0.33/LICENSE) for more information.
Please see the [license file](https://github.com/wallee-payment/magento-2.3/blob/1.0.34/LICENSE) for more information.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}
],
"type" : "magento2-module",
"version" : "1.0.33",
"version" : "1.0.34",
"require" : {
"php": "~7.1.3||~7.2.0",
"magento/framework" : "^102.0.0",
Expand Down
2 changes: 1 addition & 1 deletion docs/en/documentation.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ <h2>Documentation</h2> </div>
</a>
</li>
<li>
<a href="https://github.com/wallee-payment/magento-2.3/releases/tag/1.0.33/">
<a href="https://github.com/wallee-payment/magento-2.3/releases/tag/1.0.34/">
Source
</a>
</li>
Expand Down
2 changes: 1 addition & 1 deletion etc/adminhtml/system.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<resource>Wallee_Payment::config</resource>
<group id="information" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Information</label>
<comment><![CDATA[If you need help setting up the wallee extension, check out the <a href="https://plugin-documentation.wallee.com/wallee-payment/magento-2.3/1.0.33/docs/en/documentation.html" target="_blank">documentation</a>.]]></comment>
<comment><![CDATA[If you need help setting up the wallee extension, check out the <a href="https://plugin-documentation.wallee.com/wallee-payment/magento-2.3/1.0.34/docs/en/documentation.html" target="_blank">documentation</a>.]]></comment>
<field id="version" translate="label" type="label" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Module Version</label>
</field>
Expand Down
2 changes: 1 addition & 1 deletion etc/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<default>
<wallee_payment>
<information>
<version>1.0.33</version>
<version>1.0.34</version>
<sdk_version>1.1.14</sdk_version>
</information>
<general>
Expand Down
2 changes: 1 addition & 1 deletion etc/module.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
<module name="Wallee_Payment" setup_version="1.0.33">
<module name="Wallee_Payment" setup_version="1.0.34">
<sequence>
<module name="Magento_Sales"/>
<module name="Magento_Payment"/>
Expand Down
2 changes: 1 addition & 1 deletion i18n/de_DE.csv
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"General","Allgemein"
"Hold Delivery","Lieferung halten"
"ID required","ID erforderlich"
"If you need help setting up the wallee extension, check out the <a href=""https://plugin-documentation.wallee.com/wallee-payment/magento-2.3/1.0.33/docs/en/documentation.html"" target=""_blank"">documentation</a>.","Falls Sie Hilfe benötigen beim Einrichten der wallee-Erweiterung, sehen Sie sich die <a href=""https://plugin-documentation.wallee.com/wallee-payment/magento-2.3/1.0.33/docs/en/documentation.html"" target=""_blank"">Dokumentation</a> an."
"If you need help setting up the wallee extension, check out the <a href=""https://plugin-documentation.wallee.com/wallee-payment/magento-2.3/1.0.34/docs/en/documentation.html"" target=""_blank"">documentation</a>.","Falls Sie Hilfe benötigen beim Einrichten der wallee-Erweiterung, sehen Sie sich die <a href=""https://plugin-documentation.wallee.com/wallee-payment/magento-2.3/1.0.34/docs/en/documentation.html"" target=""_blank"">Dokumentation</a> an."
"Inactive","Inaktiv"
"Information","Informationen"
"Invoice","Rechnung"
Expand Down
2 changes: 1 addition & 1 deletion i18n/en_US.csv
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"General","General"
"Hold Delivery","Hold Delivery"
"ID required","ID required"
"If you need help setting up the wallee extension, check out the <a href=""https://plugin-documentation.wallee.com/wallee-payment/magento-2.3/1.0.33/docs/en/documentation.html"" target=""_blank"">documentation</a>.","If you need help setting up the wallee extension, check out the <a href=""https://plugin-documentation.wallee.com/wallee-payment/magento-2.3/1.0.33/docs/en/documentation.html"" target=""_blank"">documentation</a>."
"If you need help setting up the wallee extension, check out the <a href=""https://plugin-documentation.wallee.com/wallee-payment/magento-2.3/1.0.34/docs/en/documentation.html"" target=""_blank"">documentation</a>.","If you need help setting up the wallee extension, check out the <a href=""https://plugin-documentation.wallee.com/wallee-payment/magento-2.3/1.0.34/docs/en/documentation.html"" target=""_blank"">documentation</a>."
"Inactive","Inactive"
"Information","Information"
"Invoice","Invoice"
Expand Down

0 comments on commit 3f1e5ed

Please sign in to comment.