prevent order append to previous sale

app/controllers/origami/quick_service_controller.rb

@@ -10,13 +10,13 @@ class Origami::QuickServiceController < ApplicationController
   def index
     today = DateTime.now
     day = Date.today.wday
-     # if params[:menu] == "true"
-     @menus    = []
-     @menu     = []
-   # else
-   #    @menus    = Menu.all
-   #    @menu     = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc')
-   # end
+    # if params[:menu] == "true"
+    @menus    = []
+    @menu     = []
+    # else
+    #    @menus    = Menu.all
+    #    @menu     = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc')
+    # end
     @zone     = Zone.all
     @customer = Customer.all
     @tables   = Table.all.active.order('status desc')
@@ -51,13 +51,13 @@ class Origami::QuickServiceController < ApplicationController
     @cashier_type = "quick_service"
     today = DateTime.now
     day = Date.today.wday
-     # if params[:menu] == "true"
-     @menus    = []
-     @menu     = []
-   # else
-   #    @menus    = Menu.all
-   #    @menu     = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc')
-   # end
+    # if params[:menu] == "true"
+    @menus    = []
+    @menu     = []
+    # else
+    #    @menus    = Menu.all
+    #    @menu     = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc')
+    # end
     if(params[:id][0,3] == "BKI")
       @table_id = nil
       @table = nil
@@ -68,34 +68,29 @@ class Origami::QuickServiceController < ApplicationController
       @booking = @table.get_booking
     end
 
-    @sale_id = params[:sale_id]
+    @sale_id = @booking.sale_id
 
     if @booking
       @booking_id = @booking.booking_id
-      @order_items = Array.new
-      @booking.booking_orders.each do |booking_order|
-        order = Order.find(booking_order.order_id)
-        if (order.status == "new")
-          @obj_order = order
-          @customer = order.customer
-          @date = order.created_at
-          order.order_items.each do |item|
-            @order_items.push(item)
-          end
-        end
-      end
-    else
-      @booking = nil
+      @obj_order = @booking.orders.first
+      @customer = @obj_order.customer
+      @date = @obj_order.created_at
+      @order_items = @booking.order_items
     end
-     render "origami/addorders/detail"
+
+    render "origami/addorders/detail"
   end
 
   def update_modify_order
-    Rails.logger.debug "Order Source - " + params[:order_source].to_s
-    Rails.logger.debug "Table ID - " + params[:table_id].to_s
+    booking = Booking.find(params[:booking_id])
+    sale = booking.sale
+    if sale && sale.sale_status != 'new'
+      render :json => { :status => false }
+    end
+
     is_extra_time = false
     extra_time = ''
-    @cashier_type = "quick_service"
+    cashier_type = "quick_service"
 
     items_arr = []
     JSON.parse(params[:order_items]).each { |i|
@@ -117,82 +112,32 @@ class Origami::QuickServiceController < ApplicationController
      }
 
     # begin
-    @order = Order.new
-    @order.source = params[:order_source]
-    @order.order_type = params[:order_type]
-    @order.customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile
-    @order.items = items_arr
-    @order.guest = params[:guest_info]
-    @order.table_id = params[:table_id]  # this is dining facilities's id
-    @order.new_booking = true
-    @order.waiters = current_login_employee.name
-    @order.employee_name = current_login_employee.name
+    order = Order.new
+    order.source = params[:order_source]
+    order.order_type = params[:order_type]
+    order.customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile
+    order.items = items_arr
+    order.guest = params[:guest_info]
+    order.table_id = params[:table_id]  # this is dining facilities's id
+    order.waiters = current_login_employee.name
+    order.employee_name = current_login_employee.name
+    
+    order.is_extra_time = is_extra_time
+    order.extra_time    = extra_time
 
-    @order.is_extra_time = is_extra_time
-    @order.extra_time    = extra_time
+    order.new_booking = false
+    order.booking_id = booking.booking_id
 
-      #Create Table Booking or Room Booking
-      if !params["booking_id"].nil?
-          # check booking id is already completed.
-          booking = Booking.find(params[:booking_id])
-          if params[:table_id].to_i > 0
-            table_status = booking.dining_facility_id.to_i == params[:table_id].to_i
-          else
-            table_status = true
-          end
-          if booking
-              if table_status && booking.booking_status != 'moved'
-                if !booking.sale_id.nil?
-                  sale_status = check_order_with_booking(booking)
-                  if sale_status
-                    return return_json_status_with_code(400, "bill requested")
-                  end
-                else
-                  @order.new_booking = false
-                  @order.booking_id = params[:booking_id]
-                end
-              else
-                if params[:table_id].to_i > 0
-                  sale_status = check_order_with_table(params[:table_id])
-                  if sale_status
-                    return return_json_status_with_code(400, "bill requested")
-                  end
-                end
-              end
-          end #booking exists
+    if order.generate
+      if sale
+        Sale.add_to_existing_pending_invoice(nil, sale.sale_id, booking)
+        render :json => { :status => true, :data => sale }
       else
-        if params[:table_id].to_i > 0
-          sale_status = check_order_with_table(params[:table_id])
-          if sale_status
-            # return false , @message = "bill requested"
-            return return_json_status_with_code(400, "bill requested")
-          end
-        end
-      end
-
-      @status, @booking = @order.generate
-      if(params[:sale_id][0,3] == "SAL")
-        if @status && @booking && @order.source == 'quick_service'
-          if params[:sale_id]
-            @sale = Sale.find(params[:sale_id])
-            if @order.table_id.to_i > 0
-              @table_id = @order.table_id
-            else
-              @table_id = nil
-            end
-            update = Sale.add_to_existing_pending_invoice(@table_id,params[:sale_id],@booking)
-          end
-
-          result = {:status=> true, :data => @sale }
-          render :json => result.to_json
-        end
-      elsif (params[:sale_id][0,3] == "BKI")
-         result = {:status=> true, :data => 'OK' }
-          render :json => result.to_json
-      else
-        result = {:status=> true, :data => nil }
-        render :json => result.to_json
+        render :json => { :status => true, :data => 'OK' }
       end
+    else
+      render :json => { :status => false }
+    end
 
   end
 
@@ -234,20 +179,20 @@ class Origami::QuickServiceController < ApplicationController
   def check_order_with_table(table_id)
     table =  DiningFacility.find(table_id)
     if table
-       booking = table.get_current_booking
-       # puts booking
-       if booking
+      booking = table.get_current_booking
+      # puts booking
+      if booking
         if !booking.sale_id.nil?
           if booking.sale.sale_status == "completed" || booking.sale.sale_status == "new"
-           @order.new_booking = true
-           return false
+            @order.new_booking = true
+            return false
           end
         else
-           @order.new_booking = false
-           @order.booking_id = booking.booking_id
-           return false
-         end
-       end
+            @order.new_booking = false
+            @order.booking_id = booking.booking_id
+            return false
+        end
+      end
     end
   end