Release 1.0.22

Author: Simon Schurter

Model/Service/AbstractTransactionService.php

@@ -11,6 +11,7 @@
 namespace PostFinanceCheckout\Payment\Model\Service;
 
 use Magento\Customer\Model\CustomerRegistry;
+use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Model\Quote;
@@ -27,6 +28,12 @@
 abstract class AbstractTransactionService
 {
 
+    /**
+     *
+     * @var ResourceConnection
+     */
+    protected $_resource;
+
     /**
      *
      * @var Helper
@@ -65,17 +72,19 @@ abstract class AbstractTransactionService
 
     /**
      *
+     * @param ResourceConnection $resource
      * @param Helper $helper
      * @param ScopeConfigInterface $scopeConfig
      * @param CustomerRegistry $customerRegistry
      * @param CartRepositoryInterface $quoteRepository
      * @param PaymentMethodConfigurationManagementInterface $paymentMethodConfigurationManagement
      * @param ApiClient $apiClient
      */
-    public function __construct(Helper $helper, ScopeConfigInterface $scopeConfig, CustomerRegistry $customerRegistry,
+    public function __construct(ResourceConnection $resource, Helper $helper, ScopeConfigInterface $scopeConfig, CustomerRegistry $customerRegistry,
         CartRepositoryInterface $quoteRepository,
         PaymentMethodConfigurationManagementInterface $paymentMethodConfigurationManagement, ApiClient $apiClient)
     {
+        $this->_resource = $resource;
         $this->_helper = $helper;
         $this->_scopeConfig = $scopeConfig;
         $this->_customerRegistry = $customerRegistry;
@@ -116,9 +125,13 @@ public function getTransaction($spaceId, $transactionId)
      */
     protected function updateQuote(Quote $quote, Transaction $transaction)
     {
-        $quote->setPostfinancecheckoutSpaceId($transaction->getLinkedSpaceId());
-        $quote->setPostfinancecheckoutTransactionId($transaction->getId());
-        $this->_quoteRepository->save($quote);
+        $this->_resource->getConnection()->update($this->_resource->getTableName('quote'),
+            [
+                'postfinancecheckout_space_id' => $transaction->getLinkedSpaceId(),
+                'postfinancecheckout_transaction_id' => $transaction->getId(),
+            ], [
+                'entity_id = ?' => $quote->getId()
+            ]);
     }
 
     /**

Model/Service/Invoice/TransactionService.php

@@ -11,6 +11,7 @@
 namespace PostFinanceCheckout\Payment\Model\Service\Invoice;
 
 use Magento\Customer\Model\CustomerRegistry;
+use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Quote\Api\CartRepositoryInterface;
@@ -63,6 +64,7 @@ class TransactionService extends AbstractTransactionService
 
     /**
      *
+     * @param ResourceConnection $resource
      * @param Helper $helper
      * @param ScopeConfigInterface $scopeConfig
      * @param CustomerRegistry $customerRegistry
@@ -74,13 +76,13 @@ class TransactionService extends AbstractTransactionService
      * @param TransactionInfoRepositoryInterface $transactionInfoRepository
      * @param OrderTransactionService $orderTransactionService
      */
-    public function __construct(Helper $helper, ScopeConfigInterface $scopeConfig, CustomerRegistry $customerRegistry,
+    public function __construct(ResourceConnection $resource, Helper $helper, ScopeConfigInterface $scopeConfig, CustomerRegistry $customerRegistry,
         CartRepositoryInterface $quoteRepository,
         PaymentMethodConfigurationManagementInterface $paymentMethodConfigurationManagement, ApiClient $apiClient,
         LocaleHelper $localeHelper, LineItemService $lineItemService,
         TransactionInfoRepositoryInterface $transactionInfoRepository, OrderTransactionService $orderTransactionService)
     {
-        parent::__construct($helper, $scopeConfig, $customerRegistry, $quoteRepository,
+        parent::__construct($resource, $helper, $scopeConfig, $customerRegistry, $quoteRepository,
             $paymentMethodConfigurationManagement, $apiClient);
         $this->_localeHelper = $localeHelper;
         $this->_lineItemService = $lineItemService;

Model/Service/Order/TransactionService.php

@@ -11,6 +11,7 @@
 namespace PostFinanceCheckout\Payment\Model\Service\Order;
 
 use Magento\Customer\Model\CustomerRegistry;
+use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Quote\Api\CartRepositoryInterface;
@@ -65,6 +66,7 @@ class TransactionService extends AbstractTransactionService
 
     /**
      *
+     * @param ResourceConnection $resource
      * @param Helper $helper
      * @param ScopeConfigInterface $scopeConfig
      * @param CustomerRegistry $customerRegistry
@@ -74,12 +76,12 @@ class TransactionService extends AbstractTransactionService
      * @param LineItemService $lineItemService
      * @param TransactionInfoRepositoryInterface $transactionInfoRepository
      */
-    public function __construct(Helper $helper, ScopeConfigInterface $scopeConfig, CustomerRegistry $customerRegistry,
+    public function __construct(ResourceConnection $resource, Helper $helper, ScopeConfigInterface $scopeConfig, CustomerRegistry $customerRegistry,
         CartRepositoryInterface $quoteRepository,
         PaymentMethodConfigurationManagementInterface $paymentMethodConfigurationManagement, ApiClient $apiClient,
         LineItemService $lineItemService, TransactionInfoRepositoryInterface $transactionInfoRepository)
     {
-        parent::__construct($helper, $scopeConfig, $customerRegistry, $quoteRepository,
+        parent::__construct($resource, $helper, $scopeConfig, $customerRegistry, $quoteRepository,
             $paymentMethodConfigurationManagement, $apiClient);
         $this->_lineItemService = $lineItemService;
         $this->_transactionInfoRepository = $transactionInfoRepository;

Model/Service/Quote/TransactionService.php

@@ -11,6 +11,7 @@
 namespace PostFinanceCheckout\Payment\Model\Service\Quote;
 
 use Magento\Customer\Model\CustomerRegistry;
+use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Model\Quote;
@@ -57,6 +58,7 @@ class TransactionService extends AbstractTransactionService
 
     /**
      *
+     * @param ResourceConnection $resource
      * @param Helper $helper
      * @param ScopeConfigInterface $scopeConfig
      * @param CustomerRegistry $customerRegistry
@@ -65,12 +67,12 @@ class TransactionService extends AbstractTransactionService
      * @param ApiClient $apiClient
      * @param LineItemService $lineItemService
      */
-    public function __construct(Helper $helper, ScopeConfigInterface $scopeConfig, CustomerRegistry $customerRegistry,
+    public function __construct(ResourceConnection $resource, Helper $helper, ScopeConfigInterface $scopeConfig, CustomerRegistry $customerRegistry,
         CartRepositoryInterface $quoteRepository,
         PaymentMethodConfigurationManagementInterface $paymentMethodConfigurationManagement, ApiClient $apiClient,
         LineItemService $lineItemService)
     {
-        parent::__construct($helper, $scopeConfig, $customerRegistry, $quoteRepository,
+        parent::__construct($resource, $helper, $scopeConfig, $customerRegistry, $quoteRepository,
             $paymentMethodConfigurationManagement, $apiClient);
         $this->_lineItemService = $lineItemService;
     }
@@ -109,7 +111,7 @@ public function getPaymentPageUrl(Quote $quote)
      */
     public function getPossiblePaymentMethods(Quote $quote)
     {
-        if (! array_key_exists($quote->getId(), $this->possiblePaymentMethodCache) ||
+        if (! \array_key_exists($quote->getId(), $this->possiblePaymentMethodCache) ||
             $this->possiblePaymentMethodCache[$quote->getId()] == null) {
             $transaction = $this->getTransactionByQuote($quote);
             try {
@@ -135,7 +137,7 @@ public function getPossiblePaymentMethods(Quote $quote)
      */
     public function getTransactionByQuote(Quote $quote)
     {
-        if (! array_key_exists($quote->getId(), $this->transactionCache) ||
+        if (! \array_key_exists($quote->getId(), $this->transactionCache) ||
             $this->transactionCache[$quote->getId()] == null) {
             $transactionId = $quote->getPostfinancecheckoutTransactionId();
             if (empty($transactionId)) {

README.md

@@ -10,8 +10,8 @@ This repository contains the Magento 2.3 extension that enables to process payme
 
 ## Documentation
 
-* [Documentation](https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2.3/1.0.21/docs/en/documentation.html)
+* [Documentation](https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2.3/1.0.22/docs/en/documentation.html)
 
 ## License
 
-Please see the [license file](https://github.com/pfpayments/magento-2.3/blob/1.0.21/LICENSE) for more information.
+Please see the [license file](https://github.com/pfpayments/magento-2.3/blob/1.0.22/LICENSE) for more information.

composer.json

@@ -18,7 +18,7 @@
 		}
 	],
 	"type" : "magento2-module",
-	"version" : "1.0.21",
+	"version" : "1.0.22",
 	"require" : {
 		"php": "~7.1.3||~7.2.0",
 		"magento/framework" : "^102.0.0",

docs/en/documentation.html

@@ -21,7 +21,7 @@ <h2>Documentation</h2>				</div>
 		</a>
 	</li>
 	<li>
-		<a href="https://github.com/pfpayments/magento-2.3/releases/tag/1.0.21/">
+		<a href="https://github.com/pfpayments/magento-2.3/releases/tag/1.0.22/">
 			Source
 		</a>
 	</li>

etc/adminhtml/system.xml

@@ -18,7 +18,7 @@
 			<resource>PostFinanceCheckout_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 PostFinance Checkout extension, check out the <a href="https://plugin-documentation.postfinance-checkout.ch/pfpayments/magento-2.3/1.0.21/docs/en/documentation.html" target="_blank">documentation</a>.]]></comment>
+				<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.22/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>

etc/config.xml

@@ -14,7 +14,7 @@
 	<default>
 		<postfinancecheckout_payment>
 			<information>
-				<version>1.0.21</version>
+				<version>1.0.22</version>
 				<sdk_version>1.1.9</sdk_version>
 			</information>
 			<general>

etc/module.xml

@@ -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="PostFinanceCheckout_Payment" setup_version="1.0.21">
+    <module name="PostFinanceCheckout_Payment" setup_version="1.0.22">
         <sequence>
             <module name="Magento_Sales"/>
             <module name="Magento_Payment"/>

i18n/de_DE.csv

@@ -42,7 +42,7 @@
 "General","Allgemein"
 "Hold Delivery","Lieferung halten"
 "ID required","ID erforderlich"
-"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.21/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.21/docs/en/documentation.html"" target=""_blank"">Dokumentation</a> an."
+"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.22/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.22/docs/en/documentation.html"" target=""_blank"">Dokumentation</a> an."
 "Inactive","Inaktiv"
 "Information","Informationen"
 "Invoice","Rechnung"

i18n/en_US.csv

@@ -42,7 +42,7 @@
 "General","General"
 "Hold Delivery","Hold Delivery"
 "ID required","ID required"
-"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.21/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.21/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.22/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.22/docs/en/documentation.html"" target=""_blank"">documentation</a>."
 "Inactive","Inactive"
 "Information","Information"
 "Invoice","Invoice"