Release 2.1.3

Model/Service/Quote/TransactionService.php

@@ -205,46 +205,37 @@ public function getPaymentPageUrl(Quote $quote)
      */
     public function getPossiblePaymentMethods(Quote $quote)
     {
-        $gdprEnabled = $this->scopeConfig->getValue('wallee_payment/gdpr/gdpr_enabled',
-        ScopeInterface::SCOPE_STORE, $quote->getStoreId());
+        $gdprEnabled = $this->scopeConfig->getValue(
+            'wallee_payment/gdpr/gdpr_enabled',
+            ScopeInterface::SCOPE_STORE, $quote->getStoreId()
+        );
 
-        if ($gdprEnabled != 'enabled' ){
+        if ($gdprEnabled != 'enabled') {
             $this->updateTransactionByQuote($quote);
         }
 
-        $paymentMethodsArray = $this->getPaymentMethodsArrayFromSession();
-        if (
-            ! $paymentMethodsArray ||
-            ! \array_key_exists($quote->getId(), $paymentMethodsArray) ||
-            is_null($paymentMethodsArray[$quote->getId()])
-		) {
-            $transaction = $this->getTransactionByQuote($quote);
-			$integrationMethod = $this->scopeConfig->getValue(
-				'wallee_payment/checkout/integration_method',
-				ScopeInterface::SCOPE_STORE,
-				$quote->getStoreId()
-			);
+        $transaction = $this->getTransactionByQuote($quote);
+        $integrationMethod = $this->scopeConfig->getValue(
+            'wallee_payment/checkout/integration_method',
+            ScopeInterface::SCOPE_STORE,
+            $quote->getStoreId()
+        );
+        try {
+            $paymentMethods = $this->apiClient->getApiClient()->getTransactionService()->fetchPaymentMethods(
+                $transaction->getLinkedSpaceId(),
+                $transaction->getId(),
+                $integrationMethod
+            );
+        } catch (ApiException $e) {
+            $paymentMethodsArray[$quote->getId()] = null;
             try {
-                $paymentMethods = $this->apiClient->getApiClient()->getTransactionService()->fetchPaymentMethods(
-                    $transaction->getLinkedSpaceId(),
-					$transaction->getId(),
-					$integrationMethod
-				);
-            } catch (ApiException $e) {
-                $paymentMethodsArray[$quote->getId()] = null;
-                try{
-                    $this->checkoutSession->setPaymentMethods($paymentMethodsArray);
-                } catch (LocalizedException $ignored){}
-                throw $e;
-            }
-            $this->updatePaymentMethodConfigurations($paymentMethods);
-
-            $paymentMethodsArray[$quote->getId()] = $paymentMethods;
-            try{
                 $this->checkoutSession->setPaymentMethods($paymentMethodsArray);
-            } catch (LocalizedException $ignored){}
+            } catch (LocalizedException $ignored) {
+            }
+            throw $e;
         }
-        return $paymentMethodsArray[$quote->getId()];
+        $this->updatePaymentMethodConfigurations($paymentMethods);
+        return $paymentMethods;
     }
 
     /**

README.md

@@ -12,7 +12,7 @@ This repository contains the Magento 2 extension that enables to process payment
 
 ## Documentation
 
-* [Documentation](https://plugin-documentation.wallee.com/wallee-payment/magento-2/2.1.2/docs/en/documentation.html)
+* [Documentation](https://plugin-documentation.wallee.com/wallee-payment/magento-2/2.1.3/docs/en/documentation.html)
 
 
 ## Support
@@ -30,4 +30,4 @@ We do provide special integrations for the following one step checkouts:
 
 ## License
 
-Please see the [license file](https://github.com/wallee-payment/magento-2/blob/2.1.2/LICENSE) for more information.
+Please see the [license file](https://github.com/wallee-payment/magento-2/blob/2.1.3/LICENSE) for more information.

composer.json

@@ -16,7 +16,7 @@
 		}
 	],
 	"type" : "magento2-module",
-	"version" : "2.1.2",
+	"version" : "2.1.3",
 	"require" : {
 		"php" : "~7.1.3||~7.2.0||~7.3.0||~7.4.0||~8.0||~8.1",
 		"magento/framework" : "^102.0.0||^103.0.0",

docs/en/documentation.html

@@ -22,7 +22,7 @@ <h2>Documentation</h2>				</div>
 		</a>
 	</li>
 	<li>
-		<a href="https://github.com/wallee-payment/magento-2/releases/tag/2.1.2/">
+		<a href="https://github.com/wallee-payment/magento-2/releases/tag/2.1.3/">
 			Source
 		</a>
 	</li>

etc/adminhtml/system.xml

@@ -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/2.1.2/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/2.1.3/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>
 		<wallee_payment>
 			<information>
-				<version>2.1.2</version>
+				<version>2.1.3</version>
 				<sdk_version>3.2.0</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="Wallee_Payment" setup_version="2.1.2">
+    <module name="Wallee_Payment" setup_version="2.1.3">
         <sequence>
             <module name="Magento_Sales"/>
             <module name="Magento_Payment"/>

i18n/de_DE.csv

@@ -50,7 +50,7 @@
 "Gift Wrap","Geschenkverpackung"
 "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/2.1.2/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/2.1.2/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/2.1.3/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/2.1.3/docs/en/documentation.html"" target=""_blank"">Dokumentation</a> an."
 "Inactive","Inaktiv"
 "Information","Informationen"
 "Invoice","Rechnung"

i18n/en_US.csv

@@ -50,7 +50,7 @@
 "Gift Wrap","Gift Wrap"
 "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/2.1.2/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/2.1.2/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/2.1.3/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/2.1.3/docs/en/documentation.html"" target=""_blank"">documentation</a>."
 "Inactive","Inactive"
 "Information","Information"
 "Invoice","Invoice"

i18n/fr_CH.csv

@@ -50,7 +50,7 @@
 "Gift Wrap","Papier cadeau"
 "Hold Delivery","Suspendre la livraison"
 "ID required","Pièce d'identité requise"
-"If you need help setting up the wallee extension, check out the <a href=""https://plugin-documentation.wallee.com/wallee-payment/magento-2/2.1.2/docs/en/documentation.html"" target=""_blank"">documentation</a>.","Si vous avez besoin d'aide pour configurer l'extension wallee, consultez la <a href=""https://plugin-documentation.wallee.com/wallee-payment/magento-2/2.1.2/docs/en/documentation.html"" target=""_blank"">documentation</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/2.1.3/docs/en/documentation.html"" target=""_blank"">documentation</a>.","Si vous avez besoin d'aide pour configurer l'extension wallee, consultez la <a href=""https://plugin-documentation.wallee.com/wallee-payment/magento-2/2.1.3/docs/en/documentation.html"" target=""_blank"">documentation</a> an."
 "Inactive","Inactif"
 "Information","Information"
 "Invoice","Facture"

i18n/fr_FR.csv

@@ -50,7 +50,7 @@
 "Gift Wrap","Papier cadeau"
 "Hold Delivery","Suspendre la livraison"
 "ID required","Pièce d'identité requise"
-"If you need help setting up the wallee extension, check out the <a href=""https://plugin-documentation.wallee.com/wallee-payment/magento-2/2.1.2/docs/en/documentation.html"" target=""_blank"">documentation</a>.","Si vous avez besoin d'aide pour configurer l'extension wallee, consultez la <a href=""https://plugin-documentation.wallee.com/wallee-payment/magento-2/2.1.2/docs/en/documentation.html"" target=""_blank"">documentation</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/2.1.3/docs/en/documentation.html"" target=""_blank"">documentation</a>.","Si vous avez besoin d'aide pour configurer l'extension wallee, consultez la <a href=""https://plugin-documentation.wallee.com/wallee-payment/magento-2/2.1.3/docs/en/documentation.html"" target=""_blank"">documentation</a> an."
 "Inactive","Inactif"
 "Information","Information"
 "Invoice","Facture"

i18n/it_CH.csv

@@ -50,7 +50,7 @@
 "Gift Wrap","Confezione regalo"
 "Hold Delivery","Sospendi la consegna"
 "ID required","ID richiesto"
-"If you need help setting up the wallee extension, check out the <a href=""https://plugin-documentation.wallee.com/wallee-payment/magento-2/2.1.2/docs/en/documentation.html"" target=""_blank"">documentation</a>.","Se hai bisogno di aiuto per configurare l'estensione wallee, consulta la <a href=""https://plugin-documentation.wallee.com/wallee-payment/magento-2/2.1.2/docs/en/documentation.html"" target=""_blank"">documentazione</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/2.1.3/docs/en/documentation.html"" target=""_blank"">documentation</a>.","Se hai bisogno di aiuto per configurare l'estensione wallee, consulta la <a href=""https://plugin-documentation.wallee.com/wallee-payment/magento-2/2.1.3/docs/en/documentation.html"" target=""_blank"">documentazione</a> an."
 "Inactive","Inattivo"
 "Information","Informazione"
 "Invoice","Fattura"

i18n/it_IT.csv

@@ -50,7 +50,7 @@
 "Gift Wrap","Confezione regalo"
 "Hold Delivery","Sospendi la consegna"
 "ID required","ID richiesto"
-"If you need help setting up the wallee extension, check out the <a href=""https://plugin-documentation.wallee.com/wallee-payment/magento-2/2.1.2/docs/en/documentation.html"" target=""_blank"">documentation</a>.","Se hai bisogno di aiuto per configurare l'estensione wallee, consulta la <a href=""https://plugin-documentation.wallee.com/wallee-payment/magento-2/2.1.2/docs/en/documentation.html"" target=""_blank"">documentazione</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/2.1.3/docs/en/documentation.html"" target=""_blank"">documentation</a>.","Se hai bisogno di aiuto per configurare l'estensione wallee, consulta la <a href=""https://plugin-documentation.wallee.com/wallee-payment/magento-2/2.1.3/docs/en/documentation.html"" target=""_blank"">documentazione</a> an."
 "Inactive","Inattivo"
 "Information","Informazione"
 "Invoice","Fattura"