Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,8 @@
- Fixed other minor issues

## [3.3.1]
- Fixed sorting on Shipment list columns from joined tables (Tracking number, Receiver, Address, City)
- Changed default sort on Shipment list to show latest shipments first
- Fixed incorrect COD label amount when discount code is applied
- Fixed parcelshop info not displaying in backoffice order view when customer city differs from parcelshop city
- Fixed shipment creation overwriting parcelshop address data with customer address data
Expand All @@ -199,4 +201,4 @@
- Fixed automatic PUDO point pre-selection in LIST mode
- Fixed PUDO shipment CSS styling
- Added timeframes to shipment request
- Fixed DPDBaltics menu item disappearing from sidebar when navigating to module pages
- Fixed DPDBaltics menu item disappearing from sidebar when navigating to module pages
14 changes: 10 additions & 4 deletions controllers/admin/AdminDPDBalticsShipmentController.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,15 @@ public function initToolbar()
private function initList()
{
$this->list_no_link = true;
$this->_defaultOrderBy = 'id_dpd_shipment';
$this->_defaultOrderWay = 'DESC';

$this->fields_list = [
'tracking_number' => [
'title' => $this->module->l('Tracking number'),
'type' => 'text',
'havingFilter' => true
'havingFilter' => true,
'order_key' => 'oc!tracking_number',
],
'date_print' => [
'title' => $this->module->l('Printing date'),
Expand All @@ -69,17 +72,20 @@ private function initList()
'receiver_name' => [
'title' => $this->module->l('Receiver'),
'type' => 'text',
'havingFilter' => true
'havingFilter' => true,
'order_key' => 'c!lastname',
],
'address1' => [
'title' => $this->module->l('Address'),
'type' => 'text',
'havingFilter' => true
'havingFilter' => true,
'order_key' => 'addr!address1',
],
'city' => [
'title' => $this->module->l('City'),
'type' => 'text',
'havingFilter' => true
'havingFilter' => true,
'order_key' => 'addr!city',
],
'reference1' => [
'title' => $this->module->l('Cust Ref 1'),
Expand Down
Loading