Merge branch 'r-1902001-01' of gitlab.com:code2lab/SXRestaurant into r-1902001-01
This commit is contained in:
BIN
config/.database.yml.swp
Normal file
BIN
config/.database.yml.swp
Normal file
Binary file not shown.
@@ -4,4 +4,4 @@ redis: &redis
|
||||
|
||||
production: *redis
|
||||
development: *redis
|
||||
test: *redis
|
||||
test: *redis
|
||||
|
||||
@@ -3,6 +3,4 @@ if File.exist?("config/license.yml")
|
||||
config.fetch(Rails.env, {}).each do |key, value|
|
||||
ENV[key.upcase] = value.to_s
|
||||
end
|
||||
else
|
||||
ENV["SERVER_MODE"] = "cloud"
|
||||
end
|
||||
|
||||
@@ -10,4 +10,4 @@ test:
|
||||
|
||||
production:
|
||||
<<: *default
|
||||
url: redis://127.0.0.1:6379
|
||||
url: redis://127.0.0.1:6379
|
||||
|
||||
@@ -117,6 +117,14 @@ scope "(:locale)", locale: /en|mm/ do
|
||||
|
||||
#API for sync cloud
|
||||
post 'sync_data' => 'sync#sync_data'
|
||||
|
||||
namespace :loader_service do
|
||||
post "get_sale_data" => "load_data#get_sale_data_rage"
|
||||
post "get_detail_sale_data" => "load_data#get_detail_sale_data"
|
||||
post "get_tender_sale_data" => "load_data#get_tender_sale_data"
|
||||
post "get_daily_sale_data" => "load_data#get_daily_sale_data"
|
||||
post "get_check_sale_data" => "load_data#get_check_sale_data"
|
||||
end
|
||||
end
|
||||
|
||||
#--------- Cashier ------------#
|
||||
@@ -524,6 +532,7 @@ scope "(:locale)", locale: /en|mm/ do
|
||||
resources :dailysale, :only => [:index, :show]
|
||||
resources :saleitem, :only => [:index, :show]
|
||||
resources :hourly_saleitem, :only => [:index, :show]
|
||||
resources :staff_meal, :only => [:index, :show]
|
||||
resources :shiftsale, :only => [:index, :show]
|
||||
resources :credit_payment, :only => [:index, :show]
|
||||
resources :void_sale, :only => [:index, :show]
|
||||
|
||||
@@ -11,8 +11,8 @@
|
||||
# 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
|
||||
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
|
||||
@@ -23,8 +23,8 @@ test:
|
||||
# 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
|
||||
secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22
|
||||
sx_provision_url: connect.smartsales.asia/api #52.221.188.144:9292/api #192.168.1.147:3002/api
|
||||
server_mode: application
|
||||
cipher_type: AES-256-CBC
|
||||
sx_key: Wh@t1$C2L
|
||||
|
||||
1022
config/shops.json
1022
config/shops.json
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user