From 70b7ec784fd6ebdd3906e0c1301b658878820649 Mon Sep 17 00:00:00 2001 From: phyusin Date: Tue, 22 May 2018 14:15:31 +0630 Subject: [PATCH] add base url for cloud mode --- app/controllers/api/restaurant/menu_controller.rb | 5 ++++- app/views/api/restaurant/menu/_menu.json.jbuilder | 2 +- app/views/api/restaurant/menu/_menu_item.json.jbuilder | 6 +++++- app/views/api/restaurant/menu/index.json.jbuilder | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/controllers/api/restaurant/menu_controller.rb b/app/controllers/api/restaurant/menu_controller.rb index 011e4602..f6a43514 100755 --- a/app/controllers/api/restaurant/menu_controller.rb +++ b/app/controllers/api/restaurant/menu_controller.rb @@ -7,7 +7,10 @@ class Api::Restaurant::MenuController < Api::ApiController # checksum = File.readlines("public/checksums/menu_json.txt").pop.chomp 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 menu_array = [] all_menu.each do |m| diff --git a/app/views/api/restaurant/menu/_menu.json.jbuilder b/app/views/api/restaurant/menu/_menu.json.jbuilder index 8dcdf6fe..082b5f0a 100755 --- a/app/views/api/restaurant/menu/_menu.json.jbuilder +++ b/app/views/api/restaurant/menu/_menu.json.jbuilder @@ -17,7 +17,7 @@ if (menu.menu_categories) if category.menu_items 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 diff --git a/app/views/api/restaurant/menu/_menu_item.json.jbuilder b/app/views/api/restaurant/menu/_menu_item.json.jbuilder index 810daf6d..56a8cb5f 100755 --- a/app/views/api/restaurant/menu/_menu_item.json.jbuilder +++ b/app/views/api/restaurant/menu/_menu_item.json.jbuilder @@ -53,7 +53,11 @@ json.id item.id json.code item.item_code json.name item.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.information item.information json.type item.type diff --git a/app/views/api/restaurant/menu/index.json.jbuilder b/app/views/api/restaurant/menu/index.json.jbuilder index 46f35e60..a230a965 100755 --- a/app/views/api/restaurant/menu/index.json.jbuilder +++ b/app/views/api/restaurant/menu/index.json.jbuilder @@ -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_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) # json.current_menu do # json.partial! 'api/restaurant/menu/menu', menu: @current_menu