Merge pull request #54 from logeecom/master

Release version 3.2.15
packlink-dev · Jul 12, 2023 · 26e55fc · 26e55fc
2 parents fbcb08c + db69b21
commit 26e55fc
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 9 deletions.
diff --git a/PluginInstallation/3.2.15/packlink.zip b/PluginInstallation/3.2.15/packlink.zip
diff --git a/PluginInstallation/CHANGELOG.md b/PluginInstallation/CHANGELOG.md
@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
+## [3.2.15](https://github.com/packlink-dev/prestashop_module/compare/v3.2.14...v3.2.15)
+### Changed
+- Do not send json encoded values as smarty variables
+
 ## [3.2.14](https://github.com/packlink-dev/prestashop_module/compare/v3.2.13...v3.2.14)
 ### Changed
 - Update link to order draft on Packlink

diff --git a/src/composer.json b/src/composer.json
@@ -2,7 +2,7 @@
   "name": "packlink/prestashop",
   "description": "Packlink Shipping PrestaShop plugin",
   "type": "library",
-  "version": "3.2.14",
+  "version": "3.2.15",
   "repositories": [
     {
       "type": "vcs",

diff --git a/src/packlink.php b/src/packlink.php
@@ -46,7 +46,7 @@ public function __construct()
         $this->module_key = 'a7a3a395043ca3a09d703f7d1c74a107';
         $this->name = 'packlink';
         $this->tab = 'shipping_logistics';
-        $this->version = '3.2.14';
+        $this->version = '3.2.15';
         $this->author = $this->l('Packlink Shipping S.L.');
         $this->need_instance = 0;
         $this->ps_versions_compliancy = array('min' => '1.6.0.14', 'max' => _PS_VERSION_);
@@ -204,7 +204,7 @@ public function hookDisplayAfterCarrier($params)
         $configuration = $this->getShippingStepConfiguration($params);
 
         $this->context->smarty->assign(array(
-            'configuration' => json_encode($configuration),
+            'configuration' => $configuration,
         ));
 
         return $this->display(__FILE__, 'shipping_methods_17.tpl');
@@ -290,7 +290,7 @@ public function hookDisplayOrderConfirmation($params)
             $configuration['addressId'] = $order->id_address_delivery;
             $configuration['cartId'] = $order->id_cart;
             $this->context->smarty->assign(
-                array('configuration' => json_encode($configuration))
+                array('configuration' => $configuration)
             );
 
             $output = $this->getLocationPickerFilesLinks();
@@ -1000,7 +1000,7 @@ protected function getPresta16ShippingStepPage($params)
         $configuration = $this->getShippingStepConfiguration($params);
 
         $this->context->smarty->assign(
-            array('configuration' => json_encode($configuration))
+            array('configuration' => $configuration)
         );
 
         $stylesPath = $this->_path . 'views/css/packlink-shipping-methods.css?v=' . $this->version;

diff --git a/src/views/templates/hook/confirm.tpl b/src/views/templates/hook/confirm.tpl
@@ -153,7 +153,7 @@
         let selectBtn = document.getElementById('pl-dropoff-button');
         let confirmMask = document.getElementById('pl-confirm-mask');
         let configuration = JSON.parse(
-            '{$configuration|escape:'htmlall':'UTF-8'|htmlspecialchars_decode:3}'
+            '{$configuration|json_encode|escape:'htmlall':'UTF-8'|htmlspecialchars_decode:3}'
                 .replace(/&quot;/g, '"')
                 .replace(/&amp;/g, '&')
         );

diff --git a/src/views/templates/hook/shipping_methods_16.tpl b/src/views/templates/hook/shipping_methods_16.tpl
@@ -97,11 +97,11 @@
 
   Packlink.checkOut = new Packlink.CheckOutController(
       JSON.parse(
-          '{$configuration|escape:'htmlall':'UTF-8'|htmlspecialchars_decode:3}'
+          '{$configuration|json_encode|escape:'htmlall':'UTF-8'|htmlspecialchars_decode:3}'
               .replace(/&quot;/g, '"')
               .replace(/&amp;/g, '&')
       )
-  );
+  )
 
   function checkLoadStatus() {
     let elements = document.getElementsByClassName('delivery_option_radio');

diff --git a/src/views/templates/hook/shipping_methods_17.tpl b/src/views/templates/hook/shipping_methods_17.tpl
@@ -90,6 +90,7 @@
       </a>
     </div>
   </div>
+  <input type="hidden" id="pl-shipping-configuration" value="{$configuration|json_encode}">
 </location-picker-template>
 
 <script>
@@ -102,7 +103,7 @@
 
   Packlink.checkOut = new Packlink.CheckOutController(
       JSON.parse(
-          '{$configuration|escape:'htmlall':'UTF-8'|htmlspecialchars_decode:3}'
+          '{$configuration|json_encode|escape:'htmlall':'UTF-8'|htmlspecialchars_decode:3}'
               .replace(/&quot;/g, '"')
               .replace(/&amp;/g, '&')
       )