Merge pull request wuunder#38 from wuunder/development

Development

CHANGELOG.md

@@ -8,6 +8,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 ## Released
 
+## [1.3.8](https://github.com/kabisa/wuunder-webshopplugin-prestashop/releases/tag/1.3.8)
+
+### Fixed
+- Fixed weight calculation for orders. Added quantity per line for calculation of total weight, not just the lines itself
+
 ## [1.3.7](https://github.com/kabisa/wuunder-webshopplugin-prestashop/releases/tag/1.3.7)
 
 ### Fixed

wuunderconnector/config.xml

@@ -2,7 +2,7 @@
 <module>
     <name>wuunderconnector</name>
     <displayName><![CDATA[Wuunder shipping module]]></displayName>
-    <version><![CDATA[1.3.7]]></version>
+    <version><![CDATA[1.3.8]]></version>
     <description><![CDATA[Send and receive your shipments easily, personally and efficiently. You can ship via more then 23 carriers. Wuunder takes care of all your transport and warehouse solutions you need.]]></description>
     <author><![CDATA[Wuunder]]></author>
     <tab><![CDATA[shipping_logistics]]></tab>

wuunderconnector/controllers/admin/AdminWuunderConnector.php

@@ -42,7 +42,7 @@ public function __construct()
         $this->logger->setFilename(_PS_ROOT_DIR_ . ((_PS_VERSION_ < '1.7') ? "/log/wuunder.log" : "/app/logs/wuunder.log"));
         $this->bootstrap = true;
         $this->override_folder = "";
-        $this->sourceObj = array("product" => "Prestashop extension", "version" => array("build" => "1.3.7", "plugin" => "1.0"));
+        $this->sourceObj = array("product" => "Prestashop extension", "version" => array("build" => "1.3.8", "plugin" => "1.0"));
     }
 
     private function setBookingToken($order_id, $booking_url, $booking_token)
@@ -108,7 +108,7 @@ private function getOrdersInfo()
 
     private function getOrderInfo($order_id)
     {
-        $sql = 'SELECT  O.*, AD.*, CL.iso_code, C.email, SUM(OD.product_weight) as weight, MIN(OD.product_id) as id_product, GROUP_CONCAT(OD.product_name SEPARATOR ". ") as description
+        $sql = 'SELECT  O.*, AD.*, CL.iso_code, C.email, SUM(OD.product_quantity * OD.product_weight) as weight, MIN(OD.product_id) as id_product, GROUP_CONCAT(OD.product_name SEPARATOR ". ") as description
                     FROM    ' . _DB_PREFIX_ . 'orders AS O,
                             ' . _DB_PREFIX_ . 'carrier AS CA,
                             ' . _DB_PREFIX_ . 'customer AS C,

wuunderconnector/wuunderconnector.php

@@ -52,7 +52,7 @@ public function __construct()
         $this->name = 'wuunderconnector';
         $this->tab = 'shipping_logistics';
 
-        $this->version = '1.3.7';
+        $this->version = '1.3.8';
 
         $this->author = 'Wuunder';
         $this->need_instance = 0;