Adyen proxy minor fix.

signifyd · Oct 28, 2021 · a15f96c · a15f96c
1 parent 24a5848
commit a15f96c
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/Plugin/Adyen/Payment/Gateway/Request/CheckoutDataBuilder.php b/Plugin/Adyen/Payment/Gateway/Request/CheckoutDataBuilder.php
@@ -175,10 +175,16 @@ public function afterBuild(AdyenCheckoutDataBuilder $subject, $request)
             $request['body']['additionalData']['bin'] = $magentoRequest['paymentMethod']['additional_data']['cardBin'];
         }
 
+        if ($quote->getCustomerIsGuest()) {
+            $customerEmail = $quote->getBillingAddress()->getEmail();
+        } else {
+            $customerEmail = $quote->getCustomerEmail();
+        }
+
         $request['body']['additionalData']['teamId'] = $teamId;
         $request['body']['additionalData']['checkoutAttemptId'] = uniqid();
         $request['body']['additionalData']['enhancedSchemeData.dutyAmount'] = $this->processAmount($taxAmount);
-        $request['body']['additionalData']['riskdata.basket.item0.receiverEmail'] = $quote->getCustomer()->getEmail();
+        $request['body']['additionalData']['riskdata.basket.item0.receiverEmail'] = $customerEmail;
 
         if ($discountAmount) {
             $request['body']['additionalData']['riskdata.promotions.promotion0.promotionDiscountAmount'] =
@@ -226,9 +232,6 @@ public function afterBuild(AdyenCheckoutDataBuilder $subject, $request)
             }
         }
 
-        $createdAt = $quote->getCustomer()->getCreatedAt();
-        $createdAt = str_replace(' ', 'T', $createdAt) . "+00:00";
-
         $address = $quote->getShippingAddress()->getCity() !== null ?
             $quote->getShippingAddress() : $quote->getBillingAddress();
         $shippingData = $this->getAddressData($quote->getShippingAddress());
@@ -256,7 +259,13 @@ public function afterBuild(AdyenCheckoutDataBuilder $subject, $request)
             $request['body']['merchantRiskIndicator']['deliveryTimeframe'] = $deliveryTimeframe;
         }
 
-        $request['body']['accountInfo']['accountCreationDate'] = $createdAt;
+        $createdAt = $quote->getCustomer()->getCreatedAt();
+
+        if (isset($createdAt)) {
+            $createdAt = str_replace(' ', 'T', $createdAt) . "+00:00";
+            $request['body']['accountInfo']['accountCreationDate'] = $createdAt;
+        }
+
         $request['body']['merchantRiskIndicator']['deliveryAddressIndicator'] = $deliveryAddressIndicator;
         $request['body']['deliveryAddress'] = $adyenAddress;
 
@@ -265,7 +274,7 @@ public function afterBuild(AdyenCheckoutDataBuilder $subject, $request)
 
     public function getAddressData(\Magento\Quote\Model\Quote\Address $address)
     {
-        $data = implode($address->getStreet(), '');
+        $data = implode('', $address->getStreet());
         $data .= $address->getPostcode();
         $data .= $address->getCity();
         $data .= $address->getRegion();