git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update conflic

Browse Source
This commit is contained in:
Aung Myo
2017-12-01 13:27:21 +06:30
parent eecb896c23 d893521391
commit 1dd920088b
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/views/api/restaurant/menu/_menu.json.jbuilder
View File

@@ -9,6 +9,7 @@ if (menu.menu_categories)
json.id category.id json.id category.id
json.name category.name json.name category.name
json.alt_name category.alt_name json.alt_name category.alt_name
json.parent_id category.menu_category_id
json.is_available category.is_available json.is_available category.is_available
if category.menu_items if category.menu_items

4
config/secrets.yml
View File

@@ -12,8 +12,8 @@
development: development:
secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61 secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61
sx_provision_url: 192.168.1.147:3002/api #provision.zsai.ws/api sx_provision_url: connect.smartsales.asia/api #provision.zsai.ws/api
server_mode: application server_mode: cloud
cipher_type: AES-256-CBC cipher_type: AES-256-CBC
sx_key: Wh@t1$C2L sx_key: Wh@t1$C2L
aes_key: <%= ENV['AES_KEY'] %> aes_key: <%= ENV['AES_KEY'] %>