merge with r-19

app/controllers/origami/quick_service_controller.rb

@@ -10,24 +10,27 @@ class Origami::QuickServiceController < ApplicationController
   def index
     today = DateTime.now
     day = Date.today.wday
-    # if params[:menu] == "true"
+
     @menus    = []
     @menu     = []
     @zone     = Zone.all
     @customer = Customer.all
-    @tables   = Table.all.active.order('status desc')
-    @rooms    = Room.all.active.order('status desc')
+    @tables   = Table.active.order('status desc')
+    @rooms    = Room.active.order('status desc')
     @cashier_type = "quick_service"
     display_type = Lookup.find_by_lookup_type("display_type")
-    if !display_type.nil? && display_type.value.to_i ==2
+    if !display_type.nil? && display_type.value.to_i == 2
       @display_type = display_type.value
     else
       @display_type = nil
     end
 
     #checked quick_service only
-    @quick_service_only = false
-    lookup_dine_in = Lookup.where("shop_code='#{@shop.shop_code}'").collection_of('quickservice_add_order')
+    @quick_service_only = Lookup.collection_of('quickservice_add_order').any? { |x| x == ["quickserviceaddorder", "1"] }
+
+    lookup_dine_in = Lookup.collection_of('quickservice_add_order')
+    # puts 'lookup_dine_in!!!!'
+    # puts lookup_dine_in
     if !lookup_dine_in.empty?
       lookup_dine_in.each do |dine_in|
         if dine_in[0].downcase == "quickserviceaddorder"
@@ -37,7 +40,23 @@ class Origami::QuickServiceController < ApplicationController
         end
       end
     end
-
+    divided_value =0
+    exclusive =0
+    tax_profiles = TaxProfile.where(group_type: "quick_service")
+    if !tax_profiles.empty?
+      tax_profiles.each do |tax|
+        #include or execulive
+        if tax.inclusive
+          tax_incl_exec = "inclusive"
+          rate = tax.rate
+          divided_value += (100 + rate)/rate
+        else
+          exclusive +=tax.rate / 100
+        end
+      end
+    end
+    @inclusive_tax =divided_value
+    @exclusive_tax =exclusive
     render "origami/addorders/detail"
   end
 
@@ -52,7 +71,7 @@ class Origami::QuickServiceController < ApplicationController
     #    @menus    = Menu.all
     #    @menu     = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc')
     # end
-    if(params[:id][0,3] == "BKI")
+    if params[:id].include? "BKI"
       @table_id = nil
       @table = nil
       @booking = Booking.find(params[:id])
@@ -109,7 +128,7 @@ class Origami::QuickServiceController < ApplicationController
     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.customer_id = params[:customer_id].present? ? params[:customer_id] : walkin.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