pull from master 23.5.2018

2018-05-23 09:36:49 +06:30
parent f1733d9f06
commit dbfc00435b
12 changed files with 89 additions and 62 deletions
--- 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|