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

check is_available for menu sync

Browse Source
This commit is contained in:
phyusin
2018-12-24 16:58:53 +06:30
parent cfad5bc280
commit f7c908b870
3 changed files with 134 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/reservation.js
View File

@@ -32,7 +32,7 @@ $(function(){
/*new customer UI func:*/ /*new customer UI func:*/
$(".reservation_type").on("click", function(){ $(".reservation_type").on("click", function(){
if($(this).val() == "Dine-in"){ if(parseInt($(this).val()) == 0){
$(".dining_type").show(); $(".dining_type").show();
$(".room_type").hide(); $(".room_type").hide();
}else{ }else{

2
app/views/api/restaurant/menu/_menu.json.jbuilder
View File

@@ -7,6 +7,7 @@ json.valid_time_to menu.valid_time_to.strftime("%H:%M")
if (menu.menu_categories) if (menu.menu_categories)
json.categories menu.menu_categories do |category| json.categories menu.menu_categories do |category|
if category.is_available
json.id category.id json.id category.id
json.code category.code json.code category.code
json.order_by category.order_by json.order_by category.order_by
@@ -22,4 +23,5 @@ if (menu.menu_categories)
end end
end end
end end
end
end end

94
app/views/api/restaurant/menu/_menu_item.json.jbuilder
View File

@@ -1,7 +1,8 @@
# Format for attributes json # Format for attributes json
attr_format = [] attr_format = []
# Format for attributes json # Format for attributes json
if item.item_attributes.count > 0 if item.is_available
if item.item_attributes.count > 0
item.item_attributes.each do|attr_id| item.item_attributes.each do|attr_id|
menu_attr = MenuItemAttribute.find(attr_id) menu_attr = MenuItemAttribute.find(attr_id)
if attr_format.count == 0 if attr_format.count == 0
@@ -21,12 +22,12 @@ if item.item_attributes.count > 0
end end
end end
end end
end end
# Format for option json # Format for option json
opt_format = [] opt_format = []
# Format for attributes json # Format for attributes json
if item.item_options.count > 0 if item.item_options.count > 0
item.item_options.each do|opt| item.item_options.each do|opt|
menu_opt = MenuItemOption.find(opt) menu_opt = MenuItemOption.find(opt)
if opt_format.count == 0 if opt_format.count == 0
@@ -46,29 +47,29 @@ if item.item_options.count > 0
end end
end end
end end
end end
#Menu Item Information #Menu Item Information
json.id item.id json.id item.id
json.code item.item_code json.code item.item_code
json.name item.name json.name item.name
json.alt_name item.alt_name json.alt_name item.alt_name
if !request_url.nil? && request_url != '' && !item.image_path.nil? if !request_url.nil? && request_url != '' && !item.image_path.nil?
json.image request_url + item.image_path.to_s json.image request_url + item.image_path.to_s
else else
json.image item.image_path.url json.image item.image_path.url
end end
json.description item.description json.description item.description
json.information item.information json.information item.information
json.type item.type json.type item.type
json.account_id item.account_id json.account_id item.account_id
json.min_qty item.min_qty json.min_qty item.min_qty
json.is_available item.is_available json.is_available item.is_available
json.is_sub_item item.is_sub_item json.is_sub_item item.is_sub_item
json.unit item.unit json.unit item.unit
# Item Sets of Menu Item # Item Sets of Menu Item
json.item_sets item.item_sets do |its| json.item_sets item.item_sets do |its|
json.id its.id json.id its.id
json.name its.name json.name its.name
json.alt_name its.alt_name json.alt_name its.alt_name
@@ -77,23 +78,23 @@ json.item_sets item.item_sets do |its|
json.instances its.menu_item_instances do |i| json.instances its.menu_item_instances do |i|
json.id i.id json.id i.id
end end
end end
json.attributes attr_format json.attributes attr_format
json.options opt_format json.options opt_format
# json.min_selectable_item item.min_selectable_item # json.min_selectable_item item.min_selectable_item
# json.max_selectable_item item.max_selectable_item # json.max_selectable_item item.max_selectable_item
#Item instance #Item instance
# if item.menu_item_instances.count == 1 then # if item.menu_item_instances.count == 1 then
# item_instance = item.menu_item_instances[0] # item_instance = item.menu_item_instances[0]
# json.price = item_instance.price # json.price = item_instance.price
# json.is_available = item_instance.is_available # json.is_available = item_instance.is_available
# json.is_on_promotion = item_instance.is_on_promotion # json.is_on_promotion = item_instance.is_on_promotion
# json.promotion_price = item_instance.promotion_price # json.promotion_price = item_instance.promotion_price
# json.item_attributes = item_instance.item_attributes # json.item_attributes = item_instance.item_attributes
json.instances item.menu_item_instances do |is| json.instances item.menu_item_instances do |is|
if is.is_available if is.is_available
# Convert id to name for attributes # Convert id to name for attributes
instance_attr = [] instance_attr = []
@@ -116,11 +117,12 @@ json.instances item.menu_item_instances do |is|
json.values instance_attr json.values instance_attr
# json.item_sets is.item_sets # json.item_sets is.item_sets
end end
end end
#Child Menu items #Child Menu items
# if (item.children) then # if (item.children) then
# json.set_items item.children.each do |item| # json.set_items item.children.each do |item|
# json.partial! 'api/restaurant/menu/menu_item', item: item # json.partial! 'api/restaurant/menu/menu_item', item: item
# end # end
# end # end
end