From 281ea9910a27f29e75ced9b29cf0f7207959c6e2 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 30 Nov 2017 20:03:12 +0630 Subject: [PATCH 1/2] license --- config/secrets.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/secrets.yml b/config/secrets.yml index f8456ee3..3e8ad936 100755 --- a/config/secrets.yml +++ b/config/secrets.yml @@ -12,8 +12,8 @@ development: secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61 - sx_provision_url: 192.168.1.147:3002/api #provision.zsai.ws/api - server_mode: application + sx_provision_url: connect.smartsales.asia/api #provision.zsai.ws/api + server_mode: cloud cipher_type: AES-256-CBC sx_key: Wh@t1$C2L aes_key: <%= ENV['AES_KEY'] %> From c559222f3635896bcba139746d6708f16a4df73a Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 1 Dec 2017 11:22:05 +0630 Subject: [PATCH 2/2] add sub menu cat --- app/views/api/restaurant/menu/_menu.json.jbuilder | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/api/restaurant/menu/_menu.json.jbuilder b/app/views/api/restaurant/menu/_menu.json.jbuilder index 29982631..9441daf9 100755 --- a/app/views/api/restaurant/menu/_menu.json.jbuilder +++ b/app/views/api/restaurant/menu/_menu.json.jbuilder @@ -9,6 +9,7 @@ if (menu.menu_categories) json.id category.id json.name category.name json.alt_name category.alt_name + json.parent_id category.menu_category_id json.is_available category.is_available if category.menu_items