Merge branch 'r-1902001-01' of gitlab.com:code2lab/SXRestaurant into r-1902001-01

app/controllers/reports/shiftsale_controller.rb

@@ -52,14 +52,11 @@ class Reports::ShiftsaleController < BaseReportController
 		shift_id = params[:id]
 		@shift = ShiftSale.find_by_id(shift_id)
 		shift_obj = ShiftSale.where('id =?',shift_id)
-		puts "shift obj!!!!!"
-		puts shift_obj.to_json
+
 
 		if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
 
 			close_cashier_pdf = Lookup.collection_of("print_settings")
-			puts "close !!!!"
-			puts close_cashier_pdf
 
 			unique_code = "CloseCashierPdf"
 

app/models/sale.rb

@@ -959,7 +959,8 @@ def self.get_by_shiftsales(from,to,shift)
       :credit_sales => shift_sale.credit_sales,
       :other_sales => shift_sale.other_sales.to_f,
       :foc_sales => foc,
-      :grand_total => shift_sale.grand_total
+      :grand_total => shift_sale.grand_total,
+      :shift_id => shift_sale.id
     }
   end
 

app/views/reports/shiftsale/index.html.erb

@@ -65,7 +65,7 @@
 
 					<!-- <th>Rounding Adj</th> -->
 					<th><%= t("views.right_panel.detail.grand_total") %></th>
-          <th>Print</th>
+          <th>Action</th>
 				</tr>
 			</thead>
 			<tbody>