update osaka demo bugs

2017-07-14 17:23:40 +06:30
parent ef7cc1f6f0
commit 0b7b5cae30
22 changed files with 76 additions and 53 deletions
--- a/app/controllers/origami/orders_controller.rb
+++ b/app/controllers/origami/orders_controller.rb
@@ -3,7 +3,7 @@ class Origami::OrdersController < BaseOrigamiController
  def show
    @tables = Table.all.active.order('status desc')
    @rooms = Room.all.active.order('status desc')
-    @complete = Sale.all
+    @complete = Sale.where("sale_status != 'new'")
    @orders = Order.all.order('status desc')
    @order = Order.find(params[:order_id])
    sale_order = SaleOrder.find_by_order_id(@order.order_id)