Skip to content

Commit

Permalink
Merge pull request #40 from Invertus/DGS-138
Browse files Browse the repository at this point in the history
DGS-138 bugfix when parcel terminal form is always visible in order
  • Loading branch information
arturas-bes authored Nov 22, 2021
2 parents 11ab5ec + e78a787 commit 2d9e8a3
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 7 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"

2 changes: 1 addition & 1 deletion views/templates/admin/admin-error-message.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion views/templates/admin/checkbox-list.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion views/templates/admin/phone-and-code-inputs.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion views/templates/admin/product/index.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion views/templates/hook/admin/partials/product.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion views/templates/hook/admin/partials/shipment.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down

0 comments on commit 2d9e8a3

Please sign in to comment.