Improve: Add PSP Compatibilization with Google Pay

src/Concrete/WoocommercePlatformOrderDecorator.php

@@ -763,6 +763,7 @@ private function extractPaymentDataFromGooglepay(
         }
         $newPaymentData->amount = $moneyService->floatToCents($this->getGrandTotal());
         $newPaymentData->googlepayData = $cleanJson;
+        $newPaymentData->billing_address = $this->getCustomer()->getAddress()->convertToSDKRequest();
         $newPaymentData->additionalInformation = ["googlepayData" => $cleanJson];
         $googlepayIndex = 'googlepay';
         if (!isset($paymentData[$googlepayIndex])) {

vendor/pagarme/ecommerce-module-core/src/Payment/Aggregates/Payments/GooglePayPayment.php

@@ -18,6 +18,10 @@ final class GooglePayPayment extends AbstractPayment
      */
     public $additionalInformation;
 
+    /**
+     * @var array $billingAddress
+     */
+    public $billingAddress;
 
     /**
      * @return array
@@ -27,6 +31,14 @@ public function getAdditionalInformation()
         return $this->additionalInformation;
     }
 
+    /**
+     * @param array $billingAddress
+     */
+    public function setBillingAddress($billingAddress)
+    {
+        $this->billingAddress = $billingAddress;
+    }
+
     /**
      * @param array $additionalInformation
      */
@@ -85,6 +97,11 @@ private function getStatementDescriptor()
         return $this->moduleConfig->getCardStatementDescriptor();
     }
 
+    private function getBillingAddress()
+    {
+        return $this->billingAddress;
+    }
+
     /**
      * @return CreateGooglePayPaymentRequest
      */
@@ -93,6 +110,8 @@ protected function convertToPrimitivePaymentRequest()
         $payload = new \stdClass();
         $payload->type = "google_pay";
         $payload->google_pay = $this->getGooglePayload();
-        return new CreateGooglePayPaymentRequest($this->getStatementDescriptor(), $payload);
+        $card = new \stdClass();
+        $card->billing_address = $this->getBillingAddress();
+        return new CreateGooglePayPaymentRequest($this->getStatementDescriptor(), $payload, $card);
     }
 }

vendor/pagarme/ecommerce-module-core/src/Payment/Factories/PaymentFactory.php

@@ -311,7 +311,7 @@ private function createGooglePayPayments($data)
             if (!empty($value->additionalInformation)) {
                 $payment->setAdditionalInformation($value->additionalInformation);
             }
-
+            $payment->setBillingAddress($value->billing_address);
             $payment->setAmount($value->amount);
 
             $payments[] = $payment;

vendor/pagarme/pagarmecoreapi/src/Models/CreateGooglePayPaymentRequest.php

@@ -23,16 +23,24 @@ class CreateGooglePayPaymentRequest implements JsonSerializable
      */
     public $payload;
 
+    /**
+     * @required
+     * @var object $card public property
+     */
+    public $card;
+
     /**
      * Constructor to set initial or default values of member properties
      * @param string                       $statementDescriptor         Initialization value for $this->statementDescriptor
      * @param Object                       $payload                     Initialization value for $this->payload
+     * @param Object                       $card                        Initialization value for $this->card
      */
     public function __construct()
     {
-        if (2 == func_num_args()) {
+        if (3 == func_num_args()) {
             $this->statementDescriptor  = func_get_arg(0);
             $this->payload              = func_get_arg(1);
+            $this->card                 = func_get_arg(2);
         }
     }
 
@@ -45,6 +53,7 @@ public function jsonSerialize()
         $json = array();
         $json['statement_descriptor']   = $this->statementDescriptor;
         $json['payload']                = $this->payload;
+        $json['card']                   = $this->card;
         return $json;
     }
 }