Merge pull request #142 from breadfinance/shipping-api-fix-accuquilt

PR Shipping api + Targeted financing

Author: jenlesamuel

composer.json

@@ -3,7 +3,7 @@
     "description": "Offers the Bread financing and checkout tools for your Magento store",
     "license": "MIT",
     "minimum-stability": "stable",
-    "version": "1.1.13",
+    "version": "1.1.15",
     "require": {
         "php": "~7.0.13||~7.1.0||~7.1.3||~7.2.0||~7.3.0"
     },
@@ -19,3 +19,5 @@
         }
     }
 }
+
+

view/frontend/requirejs-config.js

@@ -8,7 +8,8 @@ var config = {
     map: {
         '*': {
             buttonConfig: 'Bread_BreadCheckout/js/button-config',
-            bundleHelper: 'Bread_BreadCheckout/js/bundle-helper'
+            bundleHelper: 'Bread_BreadCheckout/js/bundle-helper',
+            'Magento_Checkout/js/action/select-shipping-method': 'Bread_BreadCheckout/web/js/shipping-method'
         }
     }
 };

view/frontend/templates/breadcheckout/grouped.phtml

@@ -192,7 +192,7 @@
                 var cartSizeFinancingId = financingInfo.id;
                 var cartSizeThreshold = financingInfo.threshold;
                 var itemsPriceSum = items.reduce(function(sum, item) { return sum + item.price * item.quantity }, 0) / 100;
-                breadConfig.financingProgramId = (itemsPriceSum >= cartSizeThreshold) ? cartSizeFinancingId : 'null';
+                breadConfig.financingProgramId = (itemsPriceSum >= cartSizeThreshold) ? cartSizeFinancingId : null;
             } else if(financingInfo.enabled && financingInfo.mode.sku){
                 var productSku = "<?= /* @noEscape */ $block->getProduct()->getSku(); ?>";
                 if(financingInfo.sku_limit.indexOf(productSku) !== -1){

view/frontend/templates/breadcheckout/list_product.phtml

@@ -79,7 +79,7 @@ $productId = $product->getId();
                 var cartSizeFinancingId = financingInfo.id;
                 var cartSizeThreshold = financingInfo.threshold;
                 var itemsPriceSum = items.reduce(function(sum, item) { return sum + item.price * item.quantity; }, 0) / 100;
-                breadConfig.financingProgramId = (itemsPriceSum >= cartSizeThreshold) ? cartSizeFinancingId : 'null';
+                breadConfig.financingProgramId = (itemsPriceSum >= cartSizeThreshold) ? cartSizeFinancingId : null;
             } else if (financingInfo.enabled && financingInfo.mode.sku){
                 var productSku = "<?= /* @noEscape */ $block->getProduct()->getSku(); ?>";
                 if(financingInfo.sku_limit.indexOf(productSku) !== -1){

view/frontend/templates/breadcheckout/view.phtml

@@ -199,7 +199,7 @@
                 var cartSizeFinancingId = financingInfo.id;
                 var cartSizeThreshold = financingInfo.threshold;
                 var itemsPriceSum = items.reduce(function(sum, item) { return sum + item.price * item.quantity; }, 0) / 100;
-                breadConfig.financingProgramId = (itemsPriceSum >= cartSizeThreshold) ? cartSizeFinancingId : 'null';
+                breadConfig.financingProgramId = (itemsPriceSum >= cartSizeThreshold) ? cartSizeFinancingId : null;
             } else if (financingInfo.enabled && financingInfo.mode.sku){
                 var productSku = "<?= /* @noEscape */ $block->getProduct()->getSku(); ?>";
                 if(financingInfo.sku_limit.indexOf(productSku) !== -1){

view/frontend/web/js/view/shipping-method.js

@@ -0,0 +1,25 @@
+define([
+    'jquery',
+    'Magento_Checkout/js/model/quote',
+    'Magento_Checkout/js/action/set-shipping-information'
+], function (
+    $,
+    quote,
+    setShippingInformationAction
+) {
+    'use strict';
+
+    return function (shippingMethod) {
+        //Re-evaluate selected shippingMethod
+        quote.shippingMethod(shippingMethod);
+        if (shippingMethod != null) {
+            //Invalidate existing transactionId if customer had already filled payment form 
+            //and steps back
+            if (window.checkoutConfig.payment.breadcheckout.transactionId !== null) {
+                window.checkoutConfig.payment.breadcheckout.transactionId = null;
+            }
+            //Set back payment method(Pay Later Bread) to ensure it checked when customer selects next 
+            quote.paymentMethod(null);
+        }
+    };
+});