Skip to content

Add a payment and delivery filter to the orders grid #948

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
webinmd merged 1 commit into from
Oct 6, 2025
Merged

Add a payment and delivery filter to the orders grid #948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 2 deletions assets/components/minishop2/css/mgr/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,8 +284,8 @@ a.x-menu-item .x-menu-item-text .icon {
}

#minishop2-orders-info {
height: 95px;
padding: 10px;
height: 108px;
padding: 25px 10px;

text-align: center;

Expand Down
186 changes: 116 additions & 70 deletions assets/components/minishop2/js/mgr/orders/orders.form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,61 +19,117 @@ miniShop2.panel.OrdersForm = function (config) {
miniShop2.panel.OrdersForm.superclass.constructor.call(this, config);
};
Ext.extend(miniShop2.panel.OrdersForm, MODx.FormPanel, {

grid: null,

getFields: function (config) {
return [{
layout: 'column',
items: [{
columnWidth: .308,
layout: 'form',
defaults: {anchor: '100%', hideLabel: true},
items: this.getLeftFields(config),
}, {
columnWidth: .37,
columnWidth: .320,
layout: 'form',
defaults: {anchor: '100%', hideLabel: true},
items: this.getCenterFields(config),
}, {
columnWidth: .322,
items: this.getStatisticFields(),
},{
columnWidth: .680,
layout: 'form',
defaults: {anchor: '100%', hideLabel: true},
items: this.getRightFields(config),
items: this.getFilterFields(config),
}],
}];
},

getLeftFields: function (config) {
getFilterFields: function (config) {
return [{
layout: 'column',
items: [{
columnWidth: .5,
layout: 'form',
defaults: {anchor: '100%', hideLabel: true},
items: this.getFilterLeftFields(config),
},{
columnWidth: .5,
layout: 'form',
defaults: {anchor: '100%', hideLabel: true},
items: this.getFilterRightFields(config),
}]
}, {
xtype: 'textfield',
id: config.id + '-search',
emptyText: _('ms2_orders_form_search'),
name: 'query',
}]
},
getFilterLeftFields: function (config) {
return [{
xtype: 'datefield',
id: config.id + '-begin',
emptyText: _('ms2_orders_form_begin'),
name: 'date_start',
format: MODx.config['manager_date_format'] || 'Y-m-d',
startDay: +MODx.config['manager_week_start'] || 0,
layout: 'column',
items: [{
columnWidth: .5,
layout: 'form',
defaults: {anchor: '100%', hideLabel: true},
items: [{
xtype: 'datefield',
id: config.id + '-begin',
emptyText: _('ms2_orders_form_begin'),
name: 'date_start',
format: MODx.config['manager_date_format'] || 'Y-m-d',
startDay: +MODx.config['manager_week_start'] || 0,
listeners: {
select: {
fn: function () {
this.fireEvent('change');
}, scope: this
},
},
}],
},{
columnWidth: .5,
layout: 'form',
defaults: {anchor: '100%', hideLabel: true},
items: [{
xtype: 'datefield',
id: config.id + '-end',
emptyText: _('ms2_orders_form_end'),
name: 'date_end',
format: MODx.config['manager_date_format'] || 'Y-m-d',
startDay: +MODx.config['manager_week_start'] || 0,
listeners: {
select: {
fn: function () {
this.fireEvent('change');
}, scope: this
},
},
}],
}]
}, {
xtype: 'minishop2-combo-user',
id: config.id + '-user',
emptyText: _('ms2_orders_form_customer'),
name: 'customer',
allowBlank: true,
listeners: {
select: {
fn: function () {
this.fireEvent('change');
this.fireEvent('change')
}, scope: this
},
},
}
}
}, {
xtype: 'datefield',
id: config.id + '-end',
emptyText: _('ms2_orders_form_end'),
name: 'date_end',
format: MODx.config['manager_date_format'] || 'Y-m-d',
startDay: +MODx.config['manager_week_start'] || 0,
xtype: 'minishop2-combo-context',
id: config.id + '-context',
emptyText: _('ms2_orders_form_context'),
name: 'context',
addall: true,
listeners: {
select: {
fn: function () {
this.fireEvent('change');
this.fireEvent('change')
}, scope: this
},
},
}, {
}
}
}];
},

getFilterRightFields: function (config) {
return [{
xtype: 'minishop2-combo-status',
id: config.id + '-status',
emptyText: _('ms2_orders_form_status'),
Expand All @@ -86,10 +142,36 @@ Ext.extend(miniShop2.panel.OrdersForm, MODx.FormPanel, {
}, scope: this
}
}
}, {
xtype: 'minishop2-combo-delivery',
id: config.id + '-delivery',
emptyText: _('ms2_orders_form_delivery'),
name: 'delivery',
addall: true,
listeners: {
select: {
fn: function () {
this.fireEvent('change')
}, scope: this
}
}
}, {
xtype: 'minishop2-combo-payment',
id: config.id + '-payment',
emptyText: _('ms2_orders_form_payment'),
name: 'payment',
addall: true,
listeners: {
select: {
fn: function () {
this.fireEvent('change')
}, scope: this
}
}
}];
},

getCenterFields: function () {
getStatisticFields: function () {
return [{
xtype: 'displayfield',
id: 'minishop2-orders-info',
Expand All @@ -113,41 +195,6 @@ Ext.extend(miniShop2.panel.OrdersForm, MODx.FormPanel, {
}];
},

getRightFields: function (config) {
return [{
xtype: 'textfield',
id: config.id + '-search',
emptyText: _('ms2_orders_form_search'),
name: 'query',
}, {
xtype: 'minishop2-combo-user',
id: config.id + '-user',
emptyText: _('ms2_orders_form_customer'),
name: 'customer',
allowBlank: true,
listeners: {
select: {
fn: function () {
this.fireEvent('change')
}, scope: this
}
}
}, {
xtype: 'minishop2-combo-context',
id: config.id + '-context',
emptyText: _('ms2_orders_form_context'),
name: 'context',
allowBlank: true,
listeners: {
select: {
fn: function () {
this.fireEvent('change')
}, scope: this
}
}
}];
},

getListeners: function () {
return {
beforerender: function () {
Expand Down Expand Up @@ -298,7 +345,6 @@ Ext.extend(miniShop2.panel.OrdersForm, MODx.FormPanel, {
}
}
},

focusFirstField: function () {
},

Expand Down
2 changes: 2 additions & 0 deletions core/components/minishop2/lexicon/be/manager.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@
$_lang['ms2_orders_form_selected_num'] = 'Выбрана заказаў';
$_lang['ms2_orders_form_selected_sum'] = 'на суму, руб.';
$_lang['ms2_orders_form_status'] = 'Фільтр па статусу';
$_lang['ms2_orders_form_delivery'] = 'Фільтр па дастаўкі';
$_lang['ms2_orders_form_payment'] = 'Фільтр па аплаце';
$_lang['ms2_orders_form_submit'] = 'Адправіць';
$_lang['ms2_orders_selected_status'] = 'Змяніць статус';
$_lang['ms2_phone'] = 'Тэлефон';
Expand Down
2 changes: 2 additions & 0 deletions core/components/minishop2/lexicon/de/manager.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@
$_lang['ms2_orders_form_selected_num'] = 'Выбрано заказов';
$_lang['ms2_orders_form_selected_sum'] = 'на сумму, руб.';
$_lang['ms2_orders_form_status'] = 'Фильтр по статусу';
$_lang['ms2_orders_form_delivery'] = 'Фильтр по доставке';
$_lang['ms2_orders_form_payment'] = 'Фильтр по оплате';
$_lang['ms2_orders_form_submit'] = 'Отправить';
$_lang['ms2_orders_selected_status'] = 'Status geändert';
$_lang['ms2_phone'] = 'Telefon';
Expand Down
2 changes: 2 additions & 0 deletions core/components/minishop2/lexicon/el/manager.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@
$_lang['ms2_orders_form_selected_num'] = 'Выбрано заказов';
$_lang['ms2_orders_form_selected_sum'] = 'на сумму, руб.';
$_lang['ms2_orders_form_status'] = 'Фильтр по статусу';
$_lang['ms2_orders_form_delivery'] = 'Фильтр по доставке';
$_lang['ms2_orders_form_payment'] = 'Фильтр по оплате';
$_lang['ms2_orders_form_submit'] = 'Отправить';
$_lang['ms2_orders_selected_status'] = 'Сменить статус';
$_lang['ms2_phone'] = 'Τηλέφωνο';
Expand Down
2 changes: 2 additions & 0 deletions core/components/minishop2/lexicon/en/manager.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@
$_lang['ms2_orders_form_selected_num'] = 'Selected orders';
$_lang['ms2_orders_form_selected_sum'] = 'for the sum, $';
$_lang['ms2_orders_form_status'] = 'Filter by status';
$_lang['ms2_orders_form_delivery'] = 'Filter by delivery';
$_lang['ms2_orders_form_payment'] = 'Filter by payment';
$_lang['ms2_orders_form_submit'] = 'Submit';
$_lang['ms2_orders_selected_status'] = 'Change status of selected orders';
$_lang['ms2_phone'] = 'Phone';
Expand Down
2 changes: 2 additions & 0 deletions core/components/minishop2/lexicon/fr/manager.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@
$_lang['ms2_orders_form_selected_num'] = 'Выбрано заказов';
$_lang['ms2_orders_form_selected_sum'] = 'на сумму, руб.';
$_lang['ms2_orders_form_status'] = 'Filtrer par l\'état';
$_lang['ms2_orders_form_delivery'] = 'Filtrer par la livraison';
$_lang['ms2_orders_form_payment'] = 'Filtrer par le paiement';
$_lang['ms2_orders_form_submit'] = 'Отправить';
$_lang['ms2_orders_selected_status'] = 'Changer l\'état de la commande sélectionnée';
$_lang['ms2_phone'] = 'Téléphone';
Expand Down
2 changes: 2 additions & 0 deletions core/components/minishop2/lexicon/it/manager.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@
$_lang['ms2_orders_form_selected_num'] = 'Selected orders';
$_lang['ms2_orders_form_selected_sum'] = 'for the sum, $';
$_lang['ms2_orders_form_status'] = 'Filter by status';
$_lang['ms2_orders_form_delivery'] = 'Filter by delivery';
$_lang['ms2_orders_form_payment'] = 'Filter by payment';
$_lang['ms2_orders_form_submit'] = 'Submit';
$_lang['ms2_orders_selected_status'] = 'Keisti pasirinktų užsakymų būseną';
$_lang['ms2_phone'] = 'Telefonas';
Expand Down
2 changes: 2 additions & 0 deletions core/components/minishop2/lexicon/lt/manager.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@
$_lang['ms2_orders_form_selected_num'] = 'Выбрано заказов';
$_lang['ms2_orders_form_selected_sum'] = 'на сумму, руб.';
$_lang['ms2_orders_form_status'] = 'Фильтр по статусу';
$_lang['ms2_orders_form_delivery'] = 'Фильтр по доставке';
$_lang['ms2_orders_form_payment'] = 'Фильтр по оплате';
$_lang['ms2_orders_form_submit'] = 'Отправить';
$_lang['ms2_orders_selected_status'] = 'Keisti pasirinktų užsakymų būseną';
$_lang['ms2_phone'] = 'Telefonas';
Expand Down
2 changes: 2 additions & 0 deletions core/components/minishop2/lexicon/nl/manager.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@
$_lang['ms2_orders_form_selected_num'] = 'Geselecteerde orders';
$_lang['ms2_orders_form_selected_sum'] = 'Voor de som van, €';
$_lang['ms2_orders_form_status'] = 'Filter op status';
$_lang['ms2_orders_form_delivery'] = 'Filter op verzending';
$_lang['ms2_orders_form_payment'] = 'Filter op betaling';
$_lang['ms2_orders_form_submit'] = 'Verstuur';
$_lang['ms2_orders_selected_status'] = 'Verander status van geselecteerde orders';
$_lang['ms2_phone'] = 'Telefoonnummer';
Expand Down
2 changes: 2 additions & 0 deletions core/components/minishop2/lexicon/ro/manager.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@
$_lang['ms2_orders_form_selected_num'] = 'Au fost selectate comenzi';
$_lang['ms2_orders_form_selected_sum'] = 'în sumă, RUB.';
$_lang['ms2_orders_form_status'] = 'Filtru după statut';
$_lang['ms2_orders_form_delivery'] = 'Filtru după livrare';
$_lang['ms2_orders_form_payment'] = 'Filtru după plata';
$_lang['ms2_orders_form_submit'] = 'Trimiteți';
$_lang['ms2_orders_selected_status'] = 'Schimbarea statutului';
$_lang['ms2_phone'] = 'Telefon';
Expand Down
2 changes: 2 additions & 0 deletions core/components/minishop2/lexicon/ru/manager.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@
$_lang['ms2_orders_form_selected_num'] = 'Выбрано заказов';
$_lang['ms2_orders_form_selected_sum'] = 'на сумму, руб.';
$_lang['ms2_orders_form_status'] = 'Фильтр по статусу';
$_lang['ms2_orders_form_delivery'] = 'Фильтр по доставке';
$_lang['ms2_orders_form_payment'] = 'Фильтр по оплате';
$_lang['ms2_orders_form_submit'] = 'Отправить';
$_lang['ms2_orders_selected_status'] = 'Сменить статус';
$_lang['ms2_phone'] = 'Телефон';
Expand Down
2 changes: 2 additions & 0 deletions core/components/minishop2/lexicon/uk/manager.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@
$_lang['ms2_orders_form_selected_num'] = 'Вибрано замовлень';
$_lang['ms2_orders_form_selected_sum'] = 'на суму, грн.';
$_lang['ms2_orders_form_status'] = 'Фільтр по статусу';
$_lang['ms2_orders_form_delivery'] = 'Фільтр по доставці';
$_lang['ms2_orders_form_payment'] = 'Фільтр по оплаті';
$_lang['ms2_orders_form_submit'] = 'Відправити';
$_lang['ms2_orders_selected_status'] = 'Змінити статус';
$_lang['ms2_phone'] = 'Телефон';
Expand Down
10 changes: 10 additions & 0 deletions core/components/minishop2/processors/mgr/orders/getlist.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,16 @@ public function prepareQueryBeforeCount(xPDOQuery $c)
'status' => $status,
]);
}
if ($delivery = $this->getProperty('delivery')) {
$c->where([
'delivery' => $delivery,
]);
}
if ($payment = $this->getProperty('payment')) {
$c->where([
'payment' => $payment,
]);
}
if ($customer = $this->getProperty('customer')) {
$c->where([
'user_id' => (int)$customer,
Expand Down
Loading