Merge pull request #102 from Paazl/release/1.15.1

Release/1.15.1
Paazl · Nov 15, 2023 · 7b16f36 · 7b16f36
2 parents d462faa + cbc0478
commit 7b16f36
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 26,678 deletions.
diff --git a/Block/Checkout/Widget.php b/Block/Checkout/Widget.php
@@ -1,23 +1,17 @@
 <?php
 /**
- * Copyright © 2019 Paazl. All rights reserved.
+ * Copyright © Paazl. All rights reserved.
  * See COPYING.txt for license details.
  */
 
 namespace Paazl\CheckoutWidget\Block\Checkout;
 
 use Magento\Framework\View\Element\Template;
+use Magento\Framework\View\Element\Template\Context;
 use Paazl\CheckoutWidget\Model\Api\UrlProvider;
 use Paazl\CheckoutWidget\Model\Api\UrlProviderFactory;
-use Paazl\CheckoutWidget\Model\Checkout\WidgetConfigProvider;
 use Paazl\CheckoutWidget\Model\Config;
-use Magento\Framework\View\Element\Template\Context;
 
-/**
- * Class Widget
- *
- * @package Paazl\CheckoutWidget\Block\Checkout
- */
 class Widget extends Template
 {
 
@@ -26,11 +20,6 @@ class Widget extends Template
      */
     private $scopeConfig;
 
-    /**
-     * @var WidgetConfigProvider
-     */
-    private $widgetConfigProvider;
-
     /**
      * @var UrlProvider
      */
@@ -39,27 +28,22 @@ class Widget extends Template
     /**
      * Widget constructor.
      *
-     * @param Context              $context
-     * @param Config               $scopeConfig
-     * @param UrlProviderFactory   $urlProviderFactory
-     * @param WidgetConfigProvider $widgetConfigProvider
-     * @param array                $data
+     * @param Context $context
+     * @param Config $scopeConfig
+     * @param UrlProviderFactory $urlProviderFactory
+     * @param array $data
      */
     public function __construct(
         Context $context,
         Config $scopeConfig,
         UrlProviderFactory $urlProviderFactory,
-        WidgetConfigProvider $widgetConfigProvider,
         array $data = []
     ) {
         $this->scopeConfig = $scopeConfig;
-        $this->widgetConfigProvider = $widgetConfigProvider;
         $this->urlProvider = $urlProviderFactory->create();
         parent::__construct($context, $data);
     }
 
-    // ---
-
     /**
      * @return mixed
      */
@@ -71,17 +55,35 @@ public function getCustomCss()
     /**
      * @return boolean
      */
-    public function isEnabled()
+    public function getGoogleMapKey()
     {
-        return $this->scopeConfig->isEnabled();
+        return $this->scopeConfig->getGoogleMapKey();
+    }
+
+    /**
+     * @return string
+     */
+    public function getApiBaseUrl()
+    {
+        return $this->urlProvider->getBaseUrl();
     }
 
     /**
      * @return boolean
      */
-    public function getGoogleMapKey()
+    public function useLocal(): bool
     {
-        return $this->scopeConfig->getGoogleMapKey();
+        return $this->scopeConfig->isUseLocalCopyOfWidgetJs();
+    }
+
+    /**
+     * @return string
+     */
+    public function getLocalResourceUrl(): string
+    {
+        $cssFile = 'paazl-checkout.min.css';
+        $url = $this->getViewFileUrl('Paazl_CheckoutWidget::css/' . $cssFile);
+        return str_replace($cssFile, '', $url);
     }
 
     /**
@@ -97,10 +99,10 @@ protected function _toHtml()
     }
 
     /**
-     * @return string
+     * @return boolean
      */
-    public function getApiBaseUrl()
+    public function isEnabled()
     {
-        return $this->urlProvider->getBaseUrl();
+        return $this->scopeConfig->isEnabled();
     }
 }
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.15.0",
+  "version": "1.15.1",
   "keywords": [
     "Paazl",
     "Magento 2",

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

diff --git a/view/base/templates/checkout/widget.phtml b/view/base/templates/checkout/widget.phtml
@@ -11,8 +11,14 @@
 <?php if ($block->getApiBaseUrl()) : ?>
 <script type="text/javascript">
     window.PAAZL_CHECKOUT_WIDGET_API_URL = '<?= /* @escapeNotVerified */ $block->getApiBaseUrl(); ?>';
+    window.PAAZL_CHECKOUT_WIDGET_LOCAL_RESOURCE_URL = '<?= /* @escapeNotVerified */ $block->getLocalResourceUrl(); ?>';
 </script>
 <?php endif; ?>
+<?php if ($block->useLocal()) : ?>
+    <script type="text/javascript">
+        window.PAAZL_CHECKOUT_WIDGET_RESOURCE_URL = '<?= /* @escapeNotVerified */ $block->getLocalResourceUrl(); ?>';
+    </script>
+<?php endif; ?>
 <?php if ($block->getCustomCss() != '') : ?>
 <style>:root {<?= /* @escapeNotVerified */ $block->getCustomCss() ?>}</style>
 <?php endif; ?>
diff --git a/view/frontend/web/css/paazl-checkout.min.css b/view/frontend/web/css/paazl-checkout.min.css
diff --git a/view/frontend/web/js/checkout/lib/checkout_local_live.js b/view/frontend/web/js/checkout/lib/checkout_local_live.js