git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix for oqs completed

Browse Source
This commit is contained in:
Yan
2017-07-20 15:58:31 +06:30
parent 3792133aad
commit e45bc7964c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/oqs/home_controller.rb
View File

@@ -112,7 +112,7 @@ class Oqs::HomeController < BaseOqsController
left join booking_orders as bo on bo.order_id = assigned_order_items.order_id
left join bookings as bk on bk.booking_id = bo.booking_id
left join dining_facilities as df on df.id = bk.dining_facility_id")
.where("assigned_order_items.delivery_status = true AND odt.price <> 0 AND assigned_order_items.created_at between #{Time.now.beginning_of_day.utc} and #{Time.now.end_of_day.utc}")
.where("assigned_order_items.delivery_status = true AND odt.price <> 0 AND assigned_order_items.created_at between '#{Time.now.beginning_of_day.utc}' and '#{Time.now.end_of_day.utc}'")
.group("assigned_order_items.order_id")

2
lib/tasks/menu_osaka.rake
View File

@@ -807,7 +807,7 @@ menu_category32 = MenuCategory.create({menu: menu, name: "Wine", alt_name: "Wine
menu_category33 = MenuCategory.create({menu: menu, name: "Grilled", alt_name: "Grilled", order_by: 33, created_by: "SYSTEM DEFAULT"})
# Grilled Salmon
menu_category33_menu_item200 = SimpleMenuItem.create({name: "Grilled Salmon", alt_name: " ",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food })
menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Grilled Salmon",menu_item: menu_category33_menu_item200, price:13500.00, is_on_promotion:false}])
menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Grilled Salmon",menu_item: menu_category33_menu_item200, price:13000.00, is_on_promotion:false}])
# Grilled Garlic
menu_category33_menu_item201 = SimpleMenuItem.create({name: "Grilled Garlic", alt_name: "",menu_category: menu_category33 , min_selectable_item: 1, max_selectable_item:1, account: food })
menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Grilled Garlic",menu_item: menu_category33_menu_item201, price:1500.00, is_on_promotion:false}])