Pull from master

2018-05-25 16:22:30 +06:30
parent f906134fbf
commit 578c14ccc3
26 changed files with 536 additions and 358 deletions
--- a/app/views/api/restaurant/menu/_menu_item.json.jbuilder
+++ b/app/views/api/restaurant/menu/_menu_item.json.jbuilder
@@ -53,7 +53,7 @@ json.id           item.id
 json.code    item.item_code
 json.name         item.name
 json.alt_name     item.alt_name
-if !request_url.nil? && request_url != ''
+if !request_url.nil? && request_url != '' && !item.image_path.url.nil?
  json.image        request_url + item.image_path.url.to_s
 else
  json.image        item.image_path.url