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

release/v3.1.1 into master See merge request agence-dnd/marketplace/magento-2/external/module-checkout-magento2-plugin!35
checkout · Apr 27, 2022 · ef3cb04 · ef3cb04
2 parents 9ae2ea6 + b1c9b17
commit ef3cb04
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 9 deletions.
diff --git a/Controller/Api/v1.php → Controller/Api/V1.php b/Controller/Api/v1.php → Controller/Api/V1.php
diff --git a/Controller/Api/v2.php → Controller/Api/V2.php b/Controller/Api/v2.php → Controller/Api/V2.php
@@ -26,7 +26,7 @@
 use CheckoutCom\Magento2\Model\Service\OrderStatusHandlerService;
 use CheckoutCom\Magento2\Model\Service\PaymentErrorHandlerService;
 use CheckoutCom\Magento2\Model\Service\QuoteHandlerService;
-use Klarna\Core\Api\OrderRepositoryInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Framework\App\Action\Action;
 use Magento\Framework\App\Action\Context;
 use Magento\Framework\Controller\Result\Json;

diff --git a/Model/Methods/AlternativePaymentMethod.php b/Model/Methods/AlternativePaymentMethod.php
@@ -45,7 +45,7 @@
 use CheckoutCom\Magento2\Helper\Utilities;
 use CheckoutCom\Magento2\Model\Service\ApiHandlerService;
 use CheckoutCom\Magento2\Model\Service\QuoteHandlerService;
-use CheckoutCom\Magento2\Model\Service\shopperHandlerService;
+use CheckoutCom\Magento2\Model\Service\ShopperHandlerService;
 use CheckoutCom\Magento2\Model\Service\VersionHandlerService;
 use Magento\Backend\Model\Auth\Session;
 use Magento\Backend\Model\Session\Quote;

diff --git a/Observer/Backend/MotoPaymentRequest.php b/Observer/Backend/MotoPaymentRequest.php
@@ -195,6 +195,7 @@ public function execute(Observer $observer): MotoPaymentRequest
             $request->capture      = $this->config->needsAutoCapture($methodId);
             $request->amount       = $this->prepareMotoAmount($order);
             $request->reference    = $order->getIncrementId();
+            $request->customer     = $api->createCustomer($order);
             $request->payment_type = 'MOTO';
             if ($order->getIsNotVirtual()) {
                 $request->shipping = $api->createShippingAddress($order);

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

diff --git a/view/adminhtml/templates/payment/moto.phtml b/view/adminhtml/templates/payment/moto.phtml
@@ -82,7 +82,14 @@ 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')) ?>),
                 cardValidationChanged: function(event) {
+                    var cardholderName = $('#order-billing_address_firstname').val() + ' ' + $('#order-billing_address_lastname').val();
+
                     if (Frames.isCardValid()) {
+                        if(cardholderName.length > 0) {
+                            Frames.cardholder = {
+                                name: cardholderName
+                            };
+                        }
                         Frames.submitCard();
                     }
                 },

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
@@ -285,10 +285,15 @@ define(
                         function (event) {
                             var valid = Frames.isCardValid()
                             if (valid) {
-                                if(cardholderName.length > 0) {
-                                    // Add the card holder name
+                                if(cardholderName.length === 0) {
+                                    if(Utilities.getBillingAddress()) {
+                                        cardholderName = Utilities.getCustomerName();
+                                    }
+                                }
+
+                                if (cardholderName.length > 0) {
                                     Frames.cardholder = {
-                                       name: cardholderName
+                                        name: cardholderName
                                     };
                                 }
 

diff --git a/view/frontend/web/js/view/payment/utilities.js b/view/frontend/web/js/view/payment/utilities.js
@@ -281,9 +281,9 @@ define(
             getCustomerName: function () {
                 var billingAddress = this.getBillingAddress();
                 var customerName = '';
-                if (billingAddress) {
-                    customerName += billingAddress.firstname;
-                    customerName += ' ' + billingAddress.lastname;
+                if (billingAddress && billingAddress.firstname && billingAddress.lastname) {
+                        customerName += billingAddress.firstname;
+                        customerName += ' ' + billingAddress.lastname;
                 }
 
                 return customerName;