Add compatibility to the recent Braintree api changes

Imagination-Media · Jun 24, 2020 · 502a141 · 502a141
1 parent 37f5cbc
commit 502a141
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 11 deletions.
diff --git a/Model/Checkout.php b/Model/Checkout.php
@@ -156,7 +156,7 @@ public function createOrder(
             }
 
             /**
-             * Set billing and shipping addreess
+             * Set billing and shipping address
              */
             $magentoBillingAddress = $this->address->execute(
                 $billingAddress,

diff --git a/composer.json b/composer.json
@@ -1,18 +1,18 @@
 {
   "name": "imaginationmedia/magento2-payment-request",
   "description": "W3C Web Payments for Magento 2",
-  "version" : "1.0.0",
+  "version" : "1.0.1",
   "require": {
-    "php": ">=7.0",
     "magento/framework": ">=102.0",
     "magento/module-backend": ">=101.0",
+    "magento/module-braintree": ">=100.3",
     "magento/module-checkout": ">=100.3",
     "magento/module-payment": ">=100.3",
     "magento/module-quote" : ">=100.3",
     "magento/module-sales": ">=102.0",
     "magento/module-sales-sequence": ">=100.3",
     "magento/module-shipping": ">=100.3",
-    "magento/module-braintree": ">=100.3"
+    "php": ">=7.2"
   },
   "type": "magento2-module",
   "license": [

diff --git a/view/frontend/requirejs-config.js b/view/frontend/requirejs-config.js
@@ -16,5 +16,8 @@ var config = {
                 'ImaginationMedia_PaymentRequest/js/sidebar': true
             }
         }
+    },
+    paths: {
+        braintreeClientV2: 'https://js.braintreegateway.com/js/braintree-2.32.0.min'
     }
 };
diff --git a/view/frontend/web/js/checkout/payment-type/basic-card/braintree.js b/view/frontend/web/js/checkout/payment-type/basic-card/braintree.js
@@ -10,10 +10,10 @@
  */
 
 define([
-    'https://js.braintreegateway.com/js/braintree-2.32.0.min.js',
+    'braintreeClientV2',
     'mage/translate',
     'jquery'
-], function (braintree, $t, $) {
+], function (braintreeClient, $t, $) {
     'use strict';
 
     return {
@@ -29,15 +29,30 @@ define([
                 paymentResponse.complete('fail');
             }
 
-            var client = new braintree.api.Client({clientToken: w3cPaymentRequest.cardConfig.additionalInfo.clientToken});
-            client.tokenizeCard({
+            var customerFullName = details.billingAddress.recipient;
+            var names = customerFullName.split(" ");
+            var finalData = {
                 number: details.cardNumber,
                 cardholderName: details.cardholderName,
                 expirationMonth: details.expiryMonth,
                 expirationYear: details.expiryYear,
                 cvv: details.cardSecurityCode,
-                billingAddress: details.billingAddress
-            }, function (err, nonce) {
+                billingAddress: {
+                    firstName : names[0],
+                    lastName : names.slice(-1)[0],
+                    company : details.billingAddress.organization,
+                    streetAddress : Object.values(details.billingAddress.addressLine).length > 0
+                        ? details.billingAddress.addressLine[0] : '',
+                    extendedAddress : Object.values(details.billingAddress.addressLine).length > 1
+                        ? details.billingAddress.addressLine[1] : '',
+                    locality : details.billingAddress.city,
+                    region : details.billingAddress.region,
+                    postalCode : details.billingAddress.postalCode,
+                    countryCodeAlpha2 : details.billingAddress.country
+                }
+            };
+            var client = new braintreeClient.api.Client({clientToken: w3cPaymentRequest.cardConfig.additionalInfo.clientToken});
+            client.tokenizeCard(finalData, function (err, nonce) {
                 if (!err) {
                     var params = {
                         paymentMethod: "braintree",
@@ -67,7 +82,8 @@ define([
                         }
                     });
                 } else {
-                    console.log(err);
+                    console.log(err.toString());
+                    console.log(nonce);
                     paymentResponse.complete('fail');
                 }
             });