diff --git a/app/controllers/reports/receipt_no_controller.rb b/app/controllers/reports/receipt_no_controller.rb index 1b449f4c..9564bfe1 100755 --- a/app/controllers/reports/receipt_no_controller.rb +++ b/app/controllers/reports/receipt_no_controller.rb @@ -41,8 +41,7 @@ authorize_resource :class => false def show from, to = get_date_range_from_params -puts from -puts to + @sale_data = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED) date_arr = Array.new diff --git a/app/views/reports/credit_payment/index.html.erb b/app/views/reports/credit_payment/index.html.erb index 8becb13c..4e1432bf 100755 --- a/app/views/reports/credit_payment/index.html.erb +++ b/app/views/reports/credit_payment/index.html.erb @@ -83,20 +83,24 @@ // OK button is clicked $('#from').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){ - $('#from').val(date) + new_date = new Date(date) ; + month = parseInt(new_date.getMonth()+1) + from = new_date.getDate() + "-" + month + "-" + new_date.getFullYear(); + $('#from').val(from) search_by_date(); }); $('#to').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){ - $('#to').val(date) + new_date = new Date(date) ; + month = parseInt(new_date.getMonth()+1) + to = new_date.getDate() + "-" + month + "-" + new_date.getFullYear(); + $('#to').val(to) search_by_date(); - }); + }); function search_by_date(){ - var to_date = new Date($('#to').val()); - var to = to_date.getDate() + "-" + to_date.getMonth() + "-" + to_date.getFullYear(); - var from_date = new Date($('#from').val()); - var from = from_date.getDate() + "-" + from_date.getMonth() + "-" + from_date.getFullYear(); + from = $("#from").val(); + to = $("#to").val(); var period = 0; var period_type = 1; diff --git a/app/views/reports/payment_method/index.html.erb b/app/views/reports/payment_method/index.html.erb index c3be1bc3..9170a31b 100755 --- a/app/views/reports/payment_method/index.html.erb +++ b/app/views/reports/payment_method/index.html.erb @@ -149,20 +149,24 @@ // OK button is clicked $('#from').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){ - $('#from').val(date) + new_date = new Date(date) ; + month = parseInt(new_date.getMonth()+1) + from = new_date.getDate() + "-" + month + "-" + new_date.getFullYear(); + $('#from').val(from) search_by_date(); }); $('#to').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){ - $('#to').val(date) + new_date = new Date(date) ; + month = parseInt(new_date.getMonth()+1) + to = new_date.getDate() + "-" + month + "-" + new_date.getFullYear(); + $('#to').val(to) search_by_date(); - }); + }); function search_by_date(){ - var to_date = new Date($('#to').val()); - var to = to_date.getDate() + "-" + to_date.getMonth() + "-" + to_date.getFullYear(); - var from_date = new Date($('#from').val()); - var from = from_date.getDate() + "-" + from_date.getMonth() + "-" + from_date.getFullYear(); + from = $("#from").val(); + to = $("#to").val(); var period = 0; var period_type = 1; diff --git a/app/views/reports/receipt_no/index.html.erb b/app/views/reports/receipt_no/index.html.erb index 99330ae9..03b5bbec 100755 --- a/app/views/reports/receipt_no/index.html.erb +++ b/app/views/reports/receipt_no/index.html.erb @@ -151,22 +151,25 @@ // OK button is clicked $('#from').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){ - $('#from').val(date) + new_date = new Date(date) ; + month = parseInt(new_date.getMonth()+1) + from = new_date.getDate() + "-" + month + "-" + new_date.getFullYear(); + $('#from').val(from) search_by_date(); }); $('#to').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){ - $('#to').val(date) + new_date = new Date(date) ; + month = parseInt(new_date.getMonth()+1) + to = new_date.getDate() + "-" + month + "-" + new_date.getFullYear(); + $('#to').val(to) search_by_date(); }); function search_by_date(){ - var to_date = new Date($('#to').val()); - var to = to_date.getDate() + "-" + to_date.getMonth() + "-" + to_date.getFullYear(); - var from_date = new Date($('#from').val()); - var from = from_date.getDate() + "-" + from_date.getMonth() + "-" + from_date.getFullYear(); - $('#from').val(from) - $('#to').val(to) + from = $("#from").val(); + to = $("#to").val(); + var period = 0; var period_type = 1; diff --git a/app/views/reports/saleitem/index.html.erb b/app/views/reports/saleitem/index.html.erb index 28c3be5c..7fa72521 100644 --- a/app/views/reports/saleitem/index.html.erb +++ b/app/views/reports/saleitem/index.html.erb @@ -253,19 +253,23 @@ // OK button is clicked $('#from').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){ - $('#from').val(date) + new_date = new Date(date) ; + month = parseInt(new_date.getMonth()+1) + from = new_date.getDate() + "-" + month + "-" + new_date.getFullYear(); + $('#from').val(from) search_by_date(); }); $('#to').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){ - $('#to').val(date) + new_date = new Date(date) ; + month = parseInt(new_date.getMonth()+1) + to = new_date.getDate() + "-" + month + "-" + new_date.getFullYear(); + $('#to').val(to) search_by_date(); - }); + }); function search_by_date(){ - var to_date = new Date($('#to').val()); - var to = to_date.getDate() + "-" + to_date.getMonth() + "-" + to_date.getFullYear(); - var from_date = new Date($('#from').val()); - var from = from_date.getDate() + "-" + from_date.getMonth() + "-" + from_date.getFullYear(); + from = $("#from").val(); + to = $("#to").val(); var period = 0; var period_type = 1; diff --git a/app/views/reports/shiftsale/index.html.erb b/app/views/reports/shiftsale/index.html.erb index 2b781a13..9a4a6978 100755 --- a/app/views/reports/shiftsale/index.html.erb +++ b/app/views/reports/shiftsale/index.html.erb @@ -151,20 +151,24 @@ // OK button is clicked $('#from').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){ - $('#from').val(date) + new_date = new Date(date) ; + month = parseInt(new_date.getMonth()+1) + from = new_date.getDate() + "-" + month + "-" + new_date.getFullYear(); + $('#from').val(from) search_by_date(); }); $('#to').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){ - $('#to').val(date) + new_date = new Date(date) ; + month = parseInt(new_date.getMonth()+1) + to = new_date.getDate() + "-" + month + "-" + new_date.getFullYear(); + $('#to').val(to) search_by_date(); }); function search_by_date(){ - var to_date = new Date($('#to').val()); - var to = to_date.getDate() + "-" + to_date.getMonth() + "-" + to_date.getFullYear(); - var from_date = new Date($('#from').val()); - var from = from_date.getDate() + "-" + from_date.getMonth() + "-" + from_date.getFullYear(); + from = $("#from").val(); + to = $("#to").val(); var period = 0; var period_type = 1; diff --git a/app/views/reports/void_sale/index.html.erb b/app/views/reports/void_sale/index.html.erb index e7269970..53662f2d 100755 --- a/app/views/reports/void_sale/index.html.erb +++ b/app/views/reports/void_sale/index.html.erb @@ -105,19 +105,23 @@ // OK button is clicked $('#from').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){ - $('#from').val(date) + new_date = new Date(date) ; + month = parseInt(new_date.getMonth()+1) + from = new_date.getDate() + "-" + month + "-" + new_date.getFullYear(); + $('#from').val(from) search_by_date(); }); $('#to').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){ - $('#to').val(date) + new_date = new Date(date) ; + month = parseInt(new_date.getMonth()+1) + to = new_date.getDate() + "-" + month + "-" + new_date.getFullYear(); + $('#to').val(to) search_by_date(); }); function search_by_date(){ - var to_date = new Date($('#to').val()); - var to = to_date.getDate() + "-" + to_date.getMonth() + "-" + to_date.getFullYear(); - var from_date = new Date($('#from').val()); - var from = from_date.getDate() + "-" + from_date.getMonth() + "-" + from_date.getFullYear(); + from = $("#from").val(); + to = $("#to").val(); var period = 0; var period_type = 1;