Merge pull request #43 from logeecom/dev

Release version 3.2.5
packlink-dev · Jun 27, 2022 · 2ba088a · 2ba088a
2 parents 4d79bf4 + ab5ccbd
commit 2ba088a
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
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.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
@@ -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
@@ -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
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.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_);