merge with master

This commit is contained in:
Yan
2017-12-15 10:36:43 +06:30
30 changed files with 218 additions and 99 deletions

View File

@@ -86,6 +86,6 @@ Rails.application.configure do
config.active_record.dump_schema_after_migration = false
# Action Cable Setup
config.action_cable.url = "ws://192.168.1.24:9292/cable"
# config.action_cable.url = "ws://192.168.1.24:9292/cable"
config.action_cable.allowed_request_origins = [/http:\/\/*/, /https:\/\/*/]
end

View File

@@ -10,3 +10,7 @@ dbusername: LapN+Geriht8yk866FxNiQ==
dbpassword: QtboWZ4ATE05vvYw6J+Uqw==
api_token: nGyMizHtoVEFYCjSVEFJuzkxuBJwSsH
app_token: QUdPwSakcsnuVLdfkXgGHhPMiIOcSSfaVwQyA
plan_sku: 001
renewable_date: 2018-12-14
plan_name: Community

View File

@@ -10,3 +10,6 @@ every 30.minutes do
runner "Customer.update_membership"
end
every 1.minutes do
runner "CheckinJob.perform"
end