diff --git a/PluginInstallation/3.2.21/packlink.zip b/PluginInstallation/3.2.21/packlink.zip new file mode 100644 index 0000000..502fd46 Binary files /dev/null and b/PluginInstallation/3.2.21/packlink.zip differ diff --git a/PluginInstallation/CHANGELOG.md b/PluginInstallation/CHANGELOG.md index c8b4eab..43a9748 100644 --- 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.21](https://github.com/packlink-dev/prestashop_module/compare/v3.2.20...v3.2.21) +### Changed +- Updated to Core version 3.4.8 + ## [3.2.20](https://github.com/packlink-dev/prestashop_module/compare/v3.2.19...v3.2.20) ### Changed - Added webhook registration in debug controller diff --git a/src/classes/BusinessLogicServices/ShopOrderService.php b/src/classes/BusinessLogicServices/ShopOrderService.php index db9d42a..a9716f9 100644 --- a/src/classes/BusinessLogicServices/ShopOrderService.php +++ b/src/classes/BusinessLogicServices/ShopOrderService.php @@ -292,7 +292,7 @@ private function getOrderItem($sourceOrderItem, $defaultParcel) $link = new \Link(); if (version_compare(_PS_VERSION_, '1.7.0.0', '<')) { - $imageType = \ImageType::getFormatedName('home'); + $imageType = \ImageType::getFormattedName('home'); } else { $imageType = \ImageType::getFormattedName('home'); } diff --git a/src/composer.json b/src/composer.json index fdf17c7..8ac9eb4 100755 --- 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.20", + "version": "3.2.21", "repositories": [ { "type": "vcs", @@ -13,7 +13,7 @@ "minimum-stability": "dev", "require": { "php": ">=5.3", - "packlink/integration-core": "3.3.21", + "packlink/integration-core": "3.4.8", "ext-json": "*", "ext-curl": "*", "ext-zip": "*", diff --git a/src/composer.lock b/src/composer.lock index 1a306f6..efe9b8c 100644 --- a/src/composer.lock +++ b/src/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f79fd88db64849735d05f45c2cb424f4", + "content-hash": "0dfe5abda6b76704a99767fab5a4602e", "packages": [ { "name": "iio/libmergepdf", @@ -54,20 +54,24 @@ "merge", "pdf" ], + "support": { + "issues": "https://github.com/hanneskod/libmergepdf/issues", + "source": "https://github.com/hanneskod/libmergepdf/tree/master" + }, "time": "2016-03-02T20:38:15+00:00" }, { "name": "packlink/integration-core", - "version": "v3.3.21", + "version": "v3.4.8", "source": { "type": "git", "url": "git@github.com:packlink-dev/ecommerce_module_core.git", - "reference": "223244169dfb6ac6a770899f272d87a15a49889a" + "reference": "91e51f02cfd6524ec9953d8f6acff7b4378aad48" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/packlink-dev/ecommerce_module_core/zipball/223244169dfb6ac6a770899f272d87a15a49889a", - "reference": "223244169dfb6ac6a770899f272d87a15a49889a", + "url": "https://api.github.com/repos/packlink-dev/ecommerce_module_core/zipball/91e51f02cfd6524ec9953d8f6acff7b4378aad48", + "reference": "91e51f02cfd6524ec9953d8f6acff7b4378aad48", "shasum": "" }, "require": { @@ -106,7 +110,7 @@ "proprietary" ], "description": "Packlink integrations core library", - "time": "2024-04-10T06:35:53+00:00" + "time": "2024-12-10T13:33:52+00:00" }, { "name": "setasign/fpdf", @@ -145,6 +149,9 @@ "fpdf", "pdf" ], + "support": { + "source": "https://github.com/Setasign/FPDF/tree/1.8.1" + }, "time": "2016-01-01T17:47:15+00:00" }, { @@ -194,6 +201,10 @@ "fpdi", "pdf" ], + "support": { + "issues": "https://github.com/Setasign/FPDI/issues", + "source": "https://github.com/Setasign/FPDI/tree/master" + }, "time": "2017-05-11T14:25:49+00:00" }, { @@ -238,6 +249,10 @@ "fpdi", "pdf" ], + "support": { + "issues": "https://github.com/Setasign/FPDI-FPDF/issues", + "source": "https://github.com/Setasign/FPDI-FPDF/tree/master" + }, "abandoned": true, "time": "2017-05-11T14:57:54+00:00" } @@ -295,6 +310,24 @@ "constructor", "instantiate" ], + "support": { + "issues": "https://github.com/doctrine/instantiator/issues", + "source": "https://github.com/doctrine/instantiator/tree/1.0.x" + }, + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", + "type": "tidelift" + } + ], "time": "2018-09-01T02:07:49+00:00" }, { @@ -344,6 +377,10 @@ "email": "mike.vanriel@naenius.com" } ], + "support": { + "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/release/2.x" + }, "time": "2016-01-25T08:17:30+00:00" }, { @@ -407,6 +444,10 @@ "spy", "stub" ], + "support": { + "issues": "https://github.com/phpspec/prophecy/issues", + "source": "https://github.com/phpspec/prophecy/tree/v1.10.3" + }, "time": "2020-03-05T15:02:03+00:00" }, { @@ -469,6 +510,11 @@ "testing", "xunit" ], + "support": { + "irc": "irc://irc.freenode.net/phpunit", + "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/2.2" + }, "time": "2015-10-06T15:47:00+00:00" }, { @@ -516,6 +562,11 @@ "filesystem", "iterator" ], + "support": { + "irc": "irc://irc.freenode.net/phpunit", + "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", + "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/1.4.5" + }, "time": "2017-11-27T13:52:08+00:00" }, { @@ -557,6 +608,10 @@ "keywords": [ "template" ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-text-template/issues", + "source": "https://github.com/sebastianbergmann/php-text-template/tree/1.2.1" + }, "time": "2015-06-21T13:50:34+00:00" }, { @@ -606,6 +661,10 @@ "keywords": [ "timer" ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-timer/issues", + "source": "https://github.com/sebastianbergmann/php-timer/tree/1.0" + }, "time": "2018-01-06T05:27:16+00:00" }, { @@ -655,6 +714,10 @@ "keywords": [ "tokenizer" ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-token-stream/issues", + "source": "https://github.com/sebastianbergmann/php-token-stream/tree/1.4" + }, "abandoned": true, "time": "2017-12-04T08:55:13+00:00" }, @@ -728,6 +791,10 @@ "testing", "xunit" ], + "support": { + "issues": "https://github.com/sebastianbergmann/phpunit/issues", + "source": "https://github.com/sebastianbergmann/phpunit/tree/4.8.36" + }, "time": "2017-06-21T08:07:12+00:00" }, { @@ -784,6 +851,11 @@ "mock", "xunit" ], + "support": { + "irc": "irc://irc.freenode.net/phpunit", + "issues": "https://github.com/sebastianbergmann/phpunit-mock-objects/issues", + "source": "https://github.com/sebastianbergmann/phpunit-mock-objects/tree/2.3" + }, "abandoned": true, "time": "2015-10-02T06:51:40+00:00" }, @@ -849,6 +921,10 @@ "compare", "equality" ], + "support": { + "issues": "https://github.com/sebastianbergmann/comparator/issues", + "source": "https://github.com/sebastianbergmann/comparator/tree/1.2" + }, "time": "2017-03-07T10:34:43+00:00" }, { @@ -901,27 +977,31 @@ "keywords": [ "diff" ], + "support": { + "issues": "https://github.com/sebastianbergmann/diff/issues", + "source": "https://github.com/sebastianbergmann/diff/tree/1.4" + }, "time": "2017-05-22T07:24:03+00:00" }, { "name": "sebastian/environment", - "version": "1.3.x-dev", + "version": "1.3.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "67f55699c2810ff0f2cc47478bbdeda8567e68ee" + "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/67f55699c2810ff0f2cc47478bbdeda8567e68ee", - "reference": "67f55699c2810ff0f2cc47478bbdeda8567e68ee", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/be2c607e43ce4c89ecd60e75c6a85c126e754aea", + "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea", "shasum": "" }, "require": { "php": "^5.3.3 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" + "phpunit/phpunit": "^4.8 || ^5.0" }, "type": "library", "extra": { @@ -951,34 +1031,38 @@ "environment", "hhvm" ], - "time": "2017-02-28T08:18:59+00:00" + "support": { + "issues": "https://github.com/sebastianbergmann/environment/issues", + "source": "https://github.com/sebastianbergmann/environment/tree/1.3" + }, + "time": "2016-08-18T05:49:44+00:00" }, { "name": "sebastian/exporter", - "version": "1.2.x-dev", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "dcd43bcc0fd3551bd2ede0081882d549bb78225d" + "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/dcd43bcc0fd3551bd2ede0081882d549bb78225d", - "reference": "dcd43bcc0fd3551bd2ede0081882d549bb78225d", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4", + "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4", "shasum": "" }, "require": { - "php": "^5.3.3 || ^7.0", - "sebastian/recursion-context": "^1.0" + "php": ">=5.3.3", + "sebastian/recursion-context": "~1.0" }, "require-dev": { "ext-mbstring": "*", - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" + "phpunit/phpunit": "~4.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" + "dev-master": "1.3.x-dev" } }, "autoload": { @@ -1018,27 +1102,31 @@ "export", "exporter" ], - "time": "2017-02-26T13:09:30+00:00" + "support": { + "issues": "https://github.com/sebastianbergmann/exporter/issues", + "source": "https://github.com/sebastianbergmann/exporter/tree/master" + }, + "time": "2016-06-17T09:04:28+00:00" }, { "name": "sebastian/global-state", - "version": "1.1.x-dev", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "cea85a84b00f2795341ebbbca4fa396347f2494e" + "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/cea85a84b00f2795341ebbbca4fa396347f2494e", - "reference": "cea85a84b00f2795341ebbbca4fa396347f2494e", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4", + "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "phpunit/phpunit": "~4.2|~5.0" + "phpunit/phpunit": "~4.2" }, "suggest": { "ext-uopz": "*" @@ -1069,7 +1157,11 @@ "keywords": [ "global state" ], - "time": "2017-02-23T14:11:06+00:00" + "support": { + "issues": "https://github.com/sebastianbergmann/global-state/issues", + "source": "https://github.com/sebastianbergmann/global-state/tree/1.1.1" + }, + "time": "2015-10-12T03:26:01+00:00" }, { "name": "sebastian/recursion-context", @@ -1122,6 +1214,10 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", + "support": { + "issues": "https://github.com/sebastianbergmann/recursion-context/issues", + "source": "https://github.com/sebastianbergmann/recursion-context/tree/master" + }, "time": "2016-10-03T07:41:43+00:00" }, { @@ -1157,6 +1253,10 @@ ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", + "support": { + "issues": "https://github.com/sebastianbergmann/version/issues", + "source": "https://github.com/sebastianbergmann/version/tree/1.0.6" + }, "time": "2015-06-21T13:59:46+00:00" }, { @@ -1181,21 +1281,21 @@ }, "type": "library", "extra": { + "thanks": { + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" + }, "branch-alias": { "dev-main": "1.19-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Ctype\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1219,6 +1319,23 @@ "polyfill", "portable" ], + "support": { + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.19.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-10-23T09:01:57+00:00" }, { @@ -1269,6 +1386,9 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/yaml/tree/2.8" + }, "time": "2018-11-11T11:18:13+00:00" } ], diff --git a/src/packlink.php b/src/packlink.php index 7e03c93..47b0031 100755 --- 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.20'; + $this->version = '3.2.21'; $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_);