Merge pull request #92 from pay-now/release/1.5.2

Release/1.5.2
pay-now · Feb 22, 2024 · 1ea924a · 1ea924a
2 parents fdb0065 + d7313ff
commit 1ea924a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/Gateway/Request/Payment/AuthorizeRequest.php b/Gateway/Request/Payment/AuthorizeRequest.php
@@ -64,21 +64,28 @@ public function build(array $buildSubject)
             $request['body'][PaymentField::BUYER_FIELD_NAME][PaymentField::BUYER_EXTERNAL_ID] = $this->helper
                 ->generateBuyerExternalId($this->order->getCustomerId(), $this->order->getStoreId());
         }
+        $isRetry = (
+            $this->payment->hasAdditionalInformation(PaymentField::IS_PAYMENT_RETRY_FIELD_NAME)
+            && $this->payment->getAdditionalInformation(PaymentField::IS_PAYMENT_RETRY_FIELD_NAME) == 1
+        );
 
         if ($this->payment->hasAdditionalInformation(PaymentDataAssignObserver::PAYMENT_METHOD_ID)
-            && ! empty($this->payment->getAdditionalInformation(PaymentDataAssignObserver::PAYMENT_METHOD_ID))) {
+            && ! empty($this->payment->getAdditionalInformation(PaymentDataAssignObserver::PAYMENT_METHOD_ID))
+            && !$isRetry) {
             $request['body'][PaymentField::PAYMENT_METHOD_ID] = $this->payment
                 ->getAdditionalInformation(PaymentDataAssignObserver::PAYMENT_METHOD_ID);
         }
 
         if ($this->payment->hasAdditionalInformation(PaymentDataAssignObserver::PAYMENT_METHOD_TOKEN)
-            && ! empty($this->payment->getAdditionalInformation(PaymentDataAssignObserver::PAYMENT_METHOD_TOKEN))) {
+            && ! empty($this->payment->getAdditionalInformation(PaymentDataAssignObserver::PAYMENT_METHOD_TOKEN))
+            && !$isRetry) {
             $request['body'][PaymentField::PAYMENT_METHOD_TOKEN] = $this->payment
                 ->getAdditionalInformation(PaymentDataAssignObserver::PAYMENT_METHOD_TOKEN);
         }
 
         if ($this->payment->hasAdditionalInformation(PaymentDataAssignObserver::PAYMENT_METHOD_FINGERPRINT)
-			&& ! empty($this->payment->getAdditionalInformation(PaymentDataAssignObserver::PAYMENT_METHOD_FINGERPRINT))) {
+			&& ! empty($this->payment->getAdditionalInformation(PaymentDataAssignObserver::PAYMENT_METHOD_FINGERPRINT))
+            && !$isRetry) {
 			$request['body'][PaymentField::BUYER_FIELD_NAME][PaymentField::BUYER_DEVICE_FINGERPRINT] = $this->payment
 				->getAdditionalInformation(PaymentDataAssignObserver::PAYMENT_METHOD_FINGERPRINT);
 		}
@@ -98,7 +105,8 @@ public function build(array $buildSubject)
         }
 
         if ($this->payment->hasAdditionalInformation(PaymentDataAssignObserver::BLIK_CODE)
-            && ! empty($this->payment->getAdditionalInformation(PaymentDataAssignObserver::BLIK_CODE))) {
+            && ! empty($this->payment->getAdditionalInformation(PaymentDataAssignObserver::BLIK_CODE))
+            && !$isRetry) {
             $request['body'][PaymentField::AUTHORIZATION_CODE] = $this->payment
                 ->getAdditionalInformation(PaymentDataAssignObserver::BLIK_CODE);
         }

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "pay-now/paynow-magento2",
   "description": "Module for Paynow payments",
   "type": "magento2-module",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "license": "MIT",
   "config": {
     "allow-plugins": {

diff --git a/etc/module.xml b/etc/module.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Paynow_PaymentGateway" setup_version="1.5.1">
+    <module name="Paynow_PaymentGateway" setup_version="1.5.2">
         <sequence>
             <module name="Magento_Sales"/>
             <module name="Magento_Payment"/>