Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

app/controllers/origami/home_controller.rb

@@ -4,7 +4,7 @@ class Origami::HomeController < BaseOrigamiController
   def index
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
-    @complete = Sale.all
+    @complete = Sale.complete_sale
     @orders = Order.all.order('date desc')
   end
 
@@ -12,13 +12,16 @@ class Origami::HomeController < BaseOrigamiController
   def show
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
-    @complete = Sale.all
+    @complete = Sale.complete_sale
     @orders = Order.all.order('date desc')
     @status_order = ""
+    @status_sale = ""
+    @sale_array = Array.new
     @dining.bookings.each do |booking|
          if booking.sale_id.nil?
-           @order_items = Array.new
+            @order_items = Array.new
            booking.booking_orders.each do |booking_order|
+
               order = Order.find(booking_order.order_id)
               @obj_order = order
               @date = order.created_at
@@ -30,6 +33,7 @@ class Origami::HomeController < BaseOrigamiController
          else
           sale = Sale.find(booking.sale_id)
            if sale.sale_status != "completed"
+             @sale_array.push(sale)
              if @status_order == 'order'
                @status_order = 'sale'
              end

app/controllers/origami/movetable_controller.rb

@@ -5,13 +5,16 @@ class Origami::MovetableController < BaseOrigamiController
     @rooms = Room.all.active.order('status desc')
     @complete = Sale.all
     @orders = Order.all.order('date desc')
+    @dining = DiningFacility.find(params[:dining_id])
 
     @status_order = ""
-    @dining = DiningFacility.find(params[:dining_id])
+    @status_sale = ""
+    @sale_array = Array.new
     @dining.bookings.each do |booking|
          if booking.sale_id.nil?
-           @order_items = Array.new
+            @order_items = Array.new
            booking.booking_orders.each do |booking_order|
+
               order = Order.find(booking_order.order_id)
               @obj_order = order
               @date = order.created_at
@@ -23,6 +26,7 @@ class Origami::MovetableController < BaseOrigamiController
          else
           sale = Sale.find(booking.sale_id)
            if sale.sale_status != "completed"
+             @sale_array.push(sale)
              if @status_order == 'order'
                @status_order = 'sale'
              end

app/controllers/origami/orders_controller.rb

@@ -3,8 +3,13 @@ class Origami::OrdersController < BaseOrigamiController
   def show
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
-    @complete = Sale.all
-    @orders = Order.all.order('date desc')
+    @complete = Sale.complete_sale
+    @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

app/controllers/origami/rooms_controller.rb

@@ -3,7 +3,7 @@ class Origami::RoomsController < BaseOrigamiController
   def show
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
-    @complete = Sale.all
+    @complete = Sale.complete_sale
     @orders = Order.all.order('date desc')
     @room = DiningFacility.find(params[:room_id])
     @room.bookings.each do |booking|

app/controllers/origami/sales_controller.rb

@@ -3,7 +3,7 @@ class Origami::SalesController < BaseOrigamiController
   def show
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
-    @complete = Sale.all
+    @complete = Sale.complete_sale
     @orders = Order.all.order('date desc')
     @sale = Sale.find(params[:sale_id])
   end