Skip to content
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

VCST-664: add predefined filters #413

Merged
merged 1 commit into from
Mar 26, 2024
Merged

VCST-664: add predefined filters #413

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: 4 additions & 0 deletions src/VirtoCommerce.OrdersModule.Web/Localizations/en.VirtoCommerce.Orders.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@
"labels": {
"new-filter": "Add new filter",
"unnamed-filter": "Unnamed filter",
"last-day-filter": "Last 24 hours",
"last-week-filter": "Last week",
"last-month-filter": "Last month",
"last-year-filter": "Last year",
"number": "Order number",
"customer": "Customer",
"confirmed": "Confirmed",
Expand Down
52 changes: 52 additions & 0 deletions src/VirtoCommerce.OrdersModule.Web/Scripts/blades/customerOrder-list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,9 @@ function ($rootScope, $scope, $localStorage, customerOrders, bladeUtils, dialogS
if (!$localStorage.orderSearchFilters) {
$localStorage.orderSearchFilters = [{ name: 'orders.blades.customerOrder-list.labels.new-filter' }];
}

addPredefinedFilters($localStorage.orderSearchFilters);

if ($localStorage.orderSearchFilterId) {
filter.current = _.findWhere($localStorage.orderSearchFilters, { id: $localStorage.orderSearchFilterId });
}
Expand Down Expand Up @@ -241,6 +244,55 @@ function ($rootScope, $scope, $localStorage, customerOrders, bladeUtils, dialogS
$scope.useIndexedSearch = data.result;
});

function buildPredefinedFilters() {
var currentDate = new Date();
var day = 24 * 60 * 60 * 1000;
var days7 = 7 * day;
var days30 = 30 * day;
var days365 = 365 * day;
var currentDateUtcString = currentDate.toISOString();

return [
{
name: 'orders.blades.customerOrder-list.labels.last-day-filter',
id: 'last-day',
startDate: new Date(currentDate.getTime() - day).toISOString(),
endDate: currentDateUtcString
},
{
name: 'orders.blades.customerOrder-list.labels.last-week-filter',
id: 'last-week',
startDate: new Date(currentDate.getTime() - days7).toISOString(),
endDate: currentDateUtcString
},
{
name: 'orders.blades.customerOrder-list.labels.last-month-filter',
id: 'last-month',
startDate: new Date(currentDate.getTime() - days30).toISOString(),
endDate: currentDateUtcString
},
{
name: 'orders.blades.customerOrder-list.labels.last-year-filter',
id: 'last-year',
startDate: new Date(currentDate.getTime() - days365).toISOString(),
endDate: currentDateUtcString
}
];
}

function addPredefinedFilters(baseFilters) {
var predefinedFilters = buildPredefinedFilters();

// add or replace predefinded filters in base filters
for (var i = 0; i < predefinedFilters.length; i++) {
var predefinedFilter = _.findWhere(baseFilters, { id: predefinedFilters[i].id });
if (predefinedFilter) {
angular.extend(predefinedFilter, predefinedFilters[i]);
} else {
baseFilters.push(predefinedFilters[i]);
}
}
}

// actions on load
//No need to call this because page 'pageSettings.currentPage' is watched!!! It would trigger subsequent duplicated req...
Expand Down
Loading