Merge pull request #72 from Paazl/1.9.0

1.9.0
Paazl · Sep 28, 2021 · dcd4dc3 · dcd4dc3
2 parents cbfc719 + fdbc8eb
commit dcd4dc3
Show file tree

Hide file tree

Showing 11 changed files with 111 additions and 100 deletions.
diff --git a/Model/Checkout/WidgetConfigProvider.php b/Model/Checkout/WidgetConfigProvider.php
@@ -128,12 +128,22 @@ public function getConfig()
 
         $numberOfProcessingDays = self::DEFAULT_NUMBER_OF_PROCESSING_DAYS;
         $goods = [];
+        $widthAttribute = $this->scopeConfig->getProductAttributeWidth();
+        $heightAttribute = $this->scopeConfig->getProductAttributeHeight();
+        $lengthAttribute = $this->scopeConfig->getProductAttributeLength();
+        $useDimensions = $widthAttribute && $lengthAttribute && $heightAttribute;
         foreach ($this->getQuote()->getAllVisibleItems() as $item) {
             $goodsItem = [
                 "quantity" => (int)$item->getQty(),
                 "weight"   => doubleval($item->getWeight()),
                 "price"    => $this->itemHandler->getPriceValue($item)
             ];
+            if ($useDimensions) {
+                $product = $this->productRepository->getById($item->getProduct()->getId());
+                $goodsItem["length"] = $product->getData($lengthAttribute);
+                $goodsItem["width"] = $product->getData($widthAttribute);
+                $goodsItem["height"] = $product->getData($heightAttribute);
+            }
 
             if (($itemNumberOfProcessingDays = $this->getProductNumberOfProcessingDays($item))
                 && $itemNumberOfProcessingDays > $numberOfProcessingDays) {
@@ -190,6 +200,8 @@ public function getConfig()
         }
         if ($this->scopeConfig->getTotalPrice() == 'grand_total') {
             $config['shipmentParameters']['totalPrice'] = (float)$this->getQuote()->getGrandTotal();
+        } elseif ($this->scopeConfig->getTotalPrice() == 'subtotal_excl_discount') {
+            $config['shipmentParameters']['totalPrice'] = (float)$this->getQuote()->getSubtotal();
         }
 
         $config = array_merge($config, $this->languageProvider->getConfig());

diff --git a/Model/System/Config/Source/TotalPrice.php b/Model/System/Config/Source/TotalPrice.php
@@ -27,6 +27,7 @@ public function toOptionArray()
         if (!$this->options) {
             $this->options = [
                 ['value' => 'subtotal_incl_discount', 'label' => __('Subtotal including DISCOUNT')],
+                ['value' => 'subtotal_excl_discount', 'label' => __('Subtotal excluding DISCOUNT')],
                 ['value' => 'grand_total', 'label' => __('Grand total')]
             ];
         }

diff --git a/Plugin/Carrier/Infotext.php b/Plugin/Carrier/Infotext.php
@@ -33,7 +33,7 @@ class Infotext
      * Infotext constructor.
      *
      * @param ShippingMethodExtensionFactory $extensionFactory
-     * @param Config                         $scopeConfig
+     * @param Config $scopeConfig
      */
     public function __construct(
         ShippingMethodExtensionFactory $extensionFactory,
@@ -54,15 +54,18 @@ public function __construct(
     public function afterModelToDataObject(ShippingMethodConverter $subject, ShippingMethodInterface $result)
     {
         $carrierCode = $result->getCarrierCode();
-        $infotext = $this->scopeConfig->getValue(
-            'carriers/' . $carrierCode . '/infotext'
-        );
-        $extensibleAttribute = ($result->getExtensionAttributes())
-            ? $result->getExtensionAttributes()
-            : $this->extensionFactory->create();
+        if ($carrierCode == 'paazlshipping') {
+            $infotext = $this->scopeConfig->getValue(
+                'carriers/' . $carrierCode . '/infotext'
+            );
+            $extensibleAttribute = ($result->getExtensionAttributes())
+                ? $result->getExtensionAttributes()
+                : $this->extensionFactory->create();
+
+            $extensibleAttribute->setInfotext($infotext);
+            $result->setExtensionAttributes($extensibleAttribute);
+        }
 
-        $extensibleAttribute->setInfotext($infotext);
-        $result->setExtensionAttributes($extensibleAttribute);
         return $result;
     }
 }
diff --git a/Plugin/Quote/AfterAddProduct.php b/Plugin/Quote/AfterAddProduct.php
diff --git a/Plugin/Quote/BeforeQuoteSave.php b/Plugin/Quote/BeforeQuoteSave.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © 2019 Paazl. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Paazl\CheckoutWidget\Plugin\Quote;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Quote\Api\Data\CartInterface;
+use Magento\Quote\Model\QuoteRepository;
+use Paazl\CheckoutWidget\Model\Config;
+
+/**
+ * Class BeforeQuoteSave
+ * Plugin for quote repository
+ */
+class BeforeQuoteSave
+{
+
+    const ORIGIN = 'shipping/origin/country_id';
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * Quote constructor.
+     *
+     * @param ScopeConfigInterface $scopeConfig
+     * @param Config $config
+     */
+    public function __construct(
+        ScopeConfigInterface $scopeConfig,
+        Config $config
+    ) {
+        $this->scopeConfig = $scopeConfig;
+        $this->config = $config;
+    }
+
+    /**
+     * @param QuoteRepository $subject
+     * @param CartInterface $quote
+     *
+     * @return CartInterface[]
+     */
+    public function beforeSave(
+        QuoteRepository $subject,
+        CartInterface $quote
+    ) {
+        $shippingAddress = $quote->getShippingAddress();
+        if (!$shippingAddress->getCountryId() && $this->config->isEnabled()) {
+            $origin = $this->scopeConfig->getValue(self::ORIGIN);
+            $shippingAddress = $quote->getShippingAddress();
+            $billingAddress = $quote->getBillingAddress();
+            $billingAddress->setCountryId($origin);
+            $shippingAddress->setCountryId($origin);
+            $quote->setShippingAddress($shippingAddress);
+            $quote->setBillingAddress($billingAddress);
+        }
+        return [$quote];
+    }
+}
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "paazl/magento2-checkout-widget",
   "description": "Paazl checkoutWidget for Magento 2",
   "type": "magento2-module",
-  "version": "1.8.0",
+  "version": "1.9.0",
   "keywords": [
     "Paazl",
     "Magento 2",

diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
@@ -141,6 +141,14 @@
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment><![CDATA[If you use the third 'street' field as a separate house-number-addition field, enable this option.]]></comment>
                 </field>
+                <field id="infotext" translate="label comment" type="textarea" sortOrder="46" showInDefault="1"
+                       showInWebsite="1" showInStore="1">
+                    <label>Infotext</label>
+                    <depends>
+                        <field id="active">1</field>
+                    </depends>
+                    <comment>Use this to show some info on checkout shipping method.</comment>
+                </field>
                 <field id="reference_prefix" translate="label comment" type="text" sortOrder="47" showInDefault="1"
                        showInWebsite="1" showInStore="1">
                     <label>Order reference prefix</label>

diff --git a/etc/config.xml b/etc/config.xml
@@ -8,7 +8,7 @@
     <default>
         <carriers>
             <paazlshipping>
-                <version>v1.8.0</version>
+                <version>v1.9.0</version>
                 <active>0</active>
                 <sallowspecific>0</sallowspecific>
                 <price>0</price>

diff --git a/etc/di.xml b/etc/di.xml
@@ -25,9 +25,9 @@
                 sortOrder="70"/>
     </type>
 
-    <type name="Magento\Quote\Model\Quote">
-        <plugin name="paazlAfterAddProduct"
-                type="Paazl\CheckoutWidget\Plugin\Quote\AfterAddProduct" sortOrder="1" disabled="false" />
+    <type name="Magento\Quote\Model\QuoteRepository">
+        <plugin name="paazlBeforeQuoteSave"
+                type="Paazl\CheckoutWidget\Plugin\Quote\BeforeQuoteSave" sortOrder="1" disabled="false" />
     </type>
 
     <type name="Magento\Tax\Model\Config">

diff --git a/view/frontend/web/js/checkout/action/set-shipping-information-mixin.js b/view/frontend/web/js/checkout/action/set-shipping-information-mixin.js
@@ -28,7 +28,9 @@ define(
                         return;
                     }
 
-                    var methods = res.extension_attributes && res.extension_attributes.shipping_methods || [];
+                    var methods = res.totals.extension_attributes
+                        && res.totals.extension_attributes.shipping_methods
+                        || [];
                     var found = _.find(methods, function (m) {
                         return m.carrier_code === shippingMethod.carrier_code
                             && m.method_code === shippingMethod.method_code;

diff --git a/view/frontend/web/template/checkout/shipping-method-item.html b/view/frontend/web/template/checkout/shipping-method-item.html
@@ -35,7 +35,9 @@
        attr="'aria-labelledby': 'label_method_' + method.method_code + '_' + method.carrier_code + ' ' + 'label_carrier_' + method.method_code + '_' + method.carrier_code" />
 <!-- /ko -->
 <tr class="row info">
-  <td class="col" colspan="4" style="border-top:none;padding:0;"><div class="infoblock" attr="'id': 'infotext_' + method.method_code + '_' + method.carrier_code" if="method.extension_attributes" style="display:block" text="method.extension_attributes.infotext"></div></td>
+  <td class="col" colspan="4" style="border-top:none;padding:0;">
+      <div class="infoblock" attr="'id': 'infotext_' + method.method_code + '_' + method.carrier_code" if="method.extension_attributes" style="display:block" text="method.extension_attributes.infotext"></div>
+  </td>
 </tr>
 <tr class="row info" data-bind="visible: $parent.canShowPaazlWidget() == 'paazlshipping'">
   <td class="col" colspan="4" style="border-top:none;padding:0;"><div attr="'id': 'widget_' + method.method_code + '_' + method.carrier_code"></div></td>