Merge branch 'release/v6.1.1' into 'master'

release/v6.1.1 into master See merge request agence-dnd/marketplace/magento-2/external/module-checkout-magento2-plugin!207
checkout · May 16, 2024 · be4c7c0 · be4c7c0
2 parents d68e7be + 493d4e8
commit be4c7c0
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 35 deletions.
diff --git a/composer.json b/composer.json
@@ -7,7 +7,7 @@
         "magento/framework": ">=100.0.1"
     },
     "type": "magento2-module",
-    "version": "6.1.0",
+    "version": "6.1.1",
     "autoload": {
         "files": [
             "registration.php"

diff --git a/view/frontend/web/js/view/payment/method-renderer/checkoutcom_card_payment.js b/view/frontend/web/js/view/payment/method-renderer/checkoutcom_card_payment.js
@@ -113,9 +113,6 @@ define(
                     return Customer.isLoggedIn();
                 },
 
-                /**
-                 * @return {void}
-                 */
                 initEvents: function () {
                     var self = this;
 
@@ -141,9 +138,6 @@ define(
                     });
                 },
 
-                /**
-                 * @return {void}
-                 */
                 handleFormState: function () {
                     if (Utilities.methodIsSelected(METHOD_ID)) {
                         this.getCkoPaymentForm();
@@ -152,8 +146,6 @@ define(
 
                 /**
                  * Gets the payment form styles
-                 *
-                 * @return {void}
                  */
                 getFormStyles: function () {
                     var formStyles = this.getValue('payment_form_styles');
@@ -175,26 +167,20 @@ define(
 
                 /**
                  * Gets the payment form layout
-                 *
-                 * @return {void}
                  */
                 getFormLayout: function () {
                     return this.getValue('payment_form_layout');
                 },
 
                 /**
                  * Gets the module images path
-                 *
-                 * @return {void}
                  */
                 getImagesPath: function () {
                     return window.checkoutConfig.payment.checkoutcom_magento2.checkoutcom_data.images_path;
                 },
 
                 /**
                  * Gets the payment form
-                 *
-                 * @return {void}
                  */
                 getCkoPaymentForm: function () {
                     // Prepare the needed variables
@@ -231,7 +217,6 @@ define(
 
                 /**
                  * Loads a Frames component.
-                 * @return {void}
                  */
                 addFramesComponent: function (framesInstance) {
                     if (this.getFormLayout() == 'multi') {
@@ -245,8 +230,6 @@ define(
 
                 /**
                  * Removes the payment form
-                 *
-                 * @return {void}
                  */
                 removeCkoPaymentForm: function () {
                     // Remove the events
@@ -265,7 +248,6 @@ define(
 
                 /**
                  * Add events to Frames.
-                 * @return {void}
                  */
                 addFramesEvents: function () {
                     var self = this;
@@ -274,11 +256,12 @@ define(
                     Frames.addEventHandler(
                         Frames.Events.READY,
                         function() {
-                            var valid = Utilities.getBillingAddress() != null;
+                            const billingAddress = Utilities.getBillingAddress();
+                            self.checkBillingAdressCustomerName(billingAddress);
 
-                            if(valid) {
-                                cardholderName = Utilities.getCustomerName();
-                            }
+                            Quote.billingAddress.subscribe(function (newBillingAddress){
+                                self.checkBillingAdressCustomerName(newBillingAddress);
+                            });
                         }
                     )
 
@@ -289,8 +272,9 @@ define(
                             const valid = Frames.isCardValid()
                             if (valid) {
                                 if(cardholderName.length === 0) {
-                                    if(Utilities.getBillingAddress()) {
-                                        cardholderName = Utilities.getCustomerName();
+                                    const billingAddress = Utilities.getBillingAddress();
+                                    if (billingAddress) {
+                                        cardholderName = Utilities.getCustomerNameByBillingAddress(billingAddress);
                                     }
                                 }
 
@@ -329,9 +313,6 @@ define(
                     );
                 },
 
-                /**
-                 * @return {void}
-                 */
                 placeOrder: function () {
                     if (Utilities.methodIsSelected(METHOD_ID)) {
                         // Validate the order placement
@@ -360,11 +341,29 @@ define(
                     }
                 },
 
-                /**
-                 * @return {void}
-                 */
                 toggleTooltip: function () {
                     this.tooltipVisible(!this.tooltipVisible());
+                },
+
+                /**
+                 * @param {object} billingAddress
+                 */
+                checkBillingAdressCustomerName: function (billingAddress) {
+                    const valid = billingAddress !== null;
+
+                    if (valid) {
+                        cardholderName = Utilities.getCustomerNameByBillingAddress(billingAddress);
+                        this.setCardHolderName(cardholderName);
+                    }
+                },
+
+                /**
+                 * @param {string} cardholderName
+                 */
+                setCardHolderName: function (cardholderName) {
+                    Frames.cardholder = {
+                        name: cardholderName
+                    };
                 }
             }
         );

diff --git a/view/frontend/web/js/view/payment/utilities.js b/view/frontend/web/js/view/payment/utilities.js
@@ -267,11 +267,10 @@ define(
             /**
              * Customer name.
              *
-             * @param  {bool} return in object format.
-             * @return {mixed}  The billing address.
+             * @param {object} billingAddress
+             * @return {string}
              */
-            getCustomerName: function () {
-                var billingAddress = this.getBillingAddress();
+            getCustomerNameByBillingAddress: function (billingAddress) {
                 var customerName = '';
                 if (billingAddress && billingAddress.firstname && billingAddress.lastname) {
                         customerName += billingAddress.firstname;