refactor for array

prod
Dmitriy Shesterkin 9 years ago
parent aba374508f
commit d4bc5b7621
  1. 25
      static/js/orders.js

@ -127,21 +127,21 @@ $(document).ready(function() {
$('#filterAccountsPay').click(function() {
event.preventDefault();
filterStatus = '2';
filterStatus = ['2'];
filterType = 'account';
filterItems();
});
$('#filterAccountsWaitPay').click(function() {
event.preventDefault();
filterStatus = '0';
filterStatus = ['0'];
filterType = 'account';
filterItems();
});
$('#filterAccountsFreezePay').click(function() {
event.preventDefault();
filterStatus = '4';
filterStatus = ['4'];
filterType = 'account';
filterItems();
});
@ -155,14 +155,14 @@ $(document).ready(function() {
$('#filterLicenseNow').click(function() {
event.preventDefault();
filterStatus = '2';
filterStatus = ['-1','2'];
filterType = 'license';
filterItems();
});
$('#filterLicenseOld').click(function() {
event.preventDefault();
filterStatus = '3';
filterStatus = ['3'];
filterType = 'license';
filterItems();
});
@ -215,7 +215,8 @@ $(document).ready(function() {
return true
}
if (filterType && filterStatus) {
return item.values().type === filterType && item.values().status === filterStatus;
return item.values().type === filterType
&& filterStatus.includes(item.values().status);
}
if (filterType) {
return item.values().type === filterType;
@ -235,7 +236,7 @@ $(document).ready(function() {
return item.values()['order-date'].split('.')[1] === month.toString()
&& item.values()['order-date'].split('.')[2] === year.toString()
&& item.values().type === filterType
&& item.values().status === filterStatus;
&& filterStatus.includes(item.values().status);
}
if (filterType) {
return item.values()['order-date'].split('.')[1] === month.toString()
@ -257,7 +258,7 @@ $(document).ready(function() {
return item.values()['order-date'].split('.')[1] === prevMonth.toString()
&& item.values()['order-date'].split('.')[2] === prevMonthYear.toString()
&& item.values().type === filterType
&& item.values().status === filterStatus;
&& filterStatus.includes(item.values().status);
}
if (filterType) {
return item.values()['order-date'].split('.')[1] === prevMonth.toString()
@ -276,7 +277,7 @@ $(document).ready(function() {
if (filterType && filterStatus) {
return getQuarterForStrDate(item.values()['order-date']) === quarter
&& item.values().type === filterType
&& item.values().status === filterStatus;
&& filterStatus.includes(item.values().status);
}
if (filterType) {
return getQuarterForStrDate(item.values()['order-date']) === quarter
@ -294,7 +295,7 @@ $(document).ready(function() {
if (filterType && filterStatus) {
return getQuarterForStrDate(item.values()['order-date']) === prevQuarter
&& item.values().type === filterType
&& item.values().status === filterStatus;
&& filterStatus.includes(item.values().status);
}
if (filterType) {
return getQuarterForStrDate(item.values()['order-date']) === prevQuarter
@ -312,7 +313,7 @@ $(document).ready(function() {
if (filterType && filterStatus) {
return item.values()['order-date'].split('.')[2] === year.toString()
&& item.values().type === filterType
&& item.values().status === filterStatus;
&& filterStatus.includes(item.values().status);
}
if (filterType) {
return item.values()['order-date'].split('.')[2] === year.toString()
@ -330,7 +331,7 @@ $(document).ready(function() {
if (filterType && filterStatus) {
return item.values()['order-date'].split('.')[2] === prevYear.toString()
&& item.values().type === filterType
&& item.values().status === filterStatus;
&& filterStatus.includes(item.values().status);
}
if (filterType) {
return item.values()['order-date'].split('.')[2] === prevYear.toString()

Loading…
Cancel
Save