From 69257e137664d6723b4be50d2873ad338c21f7a2 Mon Sep 17 00:00:00 2001
From: Arturas <arturas.bespalovas@invertus.eu>
Date: Mon, 22 Nov 2021 09:13:37 +0200
Subject: [PATCH 1/2] bugfix when parcel terminal form is always visible in
 order

---
 CHANGELOG.md                                     | 3 ++-
 src/Validate/Carrier/PudoValidate.php            | 2 +-
 views/templates/admin/admin-error-message.tpl    | 2 +-
 views/templates/admin/checkbox-list.tpl          | 2 +-
 views/templates/admin/phone-and-code-inputs.tpl  | 2 +-
 views/templates/admin/product/index.tpl          | 2 +-
 views/templates/hook/admin/partials/product.tpl  | 2 +-
 views/templates/hook/admin/partials/shipment.tpl | 2 +-
 8 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf972ded..8d4cc5a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -87,11 +87,12 @@
 - Parcel tracking email template changed, URL changes, show only parcel number in tracking email template
 - Bugfix, when in parcel validation function wrong argument is set, carrier ID instead of reference.
 - Bugfix, override in array method in javascript, as different jquery version act differently while executing function
-## [3.2.8] - 2021-11-08
+## [3.2.8] - 2021-11-22
 ### Changed
 - Bugfix when combination with price impact calculates wrong price on shipment.
 - Bugfix when prestashop versions below 1704 loses object instance and causes an error while importing parcels.
 - Bugfix when prestashop versions below 1704 smarty variable is not read correctly.
 - Bugfix when prestashop versions below 1704 tries to load undefined method.
 - More precision calculation library added, vendor rengenerated, zip for vendor updated
+- Bugfix when parcel terminal form is always visible in order"
 
diff --git a/src/Validate/Carrier/PudoValidate.php b/src/Validate/Carrier/PudoValidate.php
index de768463..2cadfb88 100644
--- a/src/Validate/Carrier/PudoValidate.php
+++ b/src/Validate/Carrier/PudoValidate.php
@@ -8,7 +8,7 @@
 use Invertus\dpdBaltics\Repository\PudoRepository;
 use PrestaShop\PrestaShop\Core\Foundation\IoC\Exception;
 
-class PudoValidate
+class  PudoValidate
 {
 
     /**
diff --git a/views/templates/admin/admin-error-message.tpl b/views/templates/admin/admin-error-message.tpl
index b4e7bbab..ec9c00d0 100644
--- a/views/templates/admin/admin-error-message.tpl
+++ b/views/templates/admin/admin-error-message.tpl
@@ -10,7 +10,7 @@
  *}
 
 <div class="bootstrap">
-    <div class="alert alert-danger hidden js-admin-error">
+    <div class="alert alert-danger hidden d-none js-admin-error">
         <button type="button" class="close" data-dismiss="alert">×</button>
         <span></span>
     </div>
diff --git a/views/templates/admin/checkbox-list.tpl b/views/templates/admin/checkbox-list.tpl
index 00b435fa..a0258336 100644
--- a/views/templates/admin/checkbox-list.tpl
+++ b/views/templates/admin/checkbox-list.tpl
@@ -13,7 +13,7 @@
     <div class="panel-heading">
         <span class="check-box-all-message">{l s='Check all' mod='dpdbaltics'}</span>
         <input type="checkbox" name="checkme_{$type|escape:'htmlall':'UTF-8'}" class="checkme" {if $checked}checked{/if}>
-        <p class="help-block {if !$checked}hidden{/if}">{l s='All current and future %s are selected.' mod='dpdbaltics' sprintf=[$name|escape:'htmlall':'UTF-8']}</p>
+        <p class="help-block {if !$checked}hidden d-none{/if}">{l s='All current and future %s are selected.' mod='dpdbaltics' sprintf=[$name|escape:'htmlall':'UTF-8']}</p>
         <div class="clearfix">&nbsp;</div>
     </div>
     <div class="panel-body">
diff --git a/views/templates/admin/phone-and-code-inputs.tpl b/views/templates/admin/phone-and-code-inputs.tpl
index c90b0725..ffe20a97 100644
--- a/views/templates/admin/phone-and-code-inputs.tpl
+++ b/views/templates/admin/phone-and-code-inputs.tpl
@@ -11,7 +11,7 @@
 
 <select
         id="{$inputName}_code"
-        class="dpd-phone-and-code fixed-width-sm chosen hidden"
+        class="dpd-phone-and-code fixed-width-sm chosen hidden d-none"
         name="{$inputName}_code"
         required="required">
         {html_options class='fixed-width-xlg' options=$countryCallingCodes selected=$countryCallingCode}
diff --git a/views/templates/admin/product/index.tpl b/views/templates/admin/product/index.tpl
index 756b8adb..3e87f5ab 100644
--- a/views/templates/admin/product/index.tpl
+++ b/views/templates/admin/product/index.tpl
@@ -26,7 +26,7 @@
         <div class="css-product-margin col-xs-1">
             <p>{l s='Availability' mod='dpdbaltics'}</p>
         </div>
-        <div class="css-product-margin col-xs-2 {if !$isMultiShop}hidden{/if}">
+        <div class="css-product-margin col-xs-2 {if !$isMultiShop}hidden d-none{/if}">
             <p>{l s='Shop' mod='dpdbaltics'}</p>
         </div>
         <div class="col-xs-1">
diff --git a/views/templates/hook/admin/partials/product.tpl b/views/templates/hook/admin/partials/product.tpl
index e3fcda64..ed40c986 100644
--- a/views/templates/hook/admin/partials/product.tpl
+++ b/views/templates/hook/admin/partials/product.tpl
@@ -61,7 +61,7 @@
     </td>
     <td class="text-center product-actions">
         <button type="button" class="btn btn-default js-move-product {if $testOrder && !$testMode}disabled{/if}">{l s='Move' mod='dpdbaltics'}</button>
-        <div id="deleteParcelBtnTemplate" class="hidden">
+        <div id="deleteParcelBtnTemplate" class="hidden d-none">
             <button type="button" class="btn btn-default js-parcel-delete-btn">
                 {l s='Delete' mod='dpdbaltics'}
             </button>
diff --git a/views/templates/hook/admin/partials/shipment.tpl b/views/templates/hook/admin/partials/shipment.tpl
index 924050b6..254ca097 100644
--- a/views/templates/hook/admin/partials/shipment.tpl
+++ b/views/templates/hook/admin/partials/shipment.tpl
@@ -232,7 +232,7 @@
 
         <div class="dpd-separator"></div>
 
-        <div id="pudoTemplate" {if !$is_pudo}class="hidden"{/if}>
+        <div id="pudoTemplate" {if !$is_pudo}class="hidden d-none"{/if}>
             {include file='./pudo-address.tpl'}
         </div>
 

From e78a787b144dfdda5babe3672b9e7359cad87e99 Mon Sep 17 00:00:00 2001
From: Arturas <arturas.bespalovas@invertus.eu>
Date: Mon, 22 Nov 2021 09:17:21 +0200
Subject: [PATCH 2/2] cleanup

---
 src/Validate/Carrier/PudoValidate.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Validate/Carrier/PudoValidate.php b/src/Validate/Carrier/PudoValidate.php
index 2cadfb88..de768463 100644
--- a/src/Validate/Carrier/PudoValidate.php
+++ b/src/Validate/Carrier/PudoValidate.php
@@ -8,7 +8,7 @@
 use Invertus\dpdBaltics\Repository\PudoRepository;
 use PrestaShop\PrestaShop\Core\Foundation\IoC\Exception;
 
-class  PudoValidate
+class PudoValidate
 {
 
     /**