diff --git a/PluginInstallation/CHANGELOG.md b/PluginInstallation/CHANGELOG.md index a739746..8accf14 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.5](https://github.com/packlink-dev/prestashop_module/compare/v3.2.4...v3.2.5) +# Changed +- Updated to Core version 3.3.10. + ## [3.2.4](https://github.com/packlink-dev/prestashop_module/compare/v3.2.3...v3.2.4) # Added - Added carrier logos for Colis Prive and Shop2Shop shipping services. diff --git a/src/classes/BusinessLogicServices/ShopOrderService.php b/src/classes/BusinessLogicServices/ShopOrderService.php index db261cc..e57bd5e 100644 --- a/src/classes/BusinessLogicServices/ShopOrderService.php +++ b/src/classes/BusinessLogicServices/ShopOrderService.php @@ -93,7 +93,6 @@ public function getOrderAndShippingData($orderId) $order->setCurrency($currency['iso_code']); $order->setTotalPrice((float)$sourceOrder->total_paid_tax_incl); $order->setBasePrice((float)$sourceOrder->total_paid_tax_excl); - $dropOffId = $this->getDropOffId($sourceOrder); if ($dropOffId) { $order->setShippingDropOffId($dropOffId); @@ -269,6 +268,7 @@ private function getOrderItem($sourceOrderItem, $defaultParcel) $product = new \Product((int)$sourceOrderItem['product_id']); $languageId = (int)\Context::getContext()->language->id; + $orderItem->setQuantity((int)$sourceOrderItem['product_quantity']); if (!empty($product->name)) { diff --git a/src/composer.json b/src/composer.json index 29ea983..2f6d388 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.4", + "version": "3.2.5", "repositories": [ { "type": "vcs", @@ -13,7 +13,7 @@ "minimum-stability": "dev", "require": { "php": ">=5.3", - "packlink/integration-core": "3.3.8", + "packlink/integration-core": "3.3.10", "ext-json": "*", "ext-curl": "*", "ext-zip": "*", diff --git a/src/composer.lock b/src/composer.lock index ad25d45..e871946 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": "a17143de2a1200e8aae5829e3e4116ed", + "content-hash": "c17301791eb5111693a3927e33eaff61", "packages": [ { "name": "iio/libmergepdf", @@ -58,16 +58,16 @@ }, { "name": "packlink/integration-core", - "version": "3.3.8", + "version": "v3.3.10", "source": { "type": "git", "url": "git@github.com:packlink-dev/ecommerce_module_core.git", - "reference": "2762650a01458b862a8af55c83dcbe02b6410ac5" + "reference": "3c950d28f7e7c19964fd42ddd67476e26f6f0aab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/packlink-dev/ecommerce_module_core/zipball/2762650a01458b862a8af55c83dcbe02b6410ac5", - "reference": "2762650a01458b862a8af55c83dcbe02b6410ac5", + "url": "https://api.github.com/repos/packlink-dev/ecommerce_module_core/zipball/3c950d28f7e7c19964fd42ddd67476e26f6f0aab", + "reference": "3c950d28f7e7c19964fd42ddd67476e26f6f0aab", "shasum": "" }, "require": { @@ -106,7 +106,7 @@ "proprietary" ], "description": "Packlink integrations core library", - "time": "2022-05-09T14:40:09+00:00" + "time": "2022-06-27T10:41:04+00:00" }, { "name": "setasign/fpdf", @@ -1288,5 +1288,5 @@ "platform-overrides": { "php": "5.3.29" }, - "plugin-api-version": "1.1.0" + "plugin-api-version": "2.3.0" } diff --git a/src/packlink.php b/src/packlink.php index 1f611e2..cd6b133 100644 --- 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.4'; + $this->version = '3.2.5'; $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_);