Merge pull request #101 from Paazl/release/1.15.0

Release/1.15.0
Paazl · Aug 31, 2023 · d462faa · d462faa
2 parents 363205d + 221e7ed
commit d462faa
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 12 deletions.
diff --git a/Model/Admin/Order/Create/WidgetConfigProvider.php b/Model/Admin/Order/Create/WidgetConfigProvider.php
@@ -159,7 +159,8 @@ public function getConfig()
             ],
             "shipmentParameters"         => [
                 "totalWeight"   => $this->getTotalWeight(),
-                "totalPrice"    => $this->getQuote()->getSubtotalWithDiscount(),
+                "totalPrice"    => $this->getQuote()->getSubtotalWithDiscount() -
+                    $this->getQuote()->getShippingAddress()->getShippingAmount(),
                 "numberOfGoods" => $this->getProductsCount(),
                 "goods"         => $goods
             ],

diff --git a/Model/Checkout/WidgetConfigProvider.php b/Model/Checkout/WidgetConfigProvider.php
@@ -128,8 +128,8 @@ public function getConfig()
                     "quantity" => $item->getParentItem()
                         ? (int)($item->getParentItem()->getQty())
                         : (int)$item->getQty(),
-                    "weight"   => doubleval($item->getWeight()),
-                    "price"    => $this->itemHandler->getPriceValue($item)
+                    "weight" => doubleval($item->getWeight()),
+                    "price" => $this->itemHandler->getPriceValue($item)
                 ];
                 if ($useDimensions) {
                     $product = $this->productRepository->getById($item->getProduct()->getId());
@@ -187,7 +187,8 @@ public function getConfig()
             ],
             "shipmentParameters"         => [
                 "totalWeight"   => (float)$this->getTotalWeight($goods),
-                "totalPrice"    => 0.0000,
+                "totalPrice"    => (float)$this->getQuote()->getSubtotalWithDiscount() -
+                    $this->getQuote()->getShippingAddress()->getShippingAmount(),
                 "numberOfGoods" => (int)$this->getProductsCount(),
                 "goods"         => $goods
             ],
@@ -203,16 +204,19 @@ public function getConfig()
 
         switch ($this->scopeConfig->getTotalPrice()) {
             case "grand_total":
-                $totalPriceValue = (float) $shippingAddress->getGrandTotal();
+                $totalPriceValue = (float) $shippingAddress->getGrandTotal() -
+                    $this->getQuote()->getShippingAddress()->getShippingAmount();
                 break;
             case "subtotal_excl_discount":
-                $totalPriceValue = (float) $shippingAddress->getSubtotalInclTax();
+                $totalPriceValue = (float) $shippingAddress->getSubtotalInclTax() -
+                    $this->getQuote()->getShippingAddress()->getShippingAmount();
                 break;
             case "subtotal_incl_discount":
             default: // default from config.xml = "subtotal_incl_discount"
                 $totalPriceValue = (
                     (float) $shippingAddress->getSubtotalInclTax() +
-                    (float) $shippingAddress->getDiscountAmount()
+                    (float) $shippingAddress->getDiscountAmount() -
+                    $this->getQuote()->getShippingAddress()->getShippingAmount()
                 );
                 break;
         }

diff --git a/Model/Order/WidgetConfigProvider.php b/Model/Order/WidgetConfigProvider.php
@@ -109,7 +109,8 @@ public function getConfig()
             ],
             'shipmentParameters'         => [
                 'totalWeight'   => $this->getTotalWeight(),
-                'totalPrice'    => $this->getOrder()->getSubtotal(),
+                'totalPrice'    => $this->getOrder()->getSubtotal() -
+                    $this->getOrder()->getShippingAddress()->getShippingAmount(),
                 'numberOfGoods' => $this->getProductsCount(),
                 'goods'         => $goods
             ],

diff --git a/Model/System/Config/Source/AvailableTabs.php b/Model/System/Config/Source/AvailableTabs.php
@@ -30,7 +30,8 @@ public function toOptionArray()
             $this->options = [
                 ['value' => 'DELIVERY', 'label' => __('Delivery')],
                 ['value' => 'STORE', 'label' => __('Store')],
-                ['value' => 'PICKUP', 'label' => __('Pickup')]
+                ['value' => 'PICKUP', 'label' => __('Pickup')],
+                ['value' => 'PARCEL_LOCKER', 'label' => __('Parcel Locker')]
             ];
         }
 

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.14.1",
+  "version": "1.15.0",
   "keywords": [
     "Paazl",
     "Magento 2",

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

diff --git a/etc/csp_whitelist.xml b/etc/csp_whitelist.xml
@@ -5,17 +5,20 @@
         <policy id="script-src">
             <values>
                 <value id="paazl-widget-checkout" type="host">https://widget-acc.paazl.com</value>
+                <value id="paazl-api-checkout" type="host">https://api-acc.paazl.com/</value>
             </values>
         </policy>
         <policy id="style-src">
             <values>
                 <value id="paazl-widget-checkout-css" type="host">https://widget-acc.paazl.com</value>
+                <value id="paazl-api-checkout-css" type="host">https://api-acc.paazl.com/</value>
             </values>
         </policy>
         <policy id="connect-src">
             <values>
                 <value id="paazl-widget-checkout-connect" type="host">https://widget-acc.paazl.com</value>
+                <value id="paazl-api-checkout-connect" type="host">https://api-acc.paazl.com/</value>
             </values>
         </policy>
     </policies>
-</csp_whitelist>
+</csp_whitelist>