Merge pull request #1163 from PrestaShopCorp/release/v7.3.5.1

Release v7.3.5.1

.github/mktp-metadata.json

@@ -6,5 +6,5 @@
   "type_upgrade" : "updatemin",
   "product_type" : "module",
   "compatible_from" : "1.7.0.0",
-  "compatible_to" : "1.7.8.8"
+  "compatible_to" : "1.7.8.10"
 }

config.xml

@@ -2,7 +2,7 @@
 <module>
 	<name>ps_checkout</name>
 	<displayName><![CDATA[PrestaShop Checkout]]></displayName>
-	<version><![CDATA[7.3.5.0]]></version>
+	<version><![CDATA[7.3.5.1]]></version>
 	<description><![CDATA[Provide the most commonly used payment methods to your customers in this all-in-one module, and manage all your sales in a centralized interface.]]></description>
 	<author><![CDATA[PrestaShop]]></author>
 	<tab><![CDATA[payments_gateways]]></tab>

ps_checkout.php

@@ -123,7 +123,7 @@ class Ps_checkout extends PaymentModule
 
     // Needed in order to retrieve the module version easier (in api call headers) than instanciate
     // the module each time to get the version
-    const VERSION = '7.3.5.0';
+    const VERSION = '7.3.5.1';
 
     const INTEGRATION_DATE = '2022-14-06';
 
@@ -144,7 +144,7 @@ public function __construct()
 
         // We cannot use the const VERSION because the const is not computed by addons marketplace
         // when the zip is uploaded
-        $this->version = '7.3.5.0';
+        $this->version = '7.3.5.1';
         $this->author = 'PrestaShop';
         $this->currencies = true;
         $this->currencies_mode = 'checkbox';

src/Builder/Payload/CreateOrderPayloadBuilder.php

@@ -152,12 +152,12 @@ public function buildPayerNode()
             ],
             'email_address' => !empty($this->data['customer']['email']) ? $this->data['customer']['email'] : '',
             'address' => [
-                'address_line_1' => !empty($this->data['invoiceAddress']['address1']) ? $this->data['deliveryAddress']['address1'] : '',
-                'address_line_2' => !empty($this->data['invoiceAddress']['address2']) ? $this->data['deliveryAddress']['address2'] : '',
-                'admin_area_1' => !empty($this->data['invoiceAddressState']['name']) ? $this->data['deliveryAddressState']['name'] : '',
-                'admin_area_2' => !empty($this->data['invoiceAddress']['city']) ? $this->data['deliveryAddress']['city'] : '',
-                'country_code' => !empty($this->data['invoiceAddressCountry']['iso_code']) ? $this->data['deliveryAddressCountry']['iso_code'] : '',
-                'postal_code' => !empty($this->data['invoiceAddress']['postcode']) ? $this->data['deliveryAddress']['postcode'] : '',
+                'address_line_1' => !empty($this->data['invoiceAddress']['address1']) ? $this->data['invoiceAddress']['address1'] : '',
+                'address_line_2' => !empty($this->data['invoiceAddress']['address2']) ? $this->data['invoiceAddress']['address2'] : '',
+                'admin_area_1' => !empty($this->data['invoiceAddressState']['name']) ? $this->data['invoiceAddressState']['name'] : '',
+                'admin_area_2' => !empty($this->data['invoiceAddress']['city']) ? $this->data['invoiceAddress']['city'] : '',
+                'country_code' => !empty($this->data['invoiceAddressCountry']['iso_code']) ? $this->data['invoiceAddressCountry']['iso_code'] : '',
+                'postal_code' => !empty($this->data['invoiceAddress']['postcode']) ? $this->data['invoiceAddress']['postcode'] : '',
             ],
         ];
 

src/Order/QueryHandler/GetOrderForPaymentCompletedQueryHandler.php

@@ -94,8 +94,8 @@ public function handle(GetOrderForPaymentCompletedQuery $query)
             (int) $order->id_cart,
             (int) $order->getCurrentState(),
             (bool) $order->hasBeenPaid(),
-            (string) $order->getTotalProductsWithTaxes(), /* @phpstan-ignore-line */
-            (string) $order->getTotalPaid(),
+            (string) $order->total_paid,
+            (string) $order->total_paid_real,
             (int) $order->id_currency,
             $psCheckoutCart->getPaypalFundingSource(),
             $orderPaymentId