Merge branch 'r-1902001-01' into r-1902001-01-dev

config/database.yml.sample

@@ -1,83 +1,16 @@
-# ## SQLIte3 --- Setup
-#
-# # SQLite version 3.x
-# #   gem install sqlite3
-# #
-# #   Ensure the SQLite 3 gem is defined in your Gemfile
-# #   gem 'sqlite3'
-# #
-# default: &default
-#   adapter: sqlite3
-#   pool: 5
-#   timeout: 5000
-#
-# development:
-#   <<: *default
-#   database: db/development.sqlite3
-#
-# # Warning: The database defined as "test" will be erased and
-# # re-generated from your development database when you run "rake".
-# # Do not set this db to the same as development or production.
-# test:
-#   <<: *default
-#   database: db/test.sqlite3
-#
-# production:
-#   <<: *default
-#   database: db/production.sqlite3
-
-# Mysql --- Setup
-# MySQL. Versions 5.0 and up are supported.
-#
-# Install the MySQL driver
-#   gem install mysql2
-#
-# Ensure the MySQL gem is defined in your Gemfile
-#   gem 'mysql2'
-#
-# And be sure to use new-style password hashing:
-#   http://dev.mysql.com/doc/refman/5.7/en/old-client.html
-#
 default: &default
-  adapter: mysql2
-  encoding: utf8
-  pool: 5
-  username: root
-  password:
-  socket: /tmp/mysql.sock
+ adapter: postgresql
+ host: localhost
+ pool: 5
+ timeout: 5000
+ encoding: unicode
+ username: wunna
+ password: admin123
+ port: 5432
 
 development:
-  <<: *default
-  database: SXRestaurants_development
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
-  <<: *default
-  database: SXRestaurants_test
-
-# As with config/secrets.yml, you never want to store sensitive information,
-# like your database password, in your source code. If your source code is
-# ever seen by anyone, they now have access to your database.
-#
-# Instead, provide the password as a unix environment variable when you boot
-# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database
-# for a full rundown on how to provide these environment variables in a
-# production deployment.
-#
-# On Heroku and other platform providers, you may have a full connection URL
-# available as an environment variable. For example:
-#
-#   DATABASE_URL="mysql2://myuser:mypass@localhost/somedatabase"
-#
-# You can use this database configuration with:
-#
-#   production:
-#     url: <%= ENV['DATABASE_URL'] %>
-#
+ <<: *default
+ database: SXDatabase
 production:
-  <<: *default
-  database: SXRestaurants_production
-  username: SXRestaurants
-  password: <%= ENV['SXRESTAURANTS_DATABASE_PASSWORD'] %>
+ <<: *default
+ database: paymal

config/initializers/action_controller.rb

@@ -21,11 +21,11 @@ class ActionController::Base
       end
     else
       # check for license file
-       if check_license
-         current_license(ENV["SX_PROVISION_URL"])
-       else
-         redirect_to activate_path
-       end
+      if check_license
+        current_license(ENV["SX_PROVISION_URL"])
+      else
+        redirect_to activate_path
+      end
     end
 
   end

config/secrets.yml

@@ -11,21 +11,20 @@
 # if you're sharing your code publicly.
 
 development:
-  secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61  
-  sx_provision_url: connect.smartsales.asia/api #connect.smartsales.dev/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
-  server_mode: application
-  cipher_type: AES-256-CBC
-  sx_key: Wh@t1$C2L
+ secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61  
+ sx_provision_url: connect.smartsales.asia/api #connect.smartsales.dev/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
+ server_mode: application
+ cipher_type: AES-256-CBC
+ sx_key: Wh@t1$C2L
 
 test:
-  secret_key_base: 5c92143fd4a844fdaf8b22aba0cda22ef1fc68f1b26dd3d40656866893718ae5e58625b4c3a5dc86b04c8be0a505ec0ebc0be3bf52249a3d1e0c1334ee591cf0
+ secret_key_base: 5c92143fd4a844fdaf8b22aba0cda22ef1fc68f1b26dd3d40656866893718ae5e58625b4c3a5dc86b04c8be0a505ec0ebc0be3bf52249a3d1e0c1334ee591cf0
 
 # Do not keep production secrets in the repository,
 # instead read values from the environment.
 production:
-  secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22  
-  sx_provision_url: connect.smartsales.asia/api #192.168.1.147:3002/api
-  server_mode: application
-  cipher_type: AES-256-CBC
-  sx_key: Wh@t1$C2L
-
+ secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22  
+ sx_provision_url: connect.smartsales.asia/api #192.168.1.147:3002/api
+ server_mode: application
+ cipher_type: AES-256-CBC
+ sx_key: Wh@t1$C2L