From 84f84f628807e0b46d9a2c0fff7234e773d97128 Mon Sep 17 00:00:00 2001 From: franknstayn Date: Wed, 13 Nov 2019 16:25:28 +0800 Subject: [PATCH] fixed store order filder by date --- resources/views/user-layouts/store-orders.blade.php | 1 - resources/views/user-layouts/user_template.blade.php | 10 ++++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/resources/views/user-layouts/store-orders.blade.php b/resources/views/user-layouts/store-orders.blade.php index d0ee64d..1646168 100644 --- a/resources/views/user-layouts/store-orders.blade.php +++ b/resources/views/user-layouts/store-orders.blade.php @@ -47,7 +47,6 @@ -
diff --git a/resources/views/user-layouts/user_template.blade.php b/resources/views/user-layouts/user_template.blade.php index 6cec022..98954e4 100644 --- a/resources/views/user-layouts/user_template.blade.php +++ b/resources/views/user-layouts/user_template.blade.php @@ -640,10 +640,10 @@ $( document ).ready(function() { $.fn.dataTable.ext.search.push( function (settings, data, dataIndex) { - + var min = $('#min').datepicker("getDate"); var max = $('#max').datepicker("getDate"); - var startDate = new Date(data[4]); + var startDate = new Date(data[9]); if (min == null && max == null) { return true; } if (min == null && startDate <= max) { return true;} if(max == null && startDate >= min) {return true;} @@ -654,6 +654,7 @@ $("#min").datepicker({ onSelect: function () { table.draw(); }, changeMonth: true, changeYear: true }); $("#max").datepicker({ onSelect: function () { table.draw(); }, changeMonth: true, changeYear: true }); + var table = $('#tbl_store_orders').DataTable({ scrollX: true, dom: 'Bfrtip', @@ -679,7 +680,8 @@ title : function() { return "ORDER REPORTS"; } - } + } + //, // { // extend: 'pdf', @@ -711,7 +713,7 @@ ], columnDefs: [ { targets: 9, type: 'date', visible: false }, - { targets: 19, type: 'date' } + { targets: 9, type: 'date' } ], });