PLGMAG2V2-517: Fix an issue where placing orders through GraphQL return errors or wrong results (#526)

Author: danielcivit

Observer/Gateway/AfterpayDataAssignObserver.php

@@ -32,9 +32,21 @@ public function execute(Observer $observer)
 
         $additionalData = $data->getData(PaymentInterface::KEY_ADDITIONAL_DATA);
         $payment = $this->readPaymentModelArgument($observer);
-        $payment->setAdditionalInformation('date_of_birth', $additionalData['date_of_birth'] ?? null);
-        $payment->setAdditionalInformation('gender', $additionalData['gender'] ?? null);
-        $payment->setAdditionalInformation('phone_number', $additionalData['phone_number'] ?? null);
-        $payment->setAdditionalInformation('afterpay_terms', $additionalData['afterpay_terms'] ?? null);
+
+        if (isset($additionalData['date_of_birth'])) {
+            $payment->setAdditionalInformation('date_of_birth', $additionalData['date_of_birth']);
+        }
+
+        if (isset($additionalData['gender'])) {
+            $payment->setAdditionalInformation('gender', $additionalData['gender']);
+        }
+
+        if (isset($additionalData['phone_number'])) {
+            $payment->setAdditionalInformation('phone_number', $additionalData['phone_number']);
+        }
+
+        if (isset($additionalData['afterpay_terms'])) {
+            $payment->setAdditionalInformation('afterpay_terms', $additionalData['afterpay_terms']);
+        }
     }
 }

Observer/Gateway/IdealDataAssignObserver.php

@@ -34,6 +34,14 @@ public function execute(Observer $observer): void
         $additionalData = $data->getData(PaymentInterface::KEY_ADDITIONAL_DATA);
         $payment = $this->readPaymentModelArgument($observer);
 
+        /**
+         * Return early because the event is being triggered by a GraphQL request which contains a different structure,
+         * and for that reason the request will be wrongly set as a redirect in next step.
+         */
+        if (isset($additionalData['additional_information']['issuer_id'])) {
+            return;
+        }
+
         if (empty($additionalData['issuer_id'])) {
             $payment->setAdditionalInformation(
                 'transaction_type',

Observer/Gateway/In3DataAssignObserver.php

@@ -32,8 +32,17 @@ public function execute(Observer $observer)
 
         $additionalData = $data->getData(PaymentInterface::KEY_ADDITIONAL_DATA);
         $payment = $this->readPaymentModelArgument($observer);
-        $payment->setAdditionalInformation('date_of_birth', $additionalData['date_of_birth'] ?? null);
-        $payment->setAdditionalInformation('gender', $additionalData['gender'] ?? null);
-        $payment->setAdditionalInformation('phone_number', $additionalData['phone_number'] ?? null);
+
+        if (isset($additionalData['date_of_birth'])) {
+            $payment->setAdditionalInformation('date_of_birth', $additionalData['date_of_birth']);
+        }
+
+        if (isset($additionalData['gender'])) {
+            $payment->setAdditionalInformation('gender', $additionalData['gender']);
+        }
+
+        if (isset($additionalData['phone_number'])) {
+            $payment->setAdditionalInformation('phone_number', $additionalData['phone_number']);
+        }
     }
 }