Skip to content

Commit

Permalink
version bump and changelogs added
Browse files Browse the repository at this point in the history
  • Loading branch information
GytisZum committed Mar 14, 2024
1 parent eabf8b3 commit 0be8391
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -159,3 +159,9 @@
- Ability to hide label print feature in orders list page
- Vulnerability fix with development dependencies
- Price rule bug fix to add additional filtration by country

## [3.2.19]
- Carrier availability in country
- Phone input selections sorted by active countries in shop
- Work hours pop up fix
- Numeric post code improvements
11 changes: 5 additions & 6 deletions dpdbaltics.php
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public function __construct()
$this->author = 'Invertus';
$this->tab = 'shipping_logistics';
$this->description = 'DPD Baltics shipping integration';
$this->version = '3.2.18';
$this->version = '3.2.19';
$this->ps_versions_compliancy = ['min' => '1.7.1.0', 'max' => _PS_VERSION_];
$this->need_instance = 0;
parent::__construct();
Expand Down Expand Up @@ -203,7 +203,6 @@ public function hookActionFrontControllerSetMedia()
'priority' => 130
]
);

}

/** @var \Invertus\dpdBaltics\Provider\CurrentCountryProvider $currentCountryProvider */
Expand Down Expand Up @@ -278,7 +277,8 @@ public function hookActionFrontControllerSetMedia()
$googleApiService = $this->getModuleContainer('invertus.dpdbaltics.service.google_api_service');
$this->context->controller->registerJavascript(
'dpdbaltics-google-api',
$googleApiService->getFormattedGoogleMapsUrl(), [
$googleApiService->getFormattedGoogleMapsUrl(),
[
'server' => 'remote'
]
);
Expand Down Expand Up @@ -507,7 +507,7 @@ public function getOrderShippingCostExternal($cart)
$parcelDistribution = \Configuration::get(Config::PARCEL_DISTRIBUTION);
$maxAllowedWeight = Config::getDefaultServiceWeights($countryCode, $serviceCarrier['product_reference']);

if (!$cartWeightValidator->validate($cart, $parcelDistribution ,$maxAllowedWeight)) {
if (!$cartWeightValidator->validate($cart, $parcelDistribution, $maxAllowedWeight)) {
return false;
}

Expand Down Expand Up @@ -1150,7 +1150,6 @@ private function updateOrderCarrier($shipmentId)

public function hookDisplayOrderDetail($params)
{

$isReturnServiceEnabled = Configuration::get(Config::PARCEL_RETURN);
if (!$isReturnServiceEnabled) {
return;
Expand Down Expand Up @@ -1279,7 +1278,7 @@ public function hookActionOrderGridDefinitionModifier(array $params)
$definition = $params['definition'];

if (!(bool) Configuration::get(Config::HIDE_ORDERS_LABEL_PRINT_BUTTON)) {
$definition->getColumns()
$definition->getColumns()
->addAfter(
'date_add',
(new ActionColumn('dpd_print_label'))
Expand Down

0 comments on commit 0be8391

Please sign in to comment.