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/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