Merge branch 'sqa-1804-001' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01

app/controllers/origami/addorders_controller.rb

@@ -67,6 +67,8 @@ class Origami::AddordersController < BaseOrigamiController
   end
 
   def get_menu()
+    puts "sssssssssssssss"
+puts params[:id]
     if (params[:id])
       #Pull this menu
       @menu = Menu.find_by_id(params[:id])

app/controllers/origami/shifts_controller.rb

@@ -81,6 +81,8 @@ class Origami::ShiftsController < BaseOrigamiController
         #get tax
         shift_obj      = ShiftSale.where('id =?',@shift.id)
         @sale_taxes    = Sale.get_separate_tax(shift_obj,from=nil,to=nil,type='')
+        @total_waste   = Sale.get_total_waste(shift_id).sum(:grand_total)
+        @total_spoile  = Sale.get_total_spoile(shift_id).sum(:grand_total)
         #other payment details for mpu or visa like card
         @other_payment = ShiftSale.get_by_shift_other_payment(@shift)
 
@@ -94,10 +96,9 @@ class Origami::ShiftsController < BaseOrigamiController
         
         # get printer info
         print_settings = PrintSetting.find_by_unique_code(unique_code)
-        #byebug
         printer = Printer::CashierStationPrinter.new(print_settings)
-
-        printer.print_close_cashier(print_settings,cashier_terminal,@shift,shop_details,@sale_taxes,@other_payment,@total_amount_by_account,@total_discount_by_account,@total_member_discount,@total_dinein,@total_takeway,@total_other_charges)
+        
+        printer.print_close_cashier(print_settings,cashier_terminal,@shift,shop_details,@sale_taxes,@other_payment,@total_amount_by_account,@total_discount_by_account,@total_member_discount,@total_dinein,@total_takeway,@total_other_charges,@total_waste,@total_spoile)
       end
     end
     Employee.logout(session[:session_token])