From 1bd47573731e607cd0a7e5a6e36ddb95f54b6c87 Mon Sep 17 00:00:00 2001
From: Tim Dohmen <tim.dohmen@wearewuunder.com>
Date: Tue, 25 Feb 2020 09:28:44 +0100
Subject: [PATCH 1/6] Changes for prestashop validator.

---
 wuunderconnector/composer.json                |  3 +
 wuunderconnector/config.xml                   |  2 +-
 .../admin/AdminWuunderConnector.php           |  4 +-
 .../views/css/admin/datatable.css             |  2 +-
 .../views/js/admin/datatable.min.js           |  2 +-
 .../templates/admin/AdminWuunderConnector.tpl |  2 +-
 .../templates/admin/WuunderCarrierContent.tpl | 24 +++++++
 .../views/templates/hook/javascript_ini.tpl   |  4 +-
 wuunderconnector/wuunderconnector.php         | 67 ++++++++-----------
 9 files changed, 64 insertions(+), 46 deletions(-)

diff --git a/wuunderconnector/composer.json b/wuunderconnector/composer.json
index b998dcd..bd6c5f0 100644
--- a/wuunderconnector/composer.json
+++ b/wuunderconnector/composer.json
@@ -1,4 +1,7 @@
 {
+    "config": {
+        "prepend-autoloader": false
+    },
     "require": {
         "wuunder/connector-php": ">=1.0.0"
     }
diff --git a/wuunderconnector/config.xml b/wuunderconnector/config.xml
index dca0480..23bf0c4 100644
--- a/wuunderconnector/config.xml
+++ b/wuunderconnector/config.xml
@@ -2,7 +2,7 @@
 <module>
     <name>wuunderconnector</name>
     <displayName><![CDATA[Wuunder shipping module]]></displayName>
-    <version><![CDATA[1.3.3]]></version>
+    <version><![CDATA[1.3.4]]></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>
diff --git a/wuunderconnector/controllers/admin/AdminWuunderConnector.php b/wuunderconnector/controllers/admin/AdminWuunderConnector.php
index 63ca360..16aee9f 100644
--- a/wuunderconnector/controllers/admin/AdminWuunderConnector.php
+++ b/wuunderconnector/controllers/admin/AdminWuunderConnector.php
@@ -222,8 +222,8 @@ private function buildWuunderData($order_info)
 
         // Load product image for first ordered item
         $image = null;
-        if (file_exists('../img/p/' . $order_info['id_product'] . '/' . $order_info['id_product'] . '-home_default.jpg')) {
-            $image = base64_encode(Tools::file_get_contents('../img/p/' . $order_info['id_product'] . '/' . $order_info['id_product'] . '-home_default.jpg'));
+        if (file_exists(getFormatedName('../img/p/' . $order_info['id_product'] . '/' . $order_info['id_product'] . '-home'))) {
+            $image = base64_encode(Tools::file_get_contents(ImageType::getFormatedName('../img/p/' . $order_info['id_product'] . '/' . $order_info['id_product'] . '-home')));
         }
         $product_data = $this->getOrderProductDetails($order_info['id_product']);
         $length = round($product_data['depth']);
diff --git a/wuunderconnector/views/css/admin/datatable.css b/wuunderconnector/views/css/admin/datatable.css
index 1b76896..869a0a4 100644
--- a/wuunderconnector/views/css/admin/datatable.css
+++ b/wuunderconnector/views/css/admin/datatable.css
@@ -1 +1 @@
-table.dataTable{width:100%;margin:0 auto;clear:both;border-collapse:separate;border-spacing:0}table.dataTable thead th,table.dataTable tfoot th{font-weight:bold}table.dataTable thead th,table.dataTable thead td{padding:10px 18px;border-bottom:1px solid #111}table.dataTable thead th:active,table.dataTable thead td:active{outline:none}table.dataTable tfoot th,table.dataTable tfoot td{padding:10px 18px 6px 18px;border-top:1px solid #111}table.dataTable thead .sorting,table.dataTable thead .sorting_asc,table.dataTable thead .sorting_desc,table.dataTable thead .sorting_asc_disabled,table.dataTable thead .sorting_desc_disabled{cursor:pointer;*cursor:hand}table.dataTable thead .sorting,table.dataTable thead .sorting_asc,table.dataTable thead .sorting_desc,table.dataTable thead .sorting_asc_disabled,table.dataTable thead .sorting_desc_disabled{background-repeat:no-repeat;background-position:center right}table.dataTable thead .sorting{background-image:url("../../img/css/sort_both.png")}table.dataTable thead .sorting_asc{background-image:url("../../img/css/sort_asc.png")}table.dataTable thead .sorting_desc{background-image:url("../../img/css/sort_desc.png")}table.dataTable thead .sorting_asc_disabled{background-image:url("../../img/css/sort_asc_disabled.png")}table.dataTable thead .sorting_desc_disabled{background-image:url("../../img/css/sort_desc_disabled.png")}table.dataTable tbody tr{background-color:#ffffff}table.dataTable tbody tr.selected{background-color:#B0BED9}table.dataTable tbody th,table.dataTable tbody td{padding:8px 10px}table.dataTable.row-border tbody th,table.dataTable.row-border tbody td,table.dataTable.display tbody th,table.dataTable.display tbody td{border-top:1px solid #ddd}table.dataTable.row-border tbody tr:first-child th,table.dataTable.row-border tbody tr:first-child td,table.dataTable.display tbody tr:first-child th,table.dataTable.display tbody tr:first-child td{border-top:none}table.dataTable.cell-border tbody th,table.dataTable.cell-border tbody td{border-top:1px solid #ddd;border-right:1px solid #ddd}table.dataTable.cell-border tbody tr th:first-child,table.dataTable.cell-border tbody tr td:first-child{border-left:1px solid #ddd}table.dataTable.cell-border tbody tr:first-child th,table.dataTable.cell-border tbody tr:first-child td{border-top:none}table.dataTable.stripe tbody tr.odd,table.dataTable.display tbody tr.odd{background-color:#f9f9f9}table.dataTable.stripe tbody tr.odd.selected,table.dataTable.display tbody tr.odd.selected{background-color:#acbad4}table.dataTable.hover tbody tr:hover,table.dataTable.display tbody tr:hover{background-color:#f6f6f6}table.dataTable.hover tbody tr:hover.selected,table.dataTable.display tbody tr:hover.selected{background-color:#aab7d1}table.dataTable.order-column tbody tr>.sorting_1,table.dataTable.order-column tbody tr>.sorting_2,table.dataTable.order-column tbody tr>.sorting_3,table.dataTable.display tbody tr>.sorting_1,table.dataTable.display tbody tr>.sorting_2,table.dataTable.display tbody tr>.sorting_3{background-color:#fafafa}table.dataTable.order-column tbody tr.selected>.sorting_1,table.dataTable.order-column tbody tr.selected>.sorting_2,table.dataTable.order-column tbody tr.selected>.sorting_3,table.dataTable.display tbody tr.selected>.sorting_1,table.dataTable.display tbody tr.selected>.sorting_2,table.dataTable.display tbody tr.selected>.sorting_3{background-color:#acbad5}table.dataTable.display tbody tr.odd>.sorting_1,table.dataTable.order-column.stripe tbody tr.odd>.sorting_1{background-color:#f1f1f1}table.dataTable.display tbody tr.odd>.sorting_2,table.dataTable.order-column.stripe tbody tr.odd>.sorting_2{background-color:#f3f3f3}table.dataTable.display tbody tr.odd>.sorting_3,table.dataTable.order-column.stripe tbody tr.odd>.sorting_3{background-color:whitesmoke}table.dataTable.display tbody tr.odd.selected>.sorting_1,table.dataTable.order-column.stripe tbody tr.odd.selected>.sorting_1{background-color:#a6b4cd}table.dataTable.display tbody tr.odd.selected>.sorting_2,table.dataTable.order-column.stripe tbody tr.odd.selected>.sorting_2{background-color:#a8b5cf}table.dataTable.display tbody tr.odd.selected>.sorting_3,table.dataTable.order-column.stripe tbody tr.odd.selected>.sorting_3{background-color:#a9b7d1}table.dataTable.display tbody tr.even>.sorting_1,table.dataTable.order-column.stripe tbody tr.even>.sorting_1{background-color:#fafafa}table.dataTable.display tbody tr.even>.sorting_2,table.dataTable.order-column.stripe tbody tr.even>.sorting_2{background-color:#fcfcfc}table.dataTable.display tbody tr.even>.sorting_3,table.dataTable.order-column.stripe tbody tr.even>.sorting_3{background-color:#fefefe}table.dataTable.display tbody tr.even.selected>.sorting_1,table.dataTable.order-column.stripe tbody tr.even.selected>.sorting_1{background-color:#acbad5}table.dataTable.display tbody tr.even.selected>.sorting_2,table.dataTable.order-column.stripe tbody tr.even.selected>.sorting_2{background-color:#aebcd6}table.dataTable.display tbody tr.even.selected>.sorting_3,table.dataTable.order-column.stripe tbody tr.even.selected>.sorting_3{background-color:#afbdd8}table.dataTable.display tbody tr:hover>.sorting_1,table.dataTable.order-column.hover tbody tr:hover>.sorting_1{background-color:#eaeaea}table.dataTable.display tbody tr:hover>.sorting_2,table.dataTable.order-column.hover tbody tr:hover>.sorting_2{background-color:#ececec}table.dataTable.display tbody tr:hover>.sorting_3,table.dataTable.order-column.hover tbody tr:hover>.sorting_3{background-color:#efefef}table.dataTable.display tbody tr:hover.selected>.sorting_1,table.dataTable.order-column.hover tbody tr:hover.selected>.sorting_1{background-color:#a2aec7}table.dataTable.display tbody tr:hover.selected>.sorting_2,table.dataTable.order-column.hover tbody tr:hover.selected>.sorting_2{background-color:#a3b0c9}table.dataTable.display tbody tr:hover.selected>.sorting_3,table.dataTable.order-column.hover tbody tr:hover.selected>.sorting_3{background-color:#a5b2cb}table.dataTable.no-footer{border-bottom:1px solid #111}table.dataTable.nowrap th,table.dataTable.nowrap td{white-space:nowrap}table.dataTable.compact thead th,table.dataTable.compact thead td{padding:4px 17px 4px 4px}table.dataTable.compact tfoot th,table.dataTable.compact tfoot td{padding:4px}table.dataTable.compact tbody th,table.dataTable.compact tbody td{padding:4px}table.dataTable th.dt-left,table.dataTable td.dt-left{text-align:left}table.dataTable th.dt-center,table.dataTable td.dt-center,table.dataTable td.dataTables_empty{text-align:center}table.dataTable th.dt-right,table.dataTable td.dt-right{text-align:right}table.dataTable th.dt-justify,table.dataTable td.dt-justify{text-align:justify}table.dataTable th.dt-nowrap,table.dataTable td.dt-nowrap{white-space:nowrap}table.dataTable thead th.dt-head-left,table.dataTable thead td.dt-head-left,table.dataTable tfoot th.dt-head-left,table.dataTable tfoot td.dt-head-left{text-align:left}table.dataTable thead th.dt-head-center,table.dataTable thead td.dt-head-center,table.dataTable tfoot th.dt-head-center,table.dataTable tfoot td.dt-head-center{text-align:center}table.dataTable thead th.dt-head-right,table.dataTable thead td.dt-head-right,table.dataTable tfoot th.dt-head-right,table.dataTable tfoot td.dt-head-right{text-align:right}table.dataTable thead th.dt-head-justify,table.dataTable thead td.dt-head-justify,table.dataTable tfoot th.dt-head-justify,table.dataTable tfoot td.dt-head-justify{text-align:justify}table.dataTable thead th.dt-head-nowrap,table.dataTable thead td.dt-head-nowrap,table.dataTable tfoot th.dt-head-nowrap,table.dataTable tfoot td.dt-head-nowrap{white-space:nowrap}table.dataTable tbody th.dt-body-left,table.dataTable tbody td.dt-body-left{text-align:left}table.dataTable tbody th.dt-body-center,table.dataTable tbody td.dt-body-center{text-align:center}table.dataTable tbody th.dt-body-right,table.dataTable tbody td.dt-body-right{text-align:right}table.dataTable tbody th.dt-body-justify,table.dataTable tbody td.dt-body-justify{text-align:justify}table.dataTable tbody th.dt-body-nowrap,table.dataTable tbody td.dt-body-nowrap{white-space:nowrap}table.dataTable,table.dataTable th,table.dataTable td{-webkit-box-sizing:content-box;box-sizing:content-box}.dataTables_wrapper{position:relative;clear:both;*zoom:1;zoom:1}.dataTables_wrapper .dataTables_length{float:left}.dataTables_wrapper .dataTables_filter{float:right;text-align:right}.dataTables_wrapper .dataTables_filter input{margin-left:0.5em}.dataTables_wrapper .dataTables_info{clear:both;float:left;padding-top:0.755em}.dataTables_wrapper .dataTables_paginate{float:right;text-align:right;padding-top:0.25em}.dataTables_wrapper .dataTables_paginate .paginate_button{box-sizing:border-box;display:inline-block;min-width:1.5em;padding:0.5em 1em;margin-left:2px;text-align:center;text-decoration:none !important;cursor:pointer;*cursor:hand;color:#333 !important;border:1px solid transparent;border-radius:2px}.dataTables_wrapper .dataTables_paginate .paginate_button.current,.dataTables_wrapper .dataTables_paginate .paginate_button.current:hover{color:#333 !important;border:1px solid #979797;background-color:white;background:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #fff), color-stop(100%, #dcdcdc));background:-webkit-linear-gradient(top, #fff 0%, #dcdcdc 100%);background:-moz-linear-gradient(top, #fff 0%, #dcdcdc 100%);background:-ms-linear-gradient(top, #fff 0%, #dcdcdc 100%);background:-o-linear-gradient(top, #fff 0%, #dcdcdc 100%);background:linear-gradient(to bottom, #fff 0%, #dcdcdc 100%)}.dataTables_wrapper .dataTables_paginate .paginate_button.disabled,.dataTables_wrapper .dataTables_paginate .paginate_button.disabled:hover,.dataTables_wrapper .dataTables_paginate .paginate_button.disabled:active{cursor:default;color:#666 !important;border:1px solid transparent;background:transparent;box-shadow:none}.dataTables_wrapper .dataTables_paginate .paginate_button:hover{color:white !important;border:1px solid #111;background-color:#585858;background:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #585858), color-stop(100%, #111));background:-webkit-linear-gradient(top, #585858 0%, #111 100%);background:-moz-linear-gradient(top, #585858 0%, #111 100%);background:-ms-linear-gradient(top, #585858 0%, #111 100%);background:-o-linear-gradient(top, #585858 0%, #111 100%);background:linear-gradient(to bottom, #585858 0%, #111 100%)}.dataTables_wrapper .dataTables_paginate .paginate_button:active{outline:none;background-color:#2b2b2b;background:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #2b2b2b), color-stop(100%, #0c0c0c));background:-webkit-linear-gradient(top, #2b2b2b 0%, #0c0c0c 100%);background:-moz-linear-gradient(top, #2b2b2b 0%, #0c0c0c 100%);background:-ms-linear-gradient(top, #2b2b2b 0%, #0c0c0c 100%);background:-o-linear-gradient(top, #2b2b2b 0%, #0c0c0c 100%);background:linear-gradient(to bottom, #2b2b2b 0%, #0c0c0c 100%);box-shadow:inset 0 0 3px #111}.dataTables_wrapper .dataTables_paginate .ellipsis{padding:0 1em}.dataTables_wrapper .dataTables_processing{position:absolute;top:50%;left:50%;width:100%;height:40px;margin-left:-50%;margin-top:-25px;padding-top:20px;text-align:center;font-size:1.2em;background-color:white;background:-webkit-gradient(linear, left top, right top, color-stop(0%, rgba(255,255,255,0)), color-stop(25%, rgba(255,255,255,0.9)), color-stop(75%, rgba(255,255,255,0.9)), color-stop(100%, rgba(255,255,255,0)));background:-webkit-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);background:-moz-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);background:-ms-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);background:-o-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);background:linear-gradient(to right, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%)}.dataTables_wrapper .dataTables_length,.dataTables_wrapper .dataTables_filter,.dataTables_wrapper .dataTables_info,.dataTables_wrapper .dataTables_processing,.dataTables_wrapper .dataTables_paginate{color:#333}.dataTables_wrapper .dataTables_scroll{clear:both}.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody{*margin-top:-1px;-webkit-overflow-scrolling:touch}.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody>table>thead>tr>th,.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody>table>thead>tr>td,.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody>table>tbody>tr>th,.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody>table>tbody>tr>td{vertical-align:middle}.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody>table>thead>tr>th>div.dataTables_sizing,.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody>table>thead>tr>td>div.dataTables_sizing,.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody>table>tbody>tr>th>div.dataTables_sizing,.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody>table>tbody>tr>td>div.dataTables_sizing{height:0;overflow:hidden;margin:0 !important;padding:0 !important}.dataTables_wrapper.no-footer .dataTables_scrollBody{border-bottom:1px solid #111}.dataTables_wrapper.no-footer div.dataTables_scrollHead>table,.dataTables_wrapper.no-footer div.dataTables_scrollBody>table{border-bottom:none}.dataTables_wrapper:after{visibility:hidden;display:block;content:"";clear:both;height:0}@media screen and (max-width: 767px){.dataTables_wrapper .dataTables_info,.dataTables_wrapper .dataTables_paginate{float:none;text-align:center}.dataTables_wrapper .dataTables_paginate{margin-top:0.5em}}@media screen and (max-width: 640px){.dataTables_wrapper .dataTables_length,.dataTables_wrapper .dataTables_filter{float:none;text-align:center}.dataTables_wrapper .dataTables_filter{margin-top:0.5em}}
\ No newline at end of file
+table.dataTable{width:100%;margin:0 auto;clear:both;border-collapse:separate;border-spacing:0}table.dataTable thead th,table.dataTable tfoot th{font-weight:bold}table.dataTable thead th,table.dataTable thead td{padding:10px 18px;border-bottom:1px solid #111}table.dataTable thead th:active,table.dataTable thead td:active{outline:none}table.dataTable tfoot th,table.dataTable tfoot td{padding:10px 18px 6px 18px;border-top:1px solid #111}table.dataTable thead .sorting,table.dataTable thead .sorting_asc,table.dataTable thead .sorting_desc,table.dataTable thead .sorting_asc_disabled,table.dataTable thead .sorting_desc_disabled{cursor:pointer;*cursor:hand}table.dataTable thead .sorting,table.dataTable thead .sorting_asc,table.dataTable thead .sorting_desc,table.dataTable thead .sorting_asc_disabled,table.dataTable thead .sorting_desc_disabled{background-repeat:no-repeat;background-position:center right}table.dataTable thead .sorting{background-image:url("../../img/css/sort_both.png")}  table.dataTable thead .sorting_asc{background-image:url("../../img/css/sort_asc.png")}  table.dataTable thead .sorting_desc{background-image:url("../../img/css/sort_desc.png")}  table.dataTable thead .sorting_asc_disabled{background-image:url("../../img/css/sort_asc_disabled.png")}  table.dataTable thead .sorting_desc_disabled{background-image:url("../../img/css/sort_desc_disabled.png")}  table.dataTable tbody tr{background-color:#ffffff}  table.dataTable tbody tr.selected{background-color:#B0BED9}  table.dataTable tbody th,table.dataTable tbody td{padding:8px 10px}  table.dataTable.row-border tbody th,table.dataTable.row-border tbody td,table.dataTable.display tbody th,table.dataTable.display tbody td{border-top:1px solid #ddd}  table.dataTable.row-border tbody tr:first-child th,table.dataTable.row-border tbody tr:first-child td,table.dataTable.display tbody tr:first-child th,table.dataTable.display tbody tr:first-child td{border-top:none}  table.dataTable.cell-border tbody th,table.dataTable.cell-border tbody td{border-top:1px solid #ddd;border-right:1px solid #ddd}  table.dataTable.cell-border tbody tr th:first-child,table.dataTable.cell-border tbody tr td:first-child{border-left:1px solid #ddd}  table.dataTable.cell-border tbody tr:first-child th,table.dataTable.cell-border tbody tr:first-child td{border-top:none}  table.dataTable.stripe tbody tr.odd,table.dataTable.display tbody tr.odd{background-color:#f9f9f9}  table.dataTable.stripe tbody tr.odd.selected,table.dataTable.display tbody tr.odd.selected{background-color:#acbad4}  table.dataTable.hover tbody tr:hover,table.dataTable.display tbody tr:hover{background-color:#f6f6f6}  table.dataTable.hover tbody tr:hover.selected,table.dataTable.display tbody tr:hover.selected{background-color:#aab7d1}  table.dataTable.order-column tbody tr>.sorting_1,table.dataTable.order-column tbody tr>.sorting_2,table.dataTable.order-column tbody tr>.sorting_3,table.dataTable.display tbody tr>.sorting_1,table.dataTable.display tbody tr>.sorting_2,table.dataTable.display tbody tr>.sorting_3{background-color:#fafafa}  table.dataTable.order-column tbody tr.selected>.sorting_1,table.dataTable.order-column tbody tr.selected>.sorting_2,table.dataTable.order-column tbody tr.selected>.sorting_3,table.dataTable.display tbody tr.selected>.sorting_1,table.dataTable.display tbody tr.selected>.sorting_2,table.dataTable.display tbody tr.selected>.sorting_3{background-color:#acbad5}  table.dataTable.display tbody tr.odd>.sorting_1,table.dataTable.order-column.stripe tbody tr.odd>.sorting_1{background-color:#f1f1f1}  table.dataTable.display tbody tr.odd>.sorting_2,table.dataTable.order-column.stripe tbody tr.odd>.sorting_2{background-color:#f3f3f3}  table.dataTable.display tbody tr.odd>.sorting_3,table.dataTable.order-column.stripe tbody tr.odd>.sorting_3{background-color:whitesmoke}  table.dataTable.display tbody tr.odd.selected>.sorting_1,table.dataTable.order-column.stripe tbody tr.odd.selected>.sorting_1{background-color:#a6b4cd}  table.dataTable.display tbody tr.odd.selected>.sorting_2,table.dataTable.order-column.stripe tbody tr.odd.selected>.sorting_2{background-color:#a8b5cf}  table.dataTable.display tbody tr.odd.selected>.sorting_3,table.dataTable.order-column.stripe tbody tr.odd.selected>.sorting_3{background-color:#a9b7d1}  table.dataTable.display tbody tr.even>.sorting_1,table.dataTable.order-column.stripe tbody tr.even>.sorting_1{background-color:#fafafa}  table.dataTable.display tbody tr.even>.sorting_2,table.dataTable.order-column.stripe tbody tr.even>.sorting_2{background-color:#fcfcfc}  table.dataTable.display tbody tr.even>.sorting_3,table.dataTable.order-column.stripe tbody tr.even>.sorting_3{background-color:#fefefe}  table.dataTable.display tbody tr.even.selected>.sorting_1,table.dataTable.order-column.stripe tbody tr.even.selected>.sorting_1{background-color:#acbad5}  table.dataTable.display tbody tr.even.selected>.sorting_2,table.dataTable.order-column.stripe tbody tr.even.selected>.sorting_2{background-color:#aebcd6}  table.dataTable.display tbody tr.even.selected>.sorting_3,table.dataTable.order-column.stripe tbody tr.even.selected>.sorting_3{background-color:#afbdd8}  table.dataTable.display tbody tr:hover>.sorting_1,table.dataTable.order-column.hover tbody tr:hover>.sorting_1{background-color:#eaeaea}  table.dataTable.display tbody tr:hover>.sorting_2,table.dataTable.order-column.hover tbody tr:hover>.sorting_2{background-color:#ececec}  table.dataTable.display tbody tr:hover>.sorting_3,table.dataTable.order-column.hover tbody tr:hover>.sorting_3{background-color:#efefef}  table.dataTable.display tbody tr:hover.selected>.sorting_1,table.dataTable.order-column.hover tbody tr:hover.selected>.sorting_1{background-color:#a2aec7}  table.dataTable.display tbody tr:hover.selected>.sorting_2,table.dataTable.order-column.hover tbody tr:hover.selected>.sorting_2{background-color:#a3b0c9}  table.dataTable.display tbody tr:hover.selected>.sorting_3,table.dataTable.order-column.hover tbody tr:hover.selected>.sorting_3{background-color:#a5b2cb}  table.dataTable.no-footer{border-bottom:1px solid #111}  table.dataTable.nowrap th,table.dataTable.nowrap td{white-space:nowrap}  table.dataTable.compact thead th,table.dataTable.compact thead td{padding:4px 17px 4px 4px}  table.dataTable.compact tfoot th,table.dataTable.compact tfoot td{padding:4px}  table.dataTable.compact tbody th,table.dataTable.compact tbody td{padding:4px}  table.dataTable th.dt-left,table.dataTable td.dt-left{text-align:left}  table.dataTable th.dt-center,table.dataTable td.dt-center,table.dataTable td.dataTables_empty{text-align:center}  table.dataTable th.dt-right,table.dataTable td.dt-right{text-align:right}  table.dataTable th.dt-justify,table.dataTable td.dt-justify{text-align:justify}  table.dataTable th.dt-nowrap,table.dataTable td.dt-nowrap{white-space:nowrap}  table.dataTable thead th.dt-head-left,table.dataTable thead td.dt-head-left,table.dataTable tfoot th.dt-head-left,table.dataTable tfoot td.dt-head-left{text-align:left}  table.dataTable thead th.dt-head-center,table.dataTable thead td.dt-head-center,table.dataTable tfoot th.dt-head-center,table.dataTable tfoot td.dt-head-center{text-align:center}  table.dataTable thead th.dt-head-right,table.dataTable thead td.dt-head-right,table.dataTable tfoot th.dt-head-right,table.dataTable tfoot td.dt-head-right{text-align:right}  table.dataTable thead th.dt-head-justify,table.dataTable thead td.dt-head-justify,table.dataTable tfoot th.dt-head-justify,table.dataTable tfoot td.dt-head-justify{text-align:justify}  table.dataTable thead th.dt-head-nowrap,table.dataTable thead td.dt-head-nowrap,table.dataTable tfoot th.dt-head-nowrap,table.dataTable tfoot td.dt-head-nowrap{white-space:nowrap}  table.dataTable tbody th.dt-body-left,table.dataTable tbody td.dt-body-left{text-align:left}  table.dataTable tbody th.dt-body-center,table.dataTable tbody td.dt-body-center{text-align:center}  table.dataTable tbody th.dt-body-right,table.dataTable tbody td.dt-body-right{text-align:right}  table.dataTable tbody th.dt-body-justify,table.dataTable tbody td.dt-body-justify{text-align:justify}  table.dataTable tbody th.dt-body-nowrap,table.dataTable tbody td.dt-body-nowrap{white-space:nowrap}  table.dataTable,table.dataTable th,table.dataTable td{-webkit-box-sizing:content-box;box-sizing:content-box}  .dataTables_wrapper{position:relative;clear:both;*zoom:1;zoom:1}  .dataTables_wrapper .dataTables_length{float:left}  .dataTables_wrapper .dataTables_filter{float:right;text-align:right}  .dataTables_wrapper .dataTables_filter input{margin-left:0.5em}  .dataTables_wrapper .dataTables_info{clear:both;float:left;padding-top:0.755em}  .dataTables_wrapper .dataTables_paginate{float:right;text-align:right;padding-top:0.25em}  .dataTables_wrapper .dataTables_paginate .paginate_button{box-sizing:border-box;display:inline-block;min-width:1.5em;padding:0.5em 1em;margin-left:2px;text-align:center;text-decoration:none !important;cursor:pointer;*cursor:hand;color:#333 !important;border:1px solid transparent;border-radius:2px}  .dataTables_wrapper .dataTables_paginate .paginate_button.current,.dataTables_wrapper .dataTables_paginate .paginate_button.current:hover{color:#333 !important;border:1px solid #979797;background-color:white;background:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #fff), color-stop(100%, #dcdcdc));background:-webkit-linear-gradient(top, #fff 0%, #dcdcdc 100%);background:-moz-linear-gradient(top, #fff 0%, #dcdcdc 100%);background:-ms-linear-gradient(top, #fff 0%, #dcdcdc 100%);background:-o-linear-gradient(top, #fff 0%, #dcdcdc 100%);background:linear-gradient(to bottom, #fff 0%, #dcdcdc 100%)}  .dataTables_wrapper .dataTables_paginate .paginate_button.disabled,.dataTables_wrapper .dataTables_paginate .paginate_button.disabled:hover,.dataTables_wrapper .dataTables_paginate .paginate_button.disabled:active{cursor:default;color:#666 !important;border:1px solid transparent;background:transparent;box-shadow:none}  .dataTables_wrapper .dataTables_paginate .paginate_button:hover{color:white !important;border:1px solid #111;background-color:#585858;background:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #585858), color-stop(100%, #111));background:-webkit-linear-gradient(top, #585858 0%, #111 100%);background:-moz-linear-gradient(top, #585858 0%, #111 100%);background:-ms-linear-gradient(top, #585858 0%, #111 100%);background:-o-linear-gradient(top, #585858 0%, #111 100%);background:linear-gradient(to bottom, #585858 0%, #111 100%)}  .dataTables_wrapper .dataTables_paginate .paginate_button:active{outline:none;background-color:#2b2b2b;background:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #2b2b2b), color-stop(100%, #0c0c0c));background:-webkit-linear-gradient(top, #2b2b2b 0%, #0c0c0c 100%);background:-moz-linear-gradient(top, #2b2b2b 0%, #0c0c0c 100%);background:-ms-linear-gradient(top, #2b2b2b 0%, #0c0c0c 100%);background:-o-linear-gradient(top, #2b2b2b 0%, #0c0c0c 100%);background:linear-gradient(to bottom, #2b2b2b 0%, #0c0c0c 100%);box-shadow:inset 0 0 3px #111}  .dataTables_wrapper .dataTables_paginate .ellipsis{padding:0 1em}  .dataTables_wrapper .dataTables_processing{position:absolute;top:50%;left:50%;width:100%;height:40px;margin-left:-50%;margin-top:-25px;padding-top:20px;text-align:center;font-size:1.2em;background-color:white;background:-webkit-gradient(linear, left top, right top, color-stop(0%, rgba(255,255,255,0)), color-stop(25%, rgba(255,255,255,0.9)), color-stop(75%, rgba(255,255,255,0.9)), color-stop(100%, rgba(255,255,255,0)));background:-webkit-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);background:-moz-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);background:-ms-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);background:-o-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);background:linear-gradient(to right, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%)}  .dataTables_wrapper .dataTables_length,.dataTables_wrapper .dataTables_filter,.dataTables_wrapper .dataTables_info,.dataTables_wrapper .dataTables_processing,.dataTables_wrapper .dataTables_paginate{color:#333}  .dataTables_wrapper .dataTables_scroll{clear:both}  .dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody{*margin-top:-1px;-webkit-overflow-scrolling:touch}  .dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody>table>thead>tr>th,.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody>table>thead>tr>td,.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody>table>tbody>tr>th,.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody>table>tbody>tr>td{vertical-align:middle}  .dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody>table>thead>tr>th>div.dataTables_sizing,.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody>table>thead>tr>td>div.dataTables_sizing,.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody>table>tbody>tr>th>div.dataTables_sizing,.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody>table>tbody>tr>td>div.dataTables_sizing{height:0;overflow:hidden;margin:0 !important;padding:0 !important}  .dataTables_wrapper.no-footer .dataTables_scrollBody{border-bottom:1px solid #111}  .dataTables_wrapper.no-footer div.dataTables_scrollHead>table,.dataTables_wrapper.no-footer div.dataTables_scrollBody>table{border-bottom:none}  .dataTables_wrapper:after{visibility:hidden;display:block;content:"";clear:both;height:0}@media screen and (max-width: 767px){.dataTables_wrapper .dataTables_info,.dataTables_wrapper .dataTables_paginate{float:none;text-align:center}  .dataTables_wrapper .dataTables_paginate{margin-top:0.5em}}@media screen and (max-width: 640px){.dataTables_wrapper .dataTables_length,.dataTables_wrapper .dataTables_filter{float:none;text-align:center}  .dataTables_wrapper .dataTables_filter{margin-top:0.5em}}
\ No newline at end of file
diff --git a/wuunderconnector/views/js/admin/datatable.min.js b/wuunderconnector/views/js/admin/datatable.min.js
index 29d9113..374b9c5 100644
--- a/wuunderconnector/views/js/admin/datatable.min.js
+++ b/wuunderconnector/views/js/admin/datatable.min.js
@@ -18,7 +18,7 @@
 
  *  @author    DataTables 1.10.15
 
- *  @copyright ©2008-2019 SpryMedia Ltd - datatables.net/license
+ *  @copyright ©2008-2020 SpryMedia Ltd - datatables.net/license
 
  *  @license   LICENSE.txt
 
diff --git a/wuunderconnector/views/templates/admin/AdminWuunderConnector.tpl b/wuunderconnector/views/templates/admin/AdminWuunderConnector.tpl
index 8504384..9c8cf59 100644
--- a/wuunderconnector/views/templates/admin/AdminWuunderConnector.tpl
+++ b/wuunderconnector/views/templates/admin/AdminWuunderConnector.tpl
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
  *  @author    Wuunder Nederland BV
- *  @copyright 2015-2019 Wuunder Holding B.V.
+ *  @copyright 2015-2020 Wuunder Holding B.V.
  *  @license   LICENSE.txt
  *}
 
diff --git a/wuunderconnector/views/templates/admin/WuunderCarrierContent.tpl b/wuunderconnector/views/templates/admin/WuunderCarrierContent.tpl
index fbe3e39..48e74d8 100644
--- a/wuunderconnector/views/templates/admin/WuunderCarrierContent.tpl
+++ b/wuunderconnector/views/templates/admin/WuunderCarrierContent.tpl
@@ -1,3 +1,27 @@
+{**
+* 2007-2016 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+ *  @author    Wuunder Nederland BV
+ *  @copyright 2015-2020 Wuunder Holding B.V.
+ *  @license   LICENSE.txt
+ *}
+
 <h2>{$title}</h2>
 {foreach from=$errors item=error}
     <div class="alert error"><img src="{$psimg}admin/forbbiden.gif" alt="nok"/>&nbsp;{$error}</div>
diff --git a/wuunderconnector/views/templates/hook/javascript_ini.tpl b/wuunderconnector/views/templates/hook/javascript_ini.tpl
index 80adac7..9033e0e 100644
--- a/wuunderconnector/views/templates/hook/javascript_ini.tpl
+++ b/wuunderconnector/views/templates/hook/javascript_ini.tpl
@@ -18,7 +18,7 @@
 * needs please refer to http://www.prestashop.com for more information.
 *
  *  @author    Wuunder Nederland BV
- *  @copyright 2015-2019 Wuunder Holding B.V.
+ *  @copyright 2015-2020 Wuunder Holding B.V.
  *  @license   LICENSE.txt
  *}
 <script type="text/javascript">
@@ -26,7 +26,7 @@
     {literal}
     var shippingCarrierId = "{/literal}{$carrier_id}{literal}";
     // Get the modal
-    var parcelshopAddress = {/literal}{$cookieParcelshopAddress|@json_encode nofilter}{literal};
+    var parcelshopAddress = {/literal}{$cookieParcelshopAddress|@json_encode}{literal};
     if (parcelshopAddress !== "") {
         var parcelshopId = "{/literal}{$cookieParcelshopId}{literal}";
     }
diff --git a/wuunderconnector/wuunderconnector.php b/wuunderconnector/wuunderconnector.php
index 2735750..d400533 100644
--- a/wuunderconnector/wuunderconnector.php
+++ b/wuunderconnector/wuunderconnector.php
@@ -52,7 +52,7 @@ public function __construct()
         $this->name = 'wuunderconnector';
         $this->tab = 'shipping_logistics';
 
-        $this->version = '1.3.1';
+        $this->version = '1.3.4';
 
         $this->author = 'Wuunder';
         $this->need_instance = 0;
@@ -81,17 +81,17 @@ public function __construct()
     public function hookActionDispatcherBefore()
     {
         $this->autoLoad();
-    }  
+    }
     
     public function hookDisplayAfterBodyOpeningTag($params)
-    {    
+    {
         $this->initJavascriptTemplate($params);
         return $this->display(__FILE__, 'javascript_ini.tpl');
     }
 
     private function initJavascriptTemplate($params)
     {
-        $pickerData = $this->parcelshop_urls();
+        $pickerData = $this->parcelShopUrls();
 
         $this->context->smarty->assign(
             array(
@@ -100,7 +100,7 @@ private function initJavascriptTemplate($params)
                 'availableCarriers' => $pickerData['availableCarriers'],
                 'baseUrl' => $pickerData['baseUrl'],
                 'addressId' => $params['cart']->id_address_delivery,
-                'version' => floatval(_PS_VERSION_),
+                'version' => (float)_PS_VERSION_,
             )
         );
 
@@ -111,7 +111,7 @@ private function initJavascriptTemplate($params)
             $this->context->smarty->assign('cookieParcelshopAddress', false);
             $this->context->smarty->assign('cookieParcelshopId', false);
         }
-    }    
+    }
 
     /**
      * Autoload's project files from /src directory ps > 1.7
@@ -124,8 +124,7 @@ private function autoLoad()
 
     private function installDB()
     {
-        Db::getInstance()->execute('
-                       CREATE TABLE IF NOT EXISTS `' . _DB_PREFIX_ . 'wuunder_shipments` (
+        Db::getInstance()->execute('CREATE TABLE IF NOT EXISTS `' . _DB_PREFIX_ . 'wuunder_shipments`(
                             `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
                             `order_id` INT(11) UNSIGNED NOT NULL,
                             `booking_url` TEXT NULL,
@@ -135,18 +134,15 @@ private function installDB()
                             `label_tt_url` TEXT NULL,
                             PRIMARY KEY(`id`)
                         )
-                        ENGINE = ' . _MYSQL_ENGINE_ . ' DEFAULT CHARSET = utf8;'
-        );
+                        ENGINE = ' . _MYSQL_ENGINE_ . ' DEFAULT CHARSET = utf8;');
 
-        Db::getInstance()->execute('
-                        CREATE TABLE IF NOT EXISTS `' . _DB_PREFIX_ . 'wuunder_order_parcelshop` (
+        Db::getInstance()->execute('CREATE TABLE IF NOT EXISTS `' . _DB_PREFIX_ . 'wuunder_order_parcelshop`(
                             `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
                             `order_id` INT(11) UNSIGNED NOT NULL,
                             `parcelshop_id` VARCHAR(255),
                             PRIMARY KEY(`id`)
                         )
-                        ENGINE = ' . _MYSQL_ENGINE_ . ' DEFAULT CHARSET = utf8;'
-        );
+                        ENGINE = ' . _MYSQL_ENGINE_ . ' DEFAULT CHARSET = utf8;');
 
         $this->addIndexToOrderId();
     }
@@ -154,23 +150,17 @@ private function installDB()
     private function addIndexToOrderId()
     {
 
-        Db::getInstance()->execute('
-                    CREATE INDEX `shipment_order_id`
-                    ON `' . _DB_PREFIX_ . 'wuunder_shipments` (`order_id`);'
-        );
+        Db::getInstance()->execute('CREATE INDEX `shipment_order_id`
+                    ON `' . _DB_PREFIX_ . 'wuunder_shipments` (`order_id`);');
 
-        Db::getInstance()->execute('
-                    CREATE INDEX `parcelshop_order_id`
-                    ON `' . _DB_PREFIX_ . 'wuunder_order_parcelshop` (`order_id`);'
-        );
+        Db::getInstance()->execute('CREATE INDEX `parcelshop_order_id`
+                    ON `' . _DB_PREFIX_ . 'wuunder_order_parcelshop` (`order_id`);');
     }
 
     private function uninstallDB()
     {
-        Db::getInstance()->execute('
-               DROP TABLE IF EXISTS `' . _DB_PREFIX_ . 'wuunder_shipments`;
-               DROP TABLE IF EXISTS `' . _DB_PREFIX_ . 'wuunder_order_parcelshop`'
-        );
+        Db::getInstance()->execute('DROP TABLE IF EXISTS `' . _DB_PREFIX_ . 'wuunder_shipments`;
+               DROP TABLE IF EXISTS `' . _DB_PREFIX_ . 'wuunder_order_parcelshop`');
     }
 
     private function installModuleTab($tab_class, $tab_name, $id_tab_parent)
@@ -213,10 +203,11 @@ public function install()
 
         $this->parcelshopcarrier->install();
 
-        if (!parent::install() 
+        if (!parent::install()
             || !$this->installModuleTab(
-                'AdminWuunderConnector', 
-                'Wuunder', (_PS_VERSION_ < '1.7') ? 'AdminShipping' : 'AdminParentShipping'
+                'AdminWuunderConnector',
+                'Wuunder',
+                (_PS_VERSION_ < '1.7') ? 'AdminShipping' : 'AdminParentShipping'
             )
         ) {
             Logger::addLog('Installation failed 183.');
@@ -293,7 +284,7 @@ public function hookDisplayHeader($params)
                 'wuunderconnector',
                 '/js/jquery/jquery-1.11.0.min.js',
                 array('position' => 'head', 'priority' => 1)
-            ); 
+            );
             $this->context->controller->registerStylesheet(
                 'wuunderconnector',
                 'modules/'.$this->name.'/views/css/hook/parcelshop.css',
@@ -302,12 +293,11 @@ public function hookDisplayHeader($params)
                   'priority' => 200,
                 ]
             );
-
         }
     }
 
     public function hookActionFrontControllerSetMedia($params)
-    {   
+    {
         error_reporting(E_ALL);
         ini_set('display_errors', 1);
         if (_PS_VERSION_ > '1.7') {
@@ -344,11 +334,12 @@ public function hookActionValidateOrder($params)
         $this->context->smarty->clearAssign('cookieParcelshopId');
     }
 
-    public function hookActionValidateStepComplete($params) {
+    public function hookActionValidateStepComplete($params)
+    {
         if ($params['step_name'] === 'delivery') {
             $carrier_id = $params['cart']->id_carrier;
             if (Configuration::get('MYCARRIER1_CARRIER_ID') == $carrier_id) {
-                if(empty($this->context->cookie->parcelId)){
+                if (empty($this->context->cookie->parcelId)) {
                     $controller           = $this->context->controller;
                     $controller->errors[] = $this->l('Please select a parcelshop');
                     $params['completed']  = false;
@@ -358,7 +349,7 @@ public function hookActionValidateStepComplete($params) {
         return;
     }
 
-    public function parcelshop_urls()
+    public function parcelShopUrls()
     {
         $tmpEnvironment = new \Wuunder\Api\Environment((int) Configuration::get('testmode') === 1 ? 'staging' : 'production');
 
@@ -427,7 +418,7 @@ public function getContent()
                     $success = false;
                 } elseif ($field === "available_carriers_locator" && !Configuration::get('available_carriers_locator')) {
                     //Set default if empty string
-                    Configuration::updateValue('available_carriers_locator','dpd,dhl,postnl');
+                    Configuration::updateValue('available_carriers_locator', 'dpd,dhl,postnl');
                 } else {
                     Configuration::updateValue($field, $field_name);
                 }
@@ -439,7 +430,7 @@ public function getContent()
         return $output . $this->displayForm();
     }
 
-    private function validateForm($field, $field_name) 
+    private function validateForm($field, $field_name)
     {
         if ($field == "phonenumber") {
             return Validate::isPhoneNumber($field_name);
@@ -454,7 +445,7 @@ private function validateForm($field, $field_name)
         } else {
             return true;
         }
-        return $output . $this->displayForm();
+        return $this->displayForm();
     }
 
     public function displayForm()

From 20986c80bf8a9b7a1ec0b525eb9b3b6d0dd050ca Mon Sep 17 00:00:00 2001
From: Timo Janssen <tj.timo.j@gmail.com>
Date: Tue, 25 Feb 2020 11:19:05 +0100
Subject: [PATCH 2/6] Make sender adress not required

---
 wuunderconnector/wuunderconnector.php | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/wuunderconnector/wuunderconnector.php b/wuunderconnector/wuunderconnector.php
index d400533..50c4580 100644
--- a/wuunderconnector/wuunderconnector.php
+++ b/wuunderconnector/wuunderconnector.php
@@ -490,70 +490,60 @@ public function displayForm()
                     'type' => 'text',
                     'label' => $this->l('Company'),
                     'name' => "company_name",
-                    'required' => true,
                 ),
 
                 array(
                     'type' => 'text',
                     'label' => $this->l('Firstname'),
                     'name' => "firstname",
-                    'required' => true,
                 ),
 
                 array(
                     'type' => 'text',
                     'label' => $this->l('Lastname'),
                     'name' => "lastname",
-                    'required' => true,
                 ),
 
                 array(
                     'type' => 'text',
                     'label' => $this->l('Email'),
                     'name' => "email",
-                    'required' => true,
                 ),
 
                 array(
                     'type' => 'text',
                     'label' => $this->l('Phonenumber'),
                     'name' => "phonenumber",
-                    'required' => true,
                 ),
 
                 array(
                     'type' => 'text',
                     'label' => $this->l('Streetname'),
                     'name' => "streetname",
-                    'required' => true,
                 ),
 
                 array(
                     'type' => 'text',
                     'label' => $this->l('Housenumber'),
                     'name' => "housenumber",
-                    'required' => true,
                 ),
 
                 array(
                     'type' => 'text',
                     'label' => $this->l('Zipcode'),
                     'name' => "zipcode",
-                    'required' => true,
                 ),
 
                 array(
                     'type' => 'text',
                     'label' => $this->l('City'),
                     'name' => "city",
-                    'required' => true,
                 ),
 
                 array(
                     'type' => 'text',
                     'label' => $this->l('Country code'),
                     'name' => "country",
-                    'required' => true,
                     'placeholder' => $this->l("e.g. NL"),
                 ),
 

From 5061f03cb507f32f55846824ca9db02d3d93dd2e Mon Sep 17 00:00:00 2001
From: Tim Dohmen <tim.dohmen@wearewuunder.com>
Date: Tue, 25 Feb 2020 11:19:40 +0100
Subject: [PATCH 3/6] Changes for validator (image acquisition for posting to
 wuunder)

---
 .../controllers/admin/AdminWuunderConnector.php          | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/wuunderconnector/controllers/admin/AdminWuunderConnector.php b/wuunderconnector/controllers/admin/AdminWuunderConnector.php
index 16aee9f..d536944 100644
--- a/wuunderconnector/controllers/admin/AdminWuunderConnector.php
+++ b/wuunderconnector/controllers/admin/AdminWuunderConnector.php
@@ -222,9 +222,14 @@ private function buildWuunderData($order_info)
 
         // Load product image for first ordered item
         $image = null;
-        if (file_exists(getFormatedName('../img/p/' . $order_info['id_product'] . '/' . $order_info['id_product'] . '-home'))) {
-            $image = base64_encode(Tools::file_get_contents(ImageType::getFormatedName('../img/p/' . $order_info['id_product'] . '/' . $order_info['id_product'] . '-home')));
+        $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');
+        if ($imagePath) {
+            $image = base64_encode(Tools::file_get_contents($imagePath));
         }
+
         $product_data = $this->getOrderProductDetails($order_info['id_product']);
         $length = round($product_data['depth']);
         $width = round($product_data['width']);

From c9a15cb7058e296bce60d9b96404a82d218c442d Mon Sep 17 00:00:00 2001
From: Timo Janssen <tj.timo.j@gmail.com>
Date: Mon, 9 Mar 2020 13:30:02 +0100
Subject: [PATCH 4/6] fix allow empty fields

---
 wuunderconnector/wuunderconnector.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/wuunderconnector/wuunderconnector.php b/wuunderconnector/wuunderconnector.php
index 50c4580..811d3dc 100644
--- a/wuunderconnector/wuunderconnector.php
+++ b/wuunderconnector/wuunderconnector.php
@@ -401,6 +401,18 @@ public function getContent()
             "wuunderfilter2filter",
             "wuunderfilter3filter",
             "wuunderfilter4filter",
+            "company_name",
+            "firstname",
+            "lastname",
+            "email",
+            "phonenumber",
+            "streetname",
+            "housenumber",
+            "zipcode",
+            "city",
+            "country",
+            "available_carriers_locator",
+            
         );
 
         if (Tools::isSubmit('submit' . $this->name)) {

From 74c924b9ab501daf7edd2d9d6ac41da10a68ef71 Mon Sep 17 00:00:00 2001
From: Timo Janssen <tj.timo.j@gmail.com>
Date: Mon, 9 Mar 2020 15:32:17 +0100
Subject: [PATCH 5/6] check for empty validation

---
 wuunderconnector/wuunderconnector.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/wuunderconnector/wuunderconnector.php b/wuunderconnector/wuunderconnector.php
index 811d3dc..d0b5f68 100644
--- a/wuunderconnector/wuunderconnector.php
+++ b/wuunderconnector/wuunderconnector.php
@@ -444,6 +444,9 @@ public function getContent()
 
     private function validateForm($field, $field_name)
     {
+        if (empty($field_name)) {
+            return true;
+        }
         if ($field == "phonenumber") {
             return Validate::isPhoneNumber($field_name);
         } elseif ($field == "zipcode") {

From 7852950dc4d525626b2f3097ae0405f682f53f85 Mon Sep 17 00:00:00 2001
From: Tim Dohmen <tim.dohmen@wearewuunder.com>
Date: Mon, 9 Mar 2020 16:13:27 +0100
Subject: [PATCH 6/6] Code styling

---
 .../controllers/admin/AdminWuunderConnector.php            | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/wuunderconnector/controllers/admin/AdminWuunderConnector.php b/wuunderconnector/controllers/admin/AdminWuunderConnector.php
index d536944..0af641b 100644
--- a/wuunderconnector/controllers/admin/AdminWuunderConnector.php
+++ b/wuunderconnector/controllers/admin/AdminWuunderConnector.php
@@ -229,7 +229,6 @@ private function buildWuunderData($order_info)
         if ($imagePath) {
             $image = base64_encode(Tools::file_get_contents($imagePath));
         }
-
         $product_data = $this->getOrderProductDetails($order_info['id_product']);
         $length = round($product_data['depth']);
         $width = round($product_data['width']);
@@ -373,9 +372,9 @@ public function initContent()
         Context::getContext()->smarty->registerPlugin("function", "order_state", array($this, 'getOrderState'));
         Context::getContext()->smarty->assign(
             array(
-            'version' => (float)_PS_VERSION_,
-            'order_info' => $order_info,
-            'admin_url' => ((_PS_VERSION_ < '1.7') ? _PS_BASE_URL_ . __PS_BASE_URI__ . end($path) . "/" : "") . $link->getAdminLink('AdminWuunderConnector', true),)
+                'version' => (float)_PS_VERSION_,
+                'order_info' => $order_info,
+                'admin_url' => ((_PS_VERSION_ < '1.7') ? _PS_BASE_URL_ . __PS_BASE_URI__ . end($path) . "/" : "") . $link->getAdminLink('AdminWuunderConnector', true),)
         );
         $this->setTemplate('AdminWuunderConnector.tpl');
         parent::initContent();