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

merge with master

Browse Source
This commit is contained in:
Yan
2018-05-03 17:57:49 +06:30
parent b0377afb8f 9e54aa1a27
commit 57b9c44349
68 changed files with 2511 additions and 1112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/routes.rb
View File

@@ -100,6 +100,7 @@ scope "(:locale)", locale: /en|mm/ do
get "quick_service/pending_order" => "pending_order#index"
get "quick_service/pending_order/:sale_id" => "pending_order#show"
get "quick_service/completed_sale/:sale_id" => "pending_order#completed_sale"
get "quick_service/modify_order/:id/:sale_id" => "quick_service#modify_order"
get "quick_service/modify_order/:sale_id" => "quick_service#modify_order"
@@ -436,6 +437,7 @@ scope "(:locale)", locale: /en|mm/ do
resources :stock_check, :only => [:index, :show]
resources :payment_method
resources :product_sale, :only => [:index, :show]
resources :order_reservation, :only => [:index, :show]
get "saleitem/get_shift_by_date", to: "saleitem#show", as: "get_shift_by_sale_item"
get "receipt_no/get_shift_by_date", to: "receipt_no#get_shift_by_date", as: "get_shift_by_date"

12
config/schedule.rb
View File

@@ -12,4 +12,16 @@ end
every 1.minutes do
runner "DiningFacility.checkin_time"
end
every 3.minutes do
runner "OrderReservation.check_new_order"
end
every 5.minutes do
runner "OrderReservation.check_order_send_to_kitchen"
end
every 5.minutes do
runner "OrderReservation.check_order_ready_to_delivery"
end

4
config/secrets.yml
View File

@@ -12,7 +12,7 @@
development:
secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61
sx_provision_url: https://connect.pos-myanmar.com/bensai/api #connect.smartsales.dev/api #connect.smartsales.asia/api #provision.zsai.ws/api
sx_provision_url: connect.pos-myanmar.com/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
@@ -24,7 +24,7 @@ test:
# instead read values from the environment.
production:
secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22
sx_provision_url: https://connect.pos-myanmar.com/api #192.168.1.147:3002/api
sx_provision_url: connect.pos-myanmar.com/api #192.168.1.147:3002/api
server_mode: application
cipher_type: AES-256-CBC
sx_key: Wh@t1$C2L