Skip to content

Commit 8828c69

Browse files
author
Simon Schurter
committed
Release 1.0.19
1 parent 5cbc6af commit 8828c69

File tree

9 files changed

+18
-15
lines changed

9 files changed

+18
-15
lines changed

Model/Webhook/Listener/AbstractOrderRelatedListener.php

+9-6
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@ public function execute(Request $request)
9999

100100
$connection = $this->beginTransaction();
101101
try {
102-
$order = $this->getOrderByIncrementId($this->getOrderIncrementId($entity));
102+
$order = $this->getOrderByTransaction($request->getSpaceId(), $this->getTransactionId($entity));
103103
if ($order instanceof Order) {
104-
if ($order->getPostfinancecheckoutTransactionId() == $this->getTransactionId($entity)) {
104+
if ($order->getIncrementId() == $this->getOrderIncrementId($entity)) {
105105
$this->lock($order);
106106
$this->process($entity, $order->load($order->getId()));
107107
}
@@ -136,14 +136,17 @@ protected function beginTransaction()
136136
}
137137

138138
/**
139-
* Gets the order by its increment id.
139+
* Gets the order linked to the given transaction.
140140
*
141-
* @param string $incrementId
141+
* @param int $spaceId
142+
* @param int $transactionId
142143
* @return Order|NULL
143144
*/
144-
protected function getOrderByIncrementId($incrementId)
145+
protected function getOrderByTransaction($spaceId, $transactionId)
145146
{
146-
$searchCriteria = $this->_searchCriteriaBuilder->addFilter('increment_id', $incrementId)
147+
$searchCriteria = $this->_searchCriteriaBuilder
148+
->addFilter('postfinancecheckout_space_id', $spaceId)
149+
->addFilter('postfinancecheckout_transaction_id', $transactionId)
147150
->setPageSize(1)
148151
->create();
149152
$orders = $this->_orderRepository->getList($searchCriteria)->getItems();

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ This repository contains the Magento 2.3 extension that enables to process payme
1010

1111
## Documentation
1212

13-
* [Documentation](https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2.3/1.0.18/docs/en/documentation.html)
13+
* [Documentation](https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2.3/1.0.19/docs/en/documentation.html)
1414

1515
## License
1616

17-
Please see the [license file](https://github.com/pfpayments/magento-2.3/blob/1.0.18/LICENSE) for more information.
17+
Please see the [license file](https://github.com/pfpayments/magento-2.3/blob/1.0.19/LICENSE) for more information.

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
}
1919
],
2020
"type" : "magento2-module",
21-
"version" : "1.0.18",
21+
"version" : "1.0.19",
2222
"require" : {
2323
"php": "~7.1.3||~7.2.0",
2424
"magento/framework" : "^102.0.0",

docs/en/documentation.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ <h2>Documentation</h2> </div>
2121
</a>
2222
</li>
2323
<li>
24-
<a href="https://github.com/pfpayments/magento-2.3/releases/tag/1.0.18/">
24+
<a href="https://github.com/pfpayments/magento-2.3/releases/tag/1.0.19/">
2525
Source
2626
</a>
2727
</li>

etc/adminhtml/system.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<resource>PostFinanceCheckout_Payment::config</resource>
1919
<group id="information" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
2020
<label>Information</label>
21-
<comment><![CDATA[If you need help setting up the PostFinance Checkout extension, check out the <a href="https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2.3/1.0.18/docs/en/documentation.html" target="_blank">documentation</a>.]]></comment>
21+
<comment><![CDATA[If you need help setting up the PostFinance Checkout extension, check out the <a href="https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2.3/1.0.19/docs/en/documentation.html" target="_blank">documentation</a>.]]></comment>
2222
<field id="version" translate="label" type="label" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
2323
<label>Module Version</label>
2424
</field>

etc/config.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<default>
1515
<postfinancecheckout_payment>
1616
<information>
17-
<version>1.0.18</version>
17+
<version>1.0.19</version>
1818
<sdk_version>1.1.9</sdk_version>
1919
</information>
2020
<general>

etc/module.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212
-->
1313
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
14-
<module name="PostFinanceCheckout_Payment" setup_version="1.0.18">
14+
<module name="PostFinanceCheckout_Payment" setup_version="1.0.19">
1515
<sequence>
1616
<module name="Magento_Sales"/>
1717
<module name="Magento_Payment"/>

i18n/de_DE.csv

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"General","Allgemein"
4343
"Hold Delivery","Lieferung halten"
4444
"ID required","ID erforderlich"
45-
"If you need help setting up the PostFinance Checkout extension, check out the <a href=""https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2.3/1.0.18/docs/en/documentation.html"" target=""_blank"">documentation</a>.","Falls Sie Hilfe benötigen beim Einrichten der PostFinance Checkout-Erweiterung, sehen Sie sich die <a href=""https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2.3/1.0.18/docs/en/documentation.html"" target=""_blank"">Dokumentation</a> an."
45+
"If you need help setting up the PostFinance Checkout extension, check out the <a href=""https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2.3/1.0.19/docs/en/documentation.html"" target=""_blank"">documentation</a>.","Falls Sie Hilfe benötigen beim Einrichten der PostFinance Checkout-Erweiterung, sehen Sie sich die <a href=""https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2.3/1.0.19/docs/en/documentation.html"" target=""_blank"">Dokumentation</a> an."
4646
"Inactive","Inaktiv"
4747
"Information","Informationen"
4848
"Invoice","Rechnung"

i18n/en_US.csv

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"General","General"
4343
"Hold Delivery","Hold Delivery"
4444
"ID required","ID required"
45-
"If you need help setting up the PostFinance Checkout extension, check out the <a href=""https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2.3/1.0.18/docs/en/documentation.html"" target=""_blank"">documentation</a>.","If you need help setting up the PostFinance Checkout extension, check out the <a href=""https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2.3/1.0.18/docs/en/documentation.html"" target=""_blank"">documentation</a>."
45+
"If you need help setting up the PostFinance Checkout extension, check out the <a href=""https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2.3/1.0.19/docs/en/documentation.html"" target=""_blank"">documentation</a>.","If you need help setting up the PostFinance Checkout extension, check out the <a href=""https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2.3/1.0.19/docs/en/documentation.html"" target=""_blank"">documentation</a>."
4646
"Inactive","Inactive"
4747
"Information","Information"
4848
"Invoice","Invoice"

0 commit comments

Comments
 (0)