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.complete_sale
+    @complete = Sale.all
     @orders = Order.all.order('date desc')
   end
 
@@ -12,27 +12,30 @@ class Origami::HomeController < BaseOrigamiController
   def show
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
-    @complete = Sale.complete_sale
+    @complete = Sale.all
     @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
-           booking.booking_orders.each do |booking_order|
 
+    @dining.bookings.active.each do |booking|
+         if booking.sale_id.nil? && booking.booking_status != 'moved'
+           @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
-              order.order_items.each do |item|
-                @order_items.push(item)
+              if (order.status == "new")
+                @obj_order = order
+                @date = order.created_at
+                order.order_items.each do |item|
+                  @order_items.push(item)
+                end
               end
            end
            @status_order = 'order'
          else
           sale = Sale.find(booking.sale_id)
            if sale.sale_status != "completed"
+             puts "enter"
              @sale_array.push(sale)
              if @status_order == 'order'
                @status_order = 'sale'
@@ -42,7 +45,7 @@ class Origami::HomeController < BaseOrigamiController
              @obj_sale = sale
            end
          end
-    end
+     end
   end
 
 private

app/controllers/origami/movetable_controller.rb

@@ -44,7 +44,7 @@ class Origami::MovetableController < BaseOrigamiController
      bookings = Booking.where('dining_facility_id=?',change_from)
      booking_array = Array.new
      bookings.each do | booking |
-       if booking.sale_id.nil? || booking.sale.sale_status != 'completed'
+       if booking.sale_id.nil? || booking.sale.sale_status != 'completed' || booking.booking_status != 'moved'
          booking_array.push(booking)
        end
      end

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.complete_sale
+    @complete = Sale.all
     @orders = Order.all.order('status desc')
     @order = Order.find(params[:order_id])
     sale_order = SaleOrder.find_by_order_id(@order.order_id)

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.complete_sale
+    @complete = Sale.all
     @orders = Order.all.order('date desc')
     @room = DiningFacility.find(params[:room_id])
     @room.bookings.each do |booking|

app/controllers/origami/sales_controller.rb

@@ -3,8 +3,42 @@ class Origami::SalesController < BaseOrigamiController
   def show
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
-    @complete = Sale.complete_sale
+    @complete = Sale.all
     @orders = Order.all.order('date desc')
     @sale = Sale.find(params[:sale_id])
   end
+
+  def add_to_existing_invoice
+    dining = params[:dining_id]
+    sale_id = params[:sale_id]
+    table = DiningFacility.find(dining)
+      table.bookings.each do |booking|
+       if booking.sale_id.nil?
+         booking.booking_orders.each do |booking_order|
+             booking.booking_status = 'moved'
+             order = Order.find(booking_order.order_id)
+             order.status = 'billed'
+             order.order_items.each do |item|
+               item.order_item_status = 'billed'
+             end
+             #  create sale item
+             saleobj = Sale.find(sale_id)
+             order.order_items.each do |orer_item|
+               saleobj.add_item (orer_item)
+             end
+             saleobj.save
+             order.save
+             booking.save
+         end
+         existing_booking = Booking.find_by_sale_id(sale_id)
+         booking_order = BookingOrder.where('booking_id=?',booking)
+         booking_order.each do |bo|
+           bo.booking_id = existing_booking.booking_id
+           bo.save
+         end
+      end
+    end
+  end
+
+
 end