diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb index ab481fc3..add3065b 100755 --- a/app/controllers/origami/addorders_controller.rb +++ b/app/controllers/origami/addorders_controller.rb @@ -9,7 +9,10 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController end def detail - @menu = MenuCategory.all.active + today = DateTime.now + day = Date.today.wday + @menus = Menu.all + @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc') @table_id = params[:id] @table = DiningFacility.find(@table_id) @booking = @table.get_booking @@ -44,6 +47,18 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController end end + def get_menu() + if (params[:id]) + puts params[:id] + #Pull this menu + @menu = Menu.find_by_id(params[:id]) + @menu_category = MenuCategory.where("menu_id='#{@menu.id}'").order("order_by asc") + # puts @menu.menu_items[1].item_attributes.to_json + return @menu + else + Menu.current_menu + end + end def get_menu_sub_category () id = params[:id] diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index 429813a1..129735a6 100755 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -27,37 +27,37 @@ class Origami::HomeController < BaseOrigamiController @membership = MembershipSetting::MembershipSetting @payment_methods = PaymentMethodSetting.all - bookings = Booking.all - if !bookings.nil? - @order_items_count = Hash.new - bookings.each do |booking| - if booking.sale_id.nil? && booking.booking_status != 'moved' - if !booking.booking_orders.empty? - booking.booking_orders.each do |booking_order| - order = Order.find(booking_order.order_id) - if !order.order_items.empty? - if !@order_items_count.key?(booking.dining_facility_id) - @order_items_count.store(booking.dining_facility_id, order.order_items.count) - else - @order_items_count[booking.dining_facility_id] += order.order_items.count - end - end - end - end - else - if !booking.sale_id.nil? - sale = Sale.find(booking.sale_id) - if sale.sale_status !='completed' - if !@order_items_count.key?(booking.dining_facility_id) - @order_items_count.store(booking.dining_facility_id, sale.sale_items.count) - else - @order_items_count[booking.dining_facility_id] = sale.sale_items.count - end - end - end - end - end - end + # bookings = Booking.all + # if !bookings.nil? + # @order_items_count = Hash.new + # bookings.each do |booking| + # if booking.sale_id.nil? && booking.booking_status != 'moved' + # if !booking.booking_orders.empty? + # booking.booking_orders.each do |booking_order| + # order = Order.find(booking_order.order_id) + # if !order.order_items.empty? + # if !@order_items_count.key?(booking.dining_facility_id) + # @order_items_count.store(booking.dining_facility_id, order.order_items.count) + # else + # @order_items_count[booking.dining_facility_id] += order.order_items.count + # end + # end + # end + # end + # else + # if !booking.sale_id.nil? + # sale = Sale.find(booking.sale_id) + # if sale.sale_status !='completed' + # if !@order_items_count.key?(booking.dining_facility_id) + # @order_items_count.store(booking.dining_facility_id, sale.sale_items.count) + # else + # @order_items_count[booking.dining_facility_id] = sale.sale_items.count + # end + # end + # end + # end + # end + # end puts "@order_items_count" puts @order_items_count.to_json diff --git a/app/controllers/origami/quick_service_controller.rb b/app/controllers/origami/quick_service_controller.rb index c6ad1383..ef170480 100644 --- a/app/controllers/origami/quick_service_controller.rb +++ b/app/controllers/origami/quick_service_controller.rb @@ -2,7 +2,10 @@ class Origami::QuickServiceController < ApplicationController # before_action :set_dining, only: [:detail] def index - @menu = MenuCategory.all.active + today = DateTime.now + day = Date.today.wday + @menus = Menu.all + @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc') @zone = Zone.all @customer = Customer.all @tables = Table.all.active.order('status desc') @@ -15,7 +18,10 @@ class Origami::QuickServiceController < ApplicationController end def modify_order - @menu = MenuCategory.all.active + today = DateTime.now + day = Date.today.wday + @menus = Menu.all + @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc') if(params[:id][0,3] == "BKI") @table_id = nil @table = nil diff --git a/app/models/menu.rb b/app/models/menu.rb index 65d00d90..b96fe03a 100755 --- a/app/models/menu.rb +++ b/app/models/menu.rb @@ -4,7 +4,7 @@ class Menu < ApplicationRecord validates_presence_of :name, :valid_days, :valid_time_from, :valid_time_to # validates_format_of :valid_days, :with => /\A([0-7]{1}(,[0-7]{1})*)?\Z/i #Default Scope to pull the active version only - default_scope { where(is_active: true).order("created_at desc") } + default_scope { where(is_active: true).order("created_at asc") } def self.current_menu today = DateTime.now diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index f26409fe..a4f27bc7 100755 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -10,7 +10,16 @@
- + + <%= @menus[0].name %> + +