Merge pull request #34 from wuunder/development

Development

CHANGELOG.md

@@ -8,6 +8,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 ## Released
 
+## [1.3.5](https://github.com/kabisa/wuunder-webshopplugin-prestashop/releases/tag/1.3.5)
+
+### Fixed
+- Changed Link to instance to access getImageLink correctly
+- Added business name to receiver address in booking
+
 ## [1.3.3](https://github.com/kabisa/wuunder-webshopplugin-prestashop/releases/tag/1.3.3)
 
 ### Added

wuunderconnector/config.xml

@@ -2,7 +2,7 @@
 <module>
     <name>wuunderconnector</name>
     <displayName><![CDATA[Wuunder shipping module]]></displayName>
-    <version><![CDATA[1.3.4]]></version>
+    <version><![CDATA[1.3.5]]></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.4", "plugin" => "1.0"));
+        $this->sourceObj = array("product" => "Prestashop extension", "version" => array("build" => "1.3.5", "plugin" => "1.0"));
     }
 
     private function setBookingToken($order_id, $booking_url, $booking_token)
@@ -204,6 +204,7 @@ private function buildWuunderData($order_info)
         $customerAdr->setZipCode($shippingAddress->postcode);
         $customerAdr->setPhoneNumber($shippingAddress->phone);
         $customerAdr->setCountry($order_info['iso_code']);
+        $customerAdr->setBusiness($shippingAddress->company);
 
         $webshopAdr = new \Wuunder\Api\Config\AddressConfig();
 
@@ -225,7 +226,8 @@ private function buildWuunderData($order_info)
         $image= Image::getCover($order_info['id_product']);
         $product = new Product(($order_info['id_product']));
         $protocol = array_key_exists('HTTPS', $_SERVER) && $_SERVER['HTTPS'] == "on"? 'https://' : 'http://';
-        $imagePath = $protocol . Link::getImageLink($product->link_rewrite[Context::getContext()->language->id], $image['id_image'], 'home_default');
+        $link = new Link();
+        $imagePath = $protocol . $link->getImageLink($product->link_rewrite[Context::getContext()->language->id], $image['id_image'], 'home_default');
         if ($imagePath) {
             $image = base64_encode(Tools::file_get_contents($imagePath));
         }

wuunderconnector/wuunderconnector.php

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