Merge pull request #409 from mercadopago/release/8.5.5

Release v8.5.5

Author: katelucena-meli

CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [8.5.5] - 2025-10-03
+### Fixed
+- Fix issue with checkout session data not being properly merged in blocks and classic checkout
+
 ## [8.5.4] - 2025-10-02
 ### Fixed
 - Add status validation to prevent unnecessary metadata updates

assets/js/blocks/credits.block.js

@@ -24,7 +24,7 @@ const updateCart = (props) => {
 
     const unsubscribe = onPaymentSetup(() => {
       return {
-        type: emitResponse.responseTypes.SUCCESS.Content,
+        type: emitResponse.responseTypes.SUCCESS,
         meta: {
           paymentMethodData: {...window.mpHiddenInputDataFromBlocksCheckout},
         },

build/credits.block.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'wc-blocks-registry', 'wc-settings', 'wp-element', 'wp-html-entities'), 'version' => 'da11ea7305df5e30d19e');
+<?php return array('dependencies' => array('react', 'wc-blocks-registry', 'wc-settings', 'wp-element', 'wp-html-entities'), 'version' => 'f65c62c2c94cc9e73b26');

build/credits.block.js

@@ -1,6 +1,10 @@
 CHANGELOG:
 == Changelog ==
 
+= v8.5.5 (03/10/2025) =
+* Fixed
+- Fix issue with checkout session data not being properly merged in blocks and classic checkout
+
 = v8.5.4 (02/10/2025) =
 * Fixed
 - Add status validation to prevent unnecessary metadata updates

changelog.log

@@ -1,7 +1,7 @@
 {
   "name": "woocommerce-mercadopago",
   "description": "Woocommerce MercadoPago Payment Gateway",
-  "version": "8.5.4",
+  "version": "8.5.5",
   "main": "main.js",
   "repository": {
     "type": "git",

package-lock.json

@@ -4,7 +4,7 @@ Tags: ecommerce, mercadopago, woocommerce
 Requires at least: 6.3
 Tested up to: 6.8.1
 Requires PHP: 7.4
-Stable tag: 8.5.4
+Stable tag: 8.5.5
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 
@@ -134,12 +134,8 @@ Set up both the plugin and the checkouts you want to activate on your payment av
 
 Check out our <a href="https://www.mercadopago.com.br/developers/pt/plugins_sdks/plugins/official/woo-commerce/">official documentation</a> for more information on the specific fields to configure.
 
-= v8.5.4 (02/10/2025) =
+= v8.5.5 (03/10/2025) =
 * Fixed
-- Add status validation to prevent unnecessary metadata updates
-- Fixed location id in melidata tracks for admin pages
-- Fix order-pay form validation error with Checkout Transparent payment method
-* Added
-- Improve plugin checkout metrics
+- Fix issue with checkout session data not being properly merged in blocks and classic checkout
 
 [See changelog for all versions](https://github.com/mercadopago/cart-woocommerce/blob/main/CHANGELOG.md).

package.json

@@ -412,6 +412,22 @@ public function validate_fields(): bool
         return true;
     }
 
+    public function setCheckoutSessionDataOnSessionHelperByOrderId(string $orderId)
+    {
+        $checkoutSessionData = [];
+        if (isset($_POST['mercadopago_checkout_session'])) {
+            // Classic Checkout
+            $checkoutSessionData = Form::sanitizedPostData('mercadopago_checkout_session');
+        } else {
+            // Blocks Checkout
+            $checkoutSessionData = $this->processBlocksCheckoutData('mercadopago_checkout_session', Form::sanitizedPostData());
+        }
+
+        if (!empty($checkoutSessionData)) {
+            $this->mercadopago->helpers->session->setSession('mp_checkout_session_' . $orderId, $checkoutSessionData);
+        }
+    }
+
     /**
      * Process payment and create woocommerce order
      *
@@ -449,6 +465,8 @@ public function process_payment($order_id): array
                 $this->mercadopago->orderMetadata->setCommissionData($order, $feeText);
             }
 
+            $this->setCheckoutSessionDataOnSessionHelperByOrderId($order->get_id());
+
             return $this->proccessPaymentInternal($order);
         } catch (Exception $e) {
             return $this->processReturnFail(

readme.txt

@@ -453,20 +453,6 @@ public function proccessPaymentInternal($order): array
             case 'wallet_button':
                 $this->mercadopago->logs->file->info('Preparing to render wallet button checkout', self::LOG_SOURCE);
 
-                // Store checkout session data for wallet button
-                $checkoutSessionData = [];
-                if (isset($_POST['mercadopago_checkout_session'])) {
-                    // Classic Checkout
-                    $checkoutSessionData = Form::sanitizedPostData('mercadopago_checkout_session');
-                } else {
-                    // Blocks Checkout
-                    $checkoutSessionData = $this->processBlocksCheckoutData('mercadopago_checkout_session', Form::sanitizedPostData());
-                }
-
-                if (!empty($checkoutSessionData)) {
-                    $this->mercadopago->helpers->session->setSession('mp_wallet_checkout_session_' . $order->get_id(), $checkoutSessionData);
-                }
-
                 return [
                     'result'   => 'success',
                     'redirect' => $this->mercadopago->helpers->url->setQueryVar(
@@ -581,20 +567,12 @@ private function getWalletButtonPreviewUrl(): string
     public function renderOrderForm($orderId): void
     {
         if ($this->mercadopago->helpers->url->validateQueryVar('wallet_button')) {
-            $order             = wc_get_order($orderId);
-            $checkoutSessionData = $this->mercadopago->helpers->session->getSession('mp_wallet_checkout_session_' . $orderId);
+            $order = wc_get_order($orderId);
 
             $this->transaction = new WalletButtonTransaction($this, $order);
 
-            // Set checkout data if available
-            if (!empty($checkoutSessionData)) {
-                $this->transaction->setCheckoutData($checkoutSessionData);
-            }
-
             $preference = $this->transaction->createPreference();
 
-            $this->mercadopago->helpers->session->deleteSession('mp_wallet_checkout_session_' . $orderId);
-
             $this->mercadopago->hooks->template->getWoocommerceTemplate(
                 'public/receipt/preference-modal.php',
                 [