Merge branch 'r-1902001-01' into foodcourt

2020-08-04 11:45:01 +06:30
parent 9a17ab5d9b ffb8e56031
commit 82925881f7
43 changed files with 401 additions and 970 deletions
--- a/app/views/api/restaurant/menu/_menu_item.json.jbuilder
+++ b/app/views/api/restaurant/menu/_menu_item.json.jbuilder
@@ -23,10 +23,10 @@ if item.is_available
  json.code         item.item_code
  json.name         item.name
  json.alt_name     item.alt_name
-  if !request_url.nil? && request_url != '' && !item.image_path.nil?
-    json.image        request_url + item.image_path.to_s
+  if item.image_path.present?
+    json.image      "#{request_url}#{item.image_path}"
  else
-    json.image        item.image_path.url
+    json.image      ''
  end
  json.description  item.description
  json.information  item.information