PrestaShopCorp · L3RAZ · Sep 18, 2025 · Oct 1, 2025 · Oct 1, 2025 · Oct 2, 2025
diff --git a/api/src/Http/Configuration/CheckoutClientConfigurationBuilder.php b/api/src/Http/Configuration/CheckoutClientConfigurationBuilder.php
@@ -88,6 +88,7 @@ public function build(): array
                 'Checkout-Bn-Code' => $this->env->getBnCode(),
                 'Checkout-Module-Version' => $this->moduleVersion,
                 'Checkout-Prestashop-Version' => _PS_VERSION_,
+                'Checkout-Request-Id' => $this->generate_uuid(),
             ],
         ];
 
@@ -132,4 +133,13 @@ protected function getVerify()
 
         return true;
     }
+
+    protected function generate_uuid()
+    {
+        $b = random_bytes(16);
+        $b[6] = chr(ord($b[6]) & 0x0f | 0x40);
+        $b[8] = chr(ord($b[8]) & 0x3f | 0x80);
+
+        return vsprintf('%s%s-%s-%s-%s-%s%s%s', str_split(bin2hex($b), 4));
+    }
 }
diff --git a/api/src/Http/Configuration/OrderHttpClientConfigurationBuilder.php b/api/src/Http/Configuration/OrderHttpClientConfigurationBuilder.php
@@ -100,6 +100,7 @@ public function build(): array
                 'Checkout-Hook-Url' => $this->link->getModuleLink('DispatchWebHook'),
                 'Checkout-Module-Version' => $this->moduleVersion, // version of the module
                 'Checkout-Prestashop-Version' => _PS_VERSION_, // prestashop version
+                'Checkout-Request-Id' => $this->generate_uuid(),
                 'PayPal-Merchant-Id' => $this->configuration->get(PayPalConfiguration::PS_CHECKOUT_PAYPAL_ID_MERCHANT)
             ],
         ];
@@ -145,4 +146,13 @@ protected function getVerify()
 
         return true;
     }
+
+    protected function generate_uuid()
+    {
+        $b = random_bytes(16);
+        $b[6] = chr(ord($b[6]) & 0x0f | 0x40);
+        $b[8] = chr(ord($b[8]) & 0x3f | 0x80);
+
+        return vsprintf('%s%s-%s-%s-%s-%s%s%s', str_split(bin2hex($b), 4));
+    }
 }
diff --git a/api/src/Http/Configuration/OrderShipmentTrackingConfigurationBuilder.php b/api/src/Http/Configuration/OrderShipmentTrackingConfigurationBuilder.php
@@ -87,6 +87,7 @@ public function build(): array
                 'Checkout-Bn-Code' => $this->env->getBnCode(),
                 'Checkout-Module-Version' => $this->moduleVersion,
                 'Checkout-Prestashop-Version' => _PS_VERSION_,
+                'Checkout-Request-Id' => $this->generate_uuid(),
             ],
         ];
 
@@ -117,4 +118,13 @@ public function build(): array
 
         return $configuration;
     }
+
+    protected function generate_uuid()
+    {
+        $b = random_bytes(16);
+        $b[6] = chr(ord($b[6]) & 0x0f | 0x40);
+        $b[8] = chr(ord($b[8]) & 0x3f | 0x80);
+
+        return vsprintf('%s%s-%s-%s-%s-%s%s%s', str_split(bin2hex($b), 4));
+    }
 }
diff --git a/api/src/Http/Configuration/PaymentHttpClientConfigurationBuilder.php b/api/src/Http/Configuration/PaymentHttpClientConfigurationBuilder.php
@@ -100,6 +100,7 @@ public function build(): array
                 'Checkout-Hook-Url' => $this->link->getModuleLink('DispatchWebHook'),
                 'Checkout-Module-Version' => $this->moduleVersion, // version of the module
                 'Checkout-Prestashop-Version' => _PS_VERSION_, // prestashop version
+                'Checkout-Request-Id' => $this->generate_uuid(),
                 'PayPal-Merchant-Id' => $this->configuration->get(PayPalConfiguration::PS_CHECKOUT_PAYPAL_ID_MERCHANT)
             ],
         ];
@@ -145,4 +146,13 @@ protected function getVerify()
 
         return true;
     }
+
+    protected function generate_uuid()
+    {
+        $b = random_bytes(16);
+        $b[6] = chr(ord($b[6]) & 0x0f | 0x40);
+        $b[8] = chr(ord($b[8]) & 0x3f | 0x80);
+
+        return vsprintf('%s%s-%s-%s-%s-%s%s%s', str_split(bin2hex($b), 4));
+    }
 }
diff --git a/api/src/Http/Configuration/WebhookHttpClientConfigurationBuilder.php b/api/src/Http/Configuration/WebhookHttpClientConfigurationBuilder.php
@@ -100,6 +100,7 @@ public function build(): array
                 'Checkout-Hook-Url' => $this->link->getModuleLink('DispatchWebHook'),
                 'Checkout-Module-Version' => $this->moduleVersion, // version of the module
                 'Checkout-Prestashop-Version' => _PS_VERSION_, // prestashop version
+                'Checkout-Request-Id' => $this->generate_uuid(),
                 'PayPal-Merchant-Id' => $this->configuration->get(PayPalConfiguration::PS_CHECKOUT_PAYPAL_ID_MERCHANT)
             ],
         ];
@@ -145,4 +146,13 @@ protected function getVerify()
 
         return true;
     }
+
+    protected function generate_uuid()
+    {
+        $b = random_bytes(16);
+        $b[6] = chr(ord($b[6]) & 0x0f | 0x40);
+        $b[8] = chr(ord($b[8]) & 0x3f | 0x80);
+
+        return vsprintf('%s%s-%s-%s-%s-%s%s%s', str_split(bin2hex($b), 4));
+    }
 }
diff --git a/core/src/Order/Builder/Node/ApplicationContextNodeBuilder.php b/core/src/Order/Builder/Node/ApplicationContextNodeBuilder.php
diff --git a/core/src/Order/Builder/Node/ApplicationContextNodeBuilderInterface.php b/core/src/Order/Builder/Node/ApplicationContextNodeBuilderInterface.php
diff --git a/core/src/Order/Builder/Node/PayPalPaymentSourceNodeBuilder.php b/core/src/Order/Builder/Node/PayPalPaymentSourceNodeBuilder.php
@@ -55,6 +55,11 @@ class PayPalPaymentSourceNodeBuilder implements PayPalPaymentSourceNodeBuilderIn
      */
     private $link;
 
+    /**
+     * @var bool
+     */
+    private $isVirtualCart;
+
     public function __construct(
         ConfigurationInterface $configuration,
         LinkInterface $link
@@ -87,7 +92,9 @@ public function build(): array
 
         $data['experience_context'] = [
             'brand_name' => $this->configuration->get('PS_SHOP_NAME'),
-            'shipping_preference' => $this->isExpressCheckout ? 'GET_FROM_FILE' : 'SET_PROVIDED_ADDRESS',
+            'shipping_preference' => $this->isVirtualCart ?
+                'NO_SHIPPING'
+                : ($this->isExpressCheckout ? 'GET_FROM_FILE' : 'SET_PROVIDED_ADDRESS'),
             'return_url' => $this->link->getModuleLink('validate'),
             'cancel_url' => $this->link->getModuleLink('cancel'),
         ];
@@ -135,4 +142,14 @@ public function setExpressCheckout(bool $expressCheckout): self
 
         return $this;
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function setIsVirtualCart(bool $isVirtualCart): self
+    {
+        $this->isVirtualCart = $isVirtualCart;
+
+        return $this;
+    }
 }
diff --git a/core/src/Order/Builder/OrderPayloadBuilder.php b/core/src/Order/Builder/OrderPayloadBuilder.php
@@ -166,30 +166,25 @@ private function buildOptionalPayload(bool $isFullPayload): array
         }
 
         if (!$this->expressCheckout || $this->isUpdate) {
-            $optionalPayload[] = $this->shippingNodeBuilder->setCart($this->cart)->build();
+            $this->payload['purchase_units'][0] = array_replace_recursive($this->payload['purchase_units'][0], $this->shippingNodeBuilder->setCart($this->cart)->build());
         }
 
         if (!$this->expressCheckout && !$this->isUpdate) {
             $optionalPayload[] = $this->payerNodeBuilder->setCart($this->cart)->build();
         }
 
-        if (!$this->isUpdate) {
-            $optionalPayload[] = $this->applicationContextNodeBuilder
-                ->setIsExpressCheckout($this->expressCheckout)
-                ->setIsVirtualCart($this->cart['cart']['is_virtual'])
-                ->build();
-        }
-
-        if ($this->isCard) {
+        if ($this->isCard && !$this->isUpdate) {
             $optionalPayload[] = $this->buildCardPaymentSource();
             $this->payload['purchase_units'][0] = array_merge($this->payload['purchase_units'][0], $this->buildSupplementaryData());
         }
 
-        if ($isFullPayload) {
-            $optionalPayload[] = $this->buildPaymentSource();
-            if (empty($optionalPayload['payment_source'][$this->fundingSource]['experience_context'])) {
+        if (!$this->isUpdate) {
+            $paymentSource = $this->buildPaymentSource();
+            $optionalPayload[] = $paymentSource;
+            if (empty($paymentSource['payment_source'][$this->fundingSource]['experience_context'])) {
                 $optionalPayload[] = $this->applicationContextNodeBuilder
                     ->setIsExpressCheckout($this->expressCheckout)
+                    ->setIsVirtualCart($this->cart['cart']['is_virtual'])
                     ->build();
             }
         }
@@ -265,7 +260,8 @@ private function buildPaymentSource()
 
                 $this->payPalPaymentSourceNodeBuilder->setSavePaymentMethod($this->savePaymentMethod)
                     ->setPaypalCustomerId($this->paypalCustomerId)
-                    ->setPaypalVaultId($this->paypalVaultId);
+                    ->setPaypalVaultId($this->paypalVaultId)
+                    ->setIsVirtualCart($this->cart['cart']['is_virtual']);
 
                 return $this->payPalPaymentSourceNodeBuilder->build();
         }

diff --git a/core/src/Order/Builder/OrderPayloadBuilderInterface.php b/core/src/Order/Builder/OrderPayloadBuilderInterface.php
diff --git a/core/tests/Unit/Order/Builder/Node/AmountBreakdownNodeTest.php b/core/tests/Unit/Order/Builder/Node/AmountBreakdownNodeTest.php
@@ -18,6 +18,8 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
+namespace Tests\PsCheckout\Core\Order\Builder\Node;
+
 use PHPUnit\Framework\TestCase;
 use PsCheckout\Core\Order\Builder\Node\AmountBreakdownNode;
 use PsCheckout\Utility\Common\StringUtility;

diff --git a/core/tests/Unit/Order/Builder/Node/BaseNodeBuilderTest.php b/core/tests/Unit/Order/Builder/Node/BaseNodeBuilderTest.php
@@ -18,6 +18,8 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
+namespace Tests\PsCheckout\Core\Order\Builder\Node;
+
 use PHPUnit\Framework\TestCase;
 use PsCheckout\Core\Order\Builder\Node\BaseNodeBuilder;
 use PsCheckout\Core\Settings\Configuration\PayPalConfiguration;

diff --git a/core/tests/Unit/Order/Builder/Node/CardPaymentSourceNodeBuilderTest.php b/core/tests/Unit/Order/Builder/Node/CardPaymentSourceNodeBuilderTest.php
@@ -18,6 +18,9 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
+namespace Tests\PsCheckout\Core\Order\Builder\Node;
+
+use Address;
 use PHPUnit\Framework\TestCase;
 use PsCheckout\Core\Order\Builder\Node\CardPaymentSourceNodeBuilder;
 use PsCheckout\Core\Settings\Configuration\PayPalConfiguration;

diff --git a/infrastructure/src/Logger/LoggerHandlerFactory.php b/infrastructure/src/Logger/LoggerHandlerFactory.php
@@ -59,11 +59,17 @@ public function __construct(ConfigurationInterface $configuration, ContextInterf
      */
     public function build(): HandlerInterface
     {
-        return new RotatingFileHandler(
+        $handler = new RotatingFileHandler(
             $this->getPath() . $this->getFileName(),
             $this->getMaxFiles(),
             $this->getLoggerLevel()
         );
+        $formatter = $handler->getFormatter();
+        if (method_exists($formatter, 'setMaxDepth')) {
+            $formatter->setMaxDepth(15);
+        }
+
+        return $handler;
     }
 
     /**

diff --git a/ps17/.env.dist b/ps17/.env.dist
@@ -14,4 +14,4 @@ TRACKING_API_URL_SANDBOX="https://api-sandbox.checkout.prestashop.com/tracking-a
 ORDER_API_URL_LIVE="https://api-live.checkout.prestashop.com/order-api/v1/"
 ORDER_API_URL_SANDBOX="https://api-sandbox.checkout.prestashop.com/order-api/v1/"
 WEBHOOK_API_URL_LIVE="https://api-live.checkout.prestashop.com/webhook-api/v1/"
-WEBHOOK_API_URL_SANDBOX="https://api-sandbox.checkout.prestashop.com/webhook-api/v1/"
+WEBHOOK_API_URL_SANDBOX="https://api-sandbox.checkout.prestashop.com/webhook-api/v1/"
diff --git a/ps17/config.xml b/ps17/config.xml
@@ -2,7 +2,7 @@
 <module>
     <name>ps_checkout</name>
     <displayName><![CDATA[PrestaShop Checkout]]></displayName>
-    <version><![CDATA[7.5.0.4]]></version>
+    <version><![CDATA[7.5.1.0]]></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>

diff --git a/ps8/config.xml b/ps8/config.xml
@@ -2,7 +2,7 @@
 <module>
     <name>ps_checkout</name>
     <displayName><![CDATA[PrestaShop Checkout]]></displayName>
-    <version><![CDATA[8.5.0.4]]></version>
+    <version><![CDATA[8.5.1.0]]></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>

diff --git a/ps8/ps_checkout.php b/ps8/ps_checkout.php
@@ -107,7 +107,6 @@ public function __construct()
     {
         $this->name = 'ps_checkout';
         $this->tab = 'payments_gateways';
-        $this->version = '8.5.0.4';
         $this->version = '8.5.1.0';
         $this->author = 'PrestaShop';
 

diff --git a/ps9/config.xml b/ps9/config.xml
@@ -2,7 +2,7 @@
 <module>
     <name>ps_checkout</name>
     <displayName><![CDATA[PrestaShop Checkout]]></displayName>
-    <version><![CDATA[9.5.0.4]]></version>
+    <version><![CDATA[9.5.1.0]]></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>