move table

2017-06-21 17:53:44 +06:30
parent b889603ce6
commit 64210f30ac
16 changed files with 218 additions and 40 deletions
--- a/app/controllers/origami/orders_controller.rb
+++ b/app/controllers/origami/orders_controller.rb
@@ -4,7 +4,12 @@ class Origami::OrdersController < BaseOrigamiController
    @tables = Table.all.active.order('status desc')
    @rooms = Room.all.active.order('status desc')
    @complete = Sale.all
-    @orders = Order.all.order('date desc')
+    @orders = Order.all.order('status desc')
    @order = Order.find(params[:order_id])
+    sale_order = SaleOrder.find_by_order_id(@order.order_id)
+    if sale_order
+      sale = Sale.find(sale_order.sale_id)
+      @sale_status = sale.sale_status
+    end
  end
 end