Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

2018-01-17 12:06:29 +06:30
parent 64253377fb ef816a5969
commit 0dc66e0273
30 changed files with 450 additions and 247 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -7,7 +7,10 @@ scope "(:locale)", locale: /en|mm/ do
  mount Sidekiq::Web => '/kiq'

  # Action Cable Creation
-   mount ActionCable.server => "/cable"
+  # if ENV["SERVER_MODE"] !=  "cloud"
+    mount ActionCable.server => "/cable"
+  # end
+   

  #--------- SmartSales Activation ------------#
  get 'activate' => 'install#index'
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -25,7 +25,7 @@ test:
 production:
  secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22  
  sx_provision_url: connect.smartsales.asia/api #192.168.1.147:3002/api
-  server_mode: cloud
+  server_mode: application
  cipher_type: AES-256-CBC
  sx_key: Wh@t1$C2L