From d4f881eb91103ec9a792e40f8ef774f19516f5a3 Mon Sep 17 00:00:00 2001 From: Syed Amir Date: Mon, 7 Aug 2017 14:19:57 +0800 Subject: [PATCH] orderstatus --- Importer/index.html | 14 ++++ Importer/team.html | 12 ++-- .../pages/scripts/table-datatables-buttons.js | 64 +++++++++---------- 3 files changed, 52 insertions(+), 38 deletions(-) diff --git a/Importer/index.html b/Importer/index.html index b7e0cda..1f7b210 100644 --- a/Importer/index.html +++ b/Importer/index.html @@ -326,6 +326,15 @@ License: You must have a valid license purchased only from themeforest(the above
  •  ETD
    • + Delivery Status
    + + + Order
    Type
    @@ -424,6 +433,7 @@ License: You must have a valid license purchased only from themeforest(the above
    1
    03-07-2017 Warehouse Received + Delivery Request Sent PO & SO 00005 5 123456 @@ -441,6 +451,7 @@ License: You must have a valid license purchased only from themeforest(the above
    2
    02-07-2017 Warehouse Received + Delivery Request Sent PO & SO 00004 10 123456 @@ -458,6 +469,7 @@ License: You must have a valid license purchased only from themeforest(the above
    3
    01-07-2017 Container loading + Delivery Request Sent PO & SO 00003 123456 @@ -475,6 +487,7 @@ License: You must have a valid license purchased only from themeforest(the above
    4
    30-06-2017 ETD + Delivery Request Accepted PO & SO 00002 1 123456 @@ -492,6 +505,7 @@ License: You must have a valid license purchased only from themeforest(the above
    5
    29-06-2017 ETD + Delivery Request Completed PO 00001 123456 diff --git a/Importer/team.html b/Importer/team.html index b5c2d82..e0a87d2 100644 --- a/Importer/team.html +++ b/Importer/team.html @@ -289,7 +289,7 @@ License: You must have a valid license purchased only from themeforest(the above Company Information
  • - Warehouse Information + Delivery Information
  • Staff Information @@ -413,7 +413,7 @@ License: You must have a valid license purchased only from themeforest(the above - WH A + Address A 70 McCullough Dr, New Castle, 19720 Delaware, United State of America Delaware USA @@ -421,7 +421,7 @@ License: You must have a valid license purchased only from themeforest(the above
    - WH B + Address B 96-100 Beaconsfield St., Silverwater, Sydney, 2128 New South Wales, Australia New South Wales Australia @@ -429,7 +429,7 @@ License: You must have a valid license purchased only from themeforest(the above
    - WH C + Address C FACTORY UNIT A ON 9/F, YOUNG YA INDUSTRIAL BUILDING, NOS. 381-389, SHA TSUI ROAD, TSUEN WAN, NEW TERRITORIES, HONG KONG TSUEN WAN HONG KONG @@ -437,7 +437,7 @@ License: You must have a valid license purchased only from themeforest(the above
    - WH D + Address D Room I, 9F No.288 South ZhongShan Rd, 210005 Nanjing, JiangSu, China JiangSu China @@ -445,7 +445,7 @@ License: You must have a valid license purchased only from themeforest(the above
    - WH E + Address E 70 McCullough Dr, New Castle, 19720 Delaware, United State of America Delaware USA diff --git a/assets/pages/scripts/table-datatables-buttons.js b/assets/pages/scripts/table-datatables-buttons.js index c3b7d5c..ac4b0f2 100644 --- a/assets/pages/scripts/table-datatables-buttons.js +++ b/assets/pages/scripts/table-datatables-buttons.js @@ -99,53 +99,60 @@ $(function() { }) function filterme() { //build a regex filter string with an or(|) condition - var types = $('input:checkbox[name="date"]:checked').map(function() { + + var types = $('input:checkbox[name="status"]:checked').map(function() { return '^' + this.value + '\$'; }).get().join('|'); //filter in column 0, with an regex, no smart filtering, no inputbox,not case sensitive - otable.fnFilter(types, 1, true, false, false, false); - - var types = $('input:checkbox[name="type"]:checked').map(function() { + otable.fnFilter(types, 2, true, false, false, false); + var types = $('input:checkbox[name="delivery_status"]:checked').map(function() { return '^' + this.value + '\$'; }).get().join('|'); //filter in column 0, with an regex, no smart filtering, no inputbox,not case sensitive otable.fnFilter(types, 3, true, false, false, false); +var types = $('input:checkbox[name="type"]:checked').map(function() { + return '^' + this.value + '\$'; + }).get().join('|'); + //filter in column 0, with an regex, no smart filtering, no inputbox,not case sensitive + otable.fnFilter(types, 4, true, false, false, false); //build a filter string with an or(|) condition var frees = $('input:checkbox[name="orderno"]:checked').map(function() { return this.value; }).get().join('|'); //now filter in column 2, with no regex, no smart filtering, no inputbox,not case sensitive - otable.fnFilter(frees, 4, true, false, false, false); - - //build a filter string with an or(|) condition - var frees = $('input:checkbox[name="suppliercode"]:checked').map(function() { - return this.value; - }).get().join('|'); - //now filter in column 2, with no regex, no smart filtering, no inputbox,not case sensitive otable.fnFilter(frees, 5, true, false, false, false); - //build a filter string with an or(|) condition - var frees = $('input:checkbox[name="custcode"]:checked').map(function() { - return this.value; - }).get().join('|'); - //now filter in column 2, with no regex, no smart filtering, no inputbox,not case sensitive - otable.fnFilter(frees, 6, true, false, false, false); - - //build a filter string with an or(|) condition - var frees = $('input:checkbox[name="pvalue"]:checked').map(function() { - return this.value; - }).get().join('|'); - //now filter in column 2, with no regex, no smart filtering, no inputbox,not case sensitive - otable.fnFilter(frees, 7, true, false, false, false); - //build a filter string with an or(|) condition var frees = $('input:checkbox[name="shipno"]:checked').map(function() { return this.value; }).get().join('|'); //now filter in column 2, with no regex, no smart filtering, no inputbox,not case sensitive + otable.fnFilter(frees, 6, true, false, false, false); + + + //build a filter string with an or(|) condition + var frees = $('input:checkbox[name="suppliercode"]:checked').map(function() { + return this.value; + }).get().join('|'); + //now filter in column 2, with no regex, no smart filtering, no inputbox,not case sensitive + otable.fnFilter(frees, 7, true, false, false, false); + + //build a filter string with an or(|) condition + var frees = $('input:checkbox[name="custcode"]:checked').map(function() { + return this.value; + }).get().join('|'); + //now filter in column 2, with no regex, no smart filtering, no inputbox,not case sensitive otable.fnFilter(frees, 8, true, false, false, false); + //build a filter string with an or(|) condition + var frees = $('input:checkbox[name="pvalue"]:checked').map(function() { + return this.value; + }).get().join('|'); + //now filter in column 2, with no regex, no smart filtering, no inputbox,not case sensitive + otable.fnFilter(frees, 9, true, false, false, false); + + //build a filter string with an or(|) condition var frees = $('input:checkbox[name="eta"]:checked').map(function() { return this.value; @@ -153,13 +160,6 @@ function filterme() { //now filter in column 2, with no regex, no smart filtering, no inputbox,not case sensitive otable.fnFilter(frees, 10, true, false, false, false); - //build a filter string with an or(|) condition - var frees = $('input:checkbox[name="status"]:checked').map(function() { - return this.value; - }).get().join('|'); - //now filter in column 2, with no regex, no smart filtering, no inputbox,not case sensitive - otable.fnFilter(frees, 2, true, false, false, false); - } $(function() {