Merge pull request #32 from logeecom/dev

Release v3.1.1

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.1.1](https://github.com/packlink-dev/prestashop_module/compare/v3.1.0...v3.1.1)
+### Added
+- Added a migration script that converts all string values within the default parcel to number.
+
 ## [3.1.0](https://github.com/packlink-dev/prestashop_module/compare/v3.0.4...v3.1.0)
 ### Added
 - Added compatibility with PrestaShop version 1.7.7.

src/classes/Utility/PacklinkInstaller.php

@@ -444,7 +444,8 @@ private function addHooks()
      *
      * @return array
      */
-    private function getAdditionalHooks() {
+    private function getAdditionalHooks()
+    {
         return array(
             'actionAdminControllerSetMedia',
             'actionOrderGridDefinitionModifier',

src/composer.json

@@ -2,7 +2,7 @@
   "name": "packlink/prestashop",
   "description": "Packlink Shipping PrestaShop plugin",
   "type": "library",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "repositories": [
     {
       "type": "vcs",

src/packlink.php

@@ -46,7 +46,7 @@ public function __construct()
         $this->module_key = 'a7a3a395043ca3a09d703f7d1c74a107';
         $this->name = 'packlink';
         $this->tab = 'shipping_logistics';
-        $this->version = '3.1.0';
+        $this->version = '3.1.1';
         $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_);

src/upgrade/upgrade-3.1.1.php

@@ -0,0 +1,52 @@
+<?php
+
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
+/**
+ * Updates module to version 3.1.1.
+ *
+ * @return boolean
+ *
+ * @noinspection PhpUnused
+ */
+function upgrade_module_3_1_1()
+{
+    $query = new \DbQuery();
+    $query->select('id, data')
+        ->from(bqSQL('packlink_entity'))
+        ->where('index_1="defaultParcel"');
+
+    $records = \Db::getInstance()->executeS($query);
+    foreach ($records as $record) {
+        if (empty($record)) {
+            continue;
+        }
+
+        $data = json_decode($record['data'], true);
+        if (!empty($data['value']['weight'])) {
+            $weight = (float)$data['value']['weight'];
+            $data['value']['weight'] = !empty($weight) ? $weight : 1;
+        }
+
+        foreach (array('length', 'height', 'width') as $field) {
+            if (!empty($data['value'][$field])) {
+                $fieldValue = (int)$data['value'][$field];
+                $data['value'][$field] = !empty($fieldValue) ? $fieldValue : 10;
+            }
+        }
+
+        if (!empty($record['id'])) {
+            \Db::getInstance()->update(
+                'packlink_entity',
+                array(
+                    'data' => pSQL(json_encode($data), true)
+                ),
+                '`id` = ' . $record['id']
+            );
+        }
+    }
+
+    return true;
+}