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

add base url for cloud mode

Browse Source
This commit is contained in:
phyusin
2018-05-22 14:15:31 +06:30
parent ead01f3d97
commit 70b7ec784f
4 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/api/restaurant/menu_controller.rb
View File

@@ -7,7 +7,10 @@ class Api::Restaurant::MenuController < Api::ApiController
# checksum = File.readlines("public/checksums/menu_json.txt").pop.chomp # checksum = File.readlines("public/checksums/menu_json.txt").pop.chomp
all_menu = Menu.all all_menu = Menu.all
@request_url = ''
if ENV["SERVER_MODE"] == "cloud"
@request_url = request.subdomain + "." + request.domain #local_url => 'http://0.0.0.0:3000'
end
# to hash # to hash
menu_array = [] menu_array = []
all_menu.each do |m| all_menu.each do |m|

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

@@ -17,7 +17,7 @@ if (menu.menu_categories)
if category.menu_items if category.menu_items
json.items category.menu_items do |item| json.items category.menu_items do |item|
json.partial! 'api/restaurant/menu/menu_item', item: item json.partial! 'api/restaurant/menu/menu_item', item: item, request_url: request_url
end end
end end
end end

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

@@ -53,7 +53,11 @@ 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
json.image item.image_path.url if !request_url.nil? && request_url != ''
json.image request_url + item.image_path.url.to_s
else
json.image item.image_path.url
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

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

@@ -5,7 +5,7 @@ menu_json = json.array! @menus do |menu|
json.valid_time_from menu.valid_time_from.strftime("%H:%M") json.valid_time_from menu.valid_time_from.strftime("%H:%M")
json.valid_time_to menu.valid_time_to.strftime("%H:%M") json.valid_time_to menu.valid_time_to.strftime("%H:%M")
json.partial! 'api/restaurant/menu/menu', menu: menu json.partial! 'api/restaurant/menu/menu', menu: menu, request_url: @request_url
# if (@current_menu) # if (@current_menu)
# json.current_menu do # json.current_menu do
# json.partial! 'api/restaurant/menu/menu', menu: @current_menu # json.partial! 'api/restaurant/menu/menu', menu: @current_menu