Merge branch 'release/v4.2.0' into 'master'

release/v4.2.0 into master See merge request agence-dnd/marketplace/magento-2/external/module-checkout-magento2-plugin!69
checkout · Oct 26, 2022 · c189ff8 · c189ff8
2 parents 95d56c1 + 3fd382f
commit c189ff8
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 10 deletions.
diff --git a/Model/Methods/CardPaymentMethod.php b/Model/Methods/CardPaymentMethod.php
@@ -326,6 +326,10 @@ public function sendPaymentRequest(
         if (!$quote->getIsVirtual()) {
             $request->shipping = $api->createShippingAddress($quote);
         }
+        // Preferred scheme
+        if (isset($data['preferredScheme']) && $data['preferredScheme'] !== '') {
+            $request->processing = ['preferred_scheme' => strtolower($data['preferredScheme'])];
+        }
 
         // Save card check
         if ($isApiOrder) {

diff --git a/composer.json b/composer.json
@@ -7,7 +7,7 @@
         "magento/framework": ">=100.0.1"
     },
     "type": "magento2-module",
-    "version": "4.1.2",
+    "version": "4.2.0",
     "autoload": {
         "files": [
             "registration.php"

diff --git a/view/adminhtml/templates/payment/moto.phtml b/view/adminhtml/templates/payment/moto.phtml
@@ -29,6 +29,9 @@ use CheckoutCom\Magento2\Block\Adminhtml\Payment\Moto;
             <!-- form will be added here -->
           </div>
         </div>
+        <div class="scheme-choice-frame">
+            <!-- form will be added here -->
+        </div>
         <form id="motoCardForm" method="POST">
             <!-- Saved cards -->
             <div id="vault-container">
@@ -81,6 +84,9 @@ use CheckoutCom\Magento2\Block\Adminhtml\Payment\Moto;
             {
                 publicKey: '<?= $block->escapeHtml($block->getConfig()->getAccountKeys('checkoutcom_moto')['public_key']) ?>',
                 debug: Boolean(<?= $block->escapeHtml($block->getConfig()->getValue('debug')) ?>),
+                schemeChoice: {
+                    frameSelector: ".scheme-choice-frame"
+                },
                 cardValidationChanged: function(event) {
                     var cardholderName = $('#order-billing_address_firstname').val() + ' ' + $('#order-billing_address_lastname').val();
 

diff --git a/view/frontend/templates/account/add-card.phtml b/view/frontend/templates/account/add-card.phtml
@@ -31,6 +31,9 @@ use CheckoutCom\Magento2\Block\Account\AddCard;
         <!-- form will be added here -->
       </div>
     </div>
+    <div class="scheme-choice-frame">
+        <!-- form will be added here -->
+    </div>
     <form class="widget-container" id="saveCardForm" method="POST">
         <?= $block->getBlockHtml('formkey') ?>
         <input type="hidden" id="ckoCardToken" name="ckoCardToken">
@@ -59,6 +62,9 @@ use CheckoutCom\Magento2\Block\Account\AddCard;
             {
                 publicKey: ckoPublicKey,
                 debug: Boolean(<?= $block->escapeHtml(($block->getConfig()->getValue('debug') && $block->getConfig()->getValue('console_logging'))); ?>),
+                schemeChoice: {
+                    frameSelector: ".scheme-choice-frame"
+                },
                 cardValidationChanged: function() {
                     if (Frames.isCardValid()) {
                         Frames.submitCard();

diff --git a/view/frontend/web/css/main.css b/view/frontend/web/css/main.css
@@ -21,6 +21,8 @@
 .frames-container {
     margin-bottom: 15px;
     max-width: 650px;
+    position: relative;
+    z-index: 1;
 }
 
 .save-card-option {

diff --git a/view/frontend/web/css/main.min.css b/view/frontend/web/css/main.min.css
@@ -13,4 +13,4 @@
  * @link      https://docs.checkout.com/
  */
 
-@import url(https://cdn.checkout.com/v2/css/cko-fonts-jsicons.css?v=1.1.9);.frames-container{margin-bottom:15px;max-width: 650px}.save-card-option{margin-bottom:10px}.clr{clear:both;visibility:hidden;height:0;width:0}.checkout-agreement label{background-image:url(../images/icon-link.png);background-repeat:no-repeat;background-position:top right;padding-right:20px;background-size:13px 13px}.message.notice{overflow-wrap:break-word}
+@import url(https://cdn.checkout.com/v2/css/cko-fonts-jsicons.css?v=1.1.9);.frames-container{margin-bottom:15px;max-width: 650px;position: relative;z-index: 1;}.save-card-option{margin-bottom:10px}.clr{clear:both;visibility:hidden;height:0;width:0}.checkout-agreement label{background-image:url(../images/icon-link.png);background-repeat:no-repeat;background-position:top right;padding-right:20px;background-size:13px 13px}.message.notice{overflow-wrap:break-word}
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
@@ -43,6 +43,7 @@ define(
                     cardToken: null,
                     cardBin: null,
                     saveCard: false,
+                    preferredScheme: false,
                     supportedCards: null,
                     redirectAfterPlaceOrder: false,
                     allowPlaceOrder: ko.observable(false)
@@ -136,11 +137,11 @@ define(
                     });
 
                     // Clear frames after update billing event
-                     $(document).on('click', '.action-update', function () {
+                    $(document).on('click', '.action-update', function () {
                         if ($('#checkoutcom_card_payment').is(':checked')) {
-                             Frames.init()
+                            Frames.init()
                         }
-                     })
+                    })
                 },
 
                 /**
@@ -217,6 +218,9 @@ define(
                         {
                             publicKey: self.getValue('public_key'),
                             debug: Boolean(self.getValue('debug') && self.getValue('console_logging')),
+                            schemeChoice: {
+                                frameSelector: ".scheme-choice-frame"
+                            },
                             localization: Utilities.getShopLanguage(),
                             style: (formStyles) ? formStyles : {}
                         }
@@ -276,7 +280,7 @@ define(
                         function() {
                             var valid = Utilities.getBillingAddress() != null;
 
-                             if(valid) {
+                            if(valid) {
                                 cardholderName = Utilities.getCustomerName();
                             }
                         }
@@ -315,6 +319,7 @@ define(
                             // Store the card token and the card bin
                             self.cardToken = event.token;
                             self.cardBin =  event.bin;
+                            self.preferredScheme = event.preferred_scheme;
 
                             // Enable the submit form
                             Frames.enableSubmitForm();
@@ -323,6 +328,14 @@ define(
                             self.allowPlaceOrder(true);
                         }
                     );
+
+                    // Card bin event
+                    Frames.addEventHandler(
+                        Frames.Events.CARD_BIN_CHANGED,
+                        function (event) {
+                            self.preferredScheme = event.scheme;
+                        }
+                    );
                 },
 
                 /**
@@ -338,6 +351,7 @@ define(
                                 cardToken: this.cardToken,
                                 cardBin: this.cardBin,
                                 saveCard: this.saveCard,
+                                preferredScheme: this.preferredScheme,
                                 source: METHOD_ID
                             };
 

diff --git a/view/frontend/web/template/payment/checkoutcom_card_payment.html b/view/frontend/web/template/payment/checkoutcom_card_payment.html
@@ -39,7 +39,7 @@
         <div class="message message-cko" data-bind="attr: {'id': (getCode()+'_message')}"></div>
         <div class="message message-response-code" data-bind="attr: {'id': (getCode()+'_message')}"></div>
         <div class="message debug-message" data-bind="attr: {'id': (getCode()+'_message')}"></div>
-        
+
         <!-- Card form -->
         <div class="frames-container">
             <form method="POST" data-bind="attr: {'id': formId}">
@@ -49,6 +49,9 @@
                             <!-- Form will be added here -->
                         </div>
                     </div>
+                    <div class="scheme-choice-frame">
+                        <!-- form will be added here -->
+                    </div>
                     <p class="error-message"></p>
                 <!-- /ko -->
                 <!-- ko if: (getFormLayout() == 'multi') -->
@@ -120,7 +123,7 @@
                     <!-- ko template: getTemplate() --><!-- /ko -->
                 <!--/ko-->
             </div>
-    
+
             <!-- ko if: (isVaultEnabled() && isSaveCardEnabled() && isLoggedIn()) -->
                 <div class="field choice save-card-option">
                     <input type="checkbox" name="saveCard" class="checkbox"/>
@@ -129,14 +132,14 @@
                     </label>
                 </div>
             <!-- /ko -->
-    
+
             <!-- Agreements form -->
             <div class="checkout-agreements-block">
                 <!-- ko foreach: $parent.getRegion('before-place-order') -->
                     <!-- ko template: getTemplate() --><!-- /ko -->
                 <!--/ko-->
             </div>
-    
+
             <!-- Actions -->
             <div class="actions-toolbar">
                 <div class="primary">