pull from master

app/controllers/origami/addorders_controller.rb

@@ -18,9 +18,6 @@ class Origami::AddordersController < BaseOrigamiController
     if check_mobile
       @webview = true  
     end
-    
-  	today = DateTime.now
-    day = Date.today.wday
     @menus    = Menu.all
     @menu     = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc')
     @table_id = params[:id]

app/controllers/origami/dashboard_controller.rb

@@ -56,6 +56,13 @@ class Origami::DashboardController < BaseOrigamiController
     # get printer info
     @print_settings = PrintSetting.get_precision_delimiter()
     @current_user = current_user
+    #dine-in cashier
+    dinein_cashier = Lookup.collection_of('dinein_cashier')
+    @dinein_cashier = 0
+    if !dinein_cashier[0].nil?
+      @dinein_cashier = dinein_cashier[0][1]
+    end
+
     #quick service
     quick_service = Lookup.collection_of('quick_service')
     @quick_service = 0

app/controllers/origami/order_reservation_controller.rb

@@ -1,7 +1,7 @@
 class Origami::OrderReservationController < BaseOrigamiController
 
   def index
-  	@order = OrderReservation.latest_order
+  	@order = OrderReservation.latest_order #.active
     @count_on_order = OrderReservation.get_count_on_order
   end
 

app/controllers/origami/payments_controller.rb

@@ -279,6 +279,9 @@ class Origami::PaymentsController < BaseOrigamiController
           new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
           @rounding_adj = new_total-saleObj.grand_total
           saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:@rounding_adj)        
+          @sale_data.grand_total = new_total
+          @sale_data.old_grand_total = saleObj.grand_total
+          @sale_data.rounding_adjustment = @rounding_adj
         else
           @rounding_adj = @sale_data.rounding_adjustment
         end