#86bx34e41 amasty checkout fixes

Model/Carrier/Parcelpro.php

@@ -136,6 +136,8 @@ public function collectRates(RateRequest $request)
                         ->getQuote()->getGrandTotal();
                 }
 
+                $freeBoxes = $this->getFreeBoxesCount($request);
+
                 if ($_pricIncl) {
                     $total = $grandTotal; // Verzendkosten berekenen op basis van bedrag incl. BTW
                 }
@@ -218,8 +220,8 @@ public function collectRates(RateRequest $request)
                         }
                         $method->setMethod($key);
                         $method->setMethodTitle($pricerule['titel']);
-                        $method->setPrice($request->getFreeShipping() === true ? 0 : $shippingPrice);
-                        $method->setCost($request->getFreeShipping() === true ? 0 : $shippingPrice);
+                        $method->setPrice($request->getFreeShipping() === true || $request->getPackageQty() == $freeBoxes ? 0 : $shippingPrice);
+                        $method->setCost($request->getFreeShipping() === true || $request->getPackageQty() == $freeBoxes ? 0 : $shippingPrice);
                         $result->append($method);
                     }
 
@@ -244,8 +246,8 @@ public function collectRates(RateRequest $request)
 
                                     $method->setMethod($key . "_" . $counter);
                                     $method->setMethodTitle($pricerule['titel']);
-                                    $method->setPrice($request->getFreeShipping() === true ? 0 : $shippingPrice);
-                                    $method->setCost($request->getFreeShipping() === true ? 0 : $shippingPrice);
+                                    $method->setPrice($request->getFreeShipping() === true || $request->getPackageQty() == $freeBoxes ? 0 : $shippingPrice);
+                                    $method->setCost($request->getFreeShipping() === true || $request->getPackageQty() == $freeBoxes ? 0 : $shippingPrice);
                                     $result->append($method);
                                 }
                             }
@@ -347,4 +349,42 @@ private function isBeforeLastShippingTime($rawLastTime): bool
         $now = new DateTime();
         return $now < $parsed;
     }
+
+    /**
+     * @param RateRequest $request
+     * @return int
+     */
+    private function getFreeBoxesCount(RateRequest $request)
+    {
+        $freeBoxes = 0;
+        if ($request->getAllItems()) {
+            foreach ($request->getAllItems() as $item) {
+                if ($item->getProduct()->isVirtual() || $item->getParentItem()) {
+                    continue;
+                }
+
+                if ($item->getHasChildren() && $item->isShipSeparately()) {
+                    $freeBoxes += $this->getFreeBoxesCountFromChildren($item);
+                } elseif ($item->getFreeShipping()) {
+                    $freeBoxes += $item->getQty();
+                }
+            }
+        }
+        return $freeBoxes;
+    }
+
+    /**
+     * @param mixed $item
+     * @return mixed
+     */
+    private function getFreeBoxesCountFromChildren($item)
+    {
+        $freeBoxes = 0;
+        foreach ($item->getChildren() as $child) {
+            if ($child->getFreeShipping() && !$child->getProduct()->isVirtual()) {
+                $freeBoxes += $item->getQty() * $child->getQty();
+            }
+        }
+        return $freeBoxes;
+    }
 }

view/frontend/requirejs-config.js

@@ -6,7 +6,8 @@ config = {
             "Amasty_Checkout/template/onepage/3columns.html":"Parcelpro_Shipment/template/onepage/3columns.html",
             // 'Magento_Checkout/js/view/billing-address': "Parcelpro_Shipment/js/view/billing-address",
             "Amasty_Checkout/template/onepage/shipping/address.html": "Parcelpro_Shipment/template/amastyonepage/shipping.html",
-            "Amasty_Checkout/template/onepage/shipping/methods.html": "Parcelpro_Shipment/template/amastyonepage/methods.html"
+            "Amasty_Checkout/template/onepage/shipping/methods.html": "Parcelpro_Shipment/template/amastyonepage/methods.html",
+            "Amasty_CheckoutCore/template/onepage/shipping/methods.html": "Parcelpro_Shipment/template/amastyonepage/methods.html"
             /*
             ** FireCheckout ondersteuning
             ** Onderstaande regel activeren zodat gekozen pakketpunt opgeslagen wordt bij de order.
@@ -19,6 +20,9 @@ config = {
         "Magento_Checkout/js/view/billing-address": {
             "Parcelpro_Shipment/js/view/billing-address-mixin": true
         },
+        "Magento_Checkout/js/model/shipping-save-processor/default" : {
+            "Parcelpro_Shipment/js/model/shipping-save-processor/default-mixin" : true
+        },
         "Amasty_Checkout/js/action/set-shipping-information": {
           "Parcelpro_Shipment/js/action/set-shipping-information-mixin" : true
         },

view/frontend/web/js/model/shipping-save-processor/default-mixin.js

@@ -0,0 +1,100 @@
+/*
+ * Copyright © CM.com. All rights reserved.
+ * See LICENSE.txt for license details.
+ */
+
+define([
+    'ko',
+    'Magento_Checkout/js/model/quote',
+    'Magento_Checkout/js/model/resource-url-manager',
+    'mage/storage',
+    'Magento_Checkout/js/model/payment-service',
+    'Magento_Checkout/js/model/payment/method-converter',
+    'Magento_Checkout/js/model/error-processor',
+    'Magento_Checkout/js/model/full-screen-loader',
+    'Magento_Checkout/js/action/select-billing-address',
+    'Magento_Checkout/js/model/shipping-save-processor/payload-extender',
+    'underscore'
+], function (
+    ko,
+    quote,
+    resourceUrlManager,
+    storage,
+    paymentService,
+    methodConverter,
+    errorProcessor,
+    fullScreenLoader,
+    selectBillingAddressAction,
+    payloadExtender,
+    _
+) {
+    'use strict';
+
+    return function (defaultProcessor) {
+        defaultProcessor.saveShippingInformation = function () {
+            let payload;
+
+            if (!quote.billingAddress() || (quote.shippingMethod().method_code == 'postnl_pakjegemak' || quote.shippingMethod().method_code == 'dpd_parcelshop' || quote.shippingMethod().method_code == 'dhl_parcelshop' || quote.shippingMethod().method_code == 'intrapost_parcelshop')) {
+                if(quote.billingAddress() === null) selectBillingAddressAction(quote.shippingAddress());
+                if(! quote.billingAddress()) return;
+
+                var billingstreet = quote.billingAddress().street[0];
+                if(quote.shippingMethod().method_code == 'postnl_pakjegemak' || quote.shippingMethod().method_code == 'dhl_parcelshop' || quote.shippingMethod().method_code == 'dpd_parcelshop' || quote.shippingMethod().method_code == 'intrapost_parcelshop'){
+
+                    quote.shippingAddress().company = jQuery("#shipping_method\\:company").val();
+                    quote.shippingAddress().firstname = jQuery("#shipping_method\\:firstname").val();
+                    quote.shippingAddress().lastname = jQuery("#shipping_method\\:lastname").val();
+                    var street = jQuery("#shipping_method\\:street1").val();
+                    var number = jQuery("#shipping_method\\:street2").val();
+                    quote.shippingAddress().street = [street, number];
+                    quote.shippingAddress().postcode = jQuery("#shipping_method\\:postcode").val();
+                    quote.shippingAddress().city = jQuery("#shipping_method\\:city").val();
+                    quote.shippingAddress().customerAddressId = null;
+                    quote.shippingAddress().customerId = null;
+                    quote.shippingAddress().isDefaultShipping(false);
+                    quote.shippingAddress().canUseForBilling(false);
+                }
+                if(
+                    quote.shippingAddress().firstname.toLowerCase().indexOf("postnl") == -1 &&
+                    quote.shippingAddress().firstname.toLowerCase().indexOf("dhl") == -1 &&
+                    quote.shippingAddress().firstname.toLowerCase().indexOf("dpd") == -1 &&
+                    quote.shippingAddress().firstname.toLowerCase().indexOf("intrapost") == -1
+                ){
+                    quote.billingAddress().street[0] = billingstreet;
+                    selectBillingAddressAction(quote.billingAddress());
+                }
+            }
+
+            payload = {
+                addressInformation: {
+                    'shipping_address': quote.shippingAddress(),
+                    'billing_address': quote.billingAddress(),
+                    'shipping_method_code': quote.shippingMethod()['method_code'],
+                    'shipping_carrier_code': quote.shippingMethod()['carrier_code']
+                }
+            };
+
+            payloadExtender(payload);
+
+            fullScreenLoader.startLoader();
+
+            return storage.post(
+                resourceUrlManager.getUrlForSetShippingInformation(quote),
+                JSON.stringify(payload)
+            ).done(
+                function (response) {
+                    quote.setTotals(response.totals);
+                    paymentService.setPaymentMethods(methodConverter(response['payment_methods']));
+                    fullScreenLoader.stopLoader();
+                }
+            ).fail(
+                function (response) {
+                    errorProcessor.process(response);
+                    fullScreenLoader.stopLoader();
+                }
+            );
+        };
+
+        return defaultProcessor;
+    };
+});