update report detail ,close_cashire_pdf and view reports

2017-07-21 09:57:22 +06:30
parent 3792133aad
commit a0edef735d
20 changed files with 150 additions and 232 deletions
--- a/app/controllers/reports/receipt_no_controller.rb
+++ b/app/controllers/reports/receipt_no_controller.rb
@@ -17,7 +17,12 @@ authorize_resource :class => false
 	        @shift = ShiftSale.where('shift_started_at = ? and shift_closed_at = ? ',shift_sale.shift_started_at, shift_sale.shift_closed_at)        
 	      end
 	    end
-        @sale_data = Sale.get_shift_sales_by_receipt_no(@shift_sale_range,@shift,from,to, params[:payment_type]) 
+	    payment_type = params[:payment_type]
+        @sale_data = Sale.get_shift_sales_by_receipt_no(@shift_sale_range,@shift,from,to,payment_type) 
+        @sale_taxes = Sale.get_separate_tax(@shift,from,to,payment_type)
+
+        @from       = from
+        @to         = to

        if @shift.present?
 	      @shift.each do |sh|