update all report generate and excel

2017-12-19 16:27:00 +06:30
parent aec3b17127
commit bba3aa7631
8 changed files with 31 additions and 13 deletions
--- a/app/views/reports/saleitem/index.html.erb
+++ b/app/views/reports/saleitem/index.html.erb
@@ -297,12 +297,15 @@

 		function show_shift_name(period,period_type,from,to,shift_item){
 			var shift = $('#shift_name');
-
+			if (from == '' && to == '') {
+				from = $("#from").val();
+	  		    to   = $("#to").val();
+			}
 			shift.empty();
 			var selected = '';
 			var str = '';
 			var param_shift = '<%= params[:shift_name]%>';
-
+			
 			url = '<%= reports_get_shift_by_date_path %>';
 			$.get(url, {period :period, period_type :period_type, from :from, to :to, report_type :shift_item} , function(data){
 				console.log(data)