From 4a0b88cfb92625e81f21427ce2dae5a195381ada Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 15 Feb 2018 10:42:02 +0630 Subject: [PATCH 1/5] update application for license --- app/controllers/application_controller.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index e66d7700..0966a573 100755 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -38,11 +38,11 @@ class ApplicationController < 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 From 35721cd9177b7244e0197e07b19df144a5781d9e Mon Sep 17 00:00:00 2001 From: San Wai Lwin Date: Thu, 15 Feb 2018 12:15:39 +0630 Subject: [PATCH 2/5] remove space line --- app/models/printer/cashier_station_printer.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/models/printer/cashier_station_printer.rb b/app/models/printer/cashier_station_printer.rb index e62ab4d1..3c6dac88 100755 --- a/app/models/printer/cashier_station_printer.rb +++ b/app/models/printer/cashier_station_printer.rb @@ -34,6 +34,4 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker pdf.render_file filename self.print(filename, cashier_terminal.printer_name) end - - end From 016d3f4187c91c5a9aaf94f8eda777f2dc2aa6f5 Mon Sep 17 00:00:00 2001 From: San Wai Lwin Date: Thu, 15 Feb 2018 13:29:52 +0630 Subject: [PATCH 3/5] sqa --- app/models/printer/cashier_station_printer.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/printer/cashier_station_printer.rb b/app/models/printer/cashier_station_printer.rb index 3c6dac88..dc0d79d1 100755 --- a/app/models/printer/cashier_station_printer.rb +++ b/app/models/printer/cashier_station_printer.rb @@ -34,4 +34,5 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker pdf.render_file filename self.print(filename, cashier_terminal.printer_name) end + #sqa end From 5b354299bbd5f84b61138c2a4380bfa3a52371ee Mon Sep 17 00:00:00 2001 From: Jueli Moon Aung Date: Fri, 16 Feb 2018 03:04:30 +0000 Subject: [PATCH 4/5] puma.rb.production edited by julian --- config/puma.rb.production | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/config/puma.rb.production b/config/puma.rb.production index 4953a9b0..e88031af 100755 --- a/config/puma.rb.production +++ b/config/puma.rb.production @@ -1,7 +1,6 @@ -application_path = '/home/superuser/Application/production/sxrestaurant' +application_path = '/home/superuser/Application/sxrestaurant' directory application_path -environment ENV.fetch("RAILS_ENV") { "development" } -daemonize true +environment ENV.fetch("RAILS_ENV") { "production" } pidfile "#{application_path}/tmp/puma/pid" state_path "#{application_path}/tmp/puma/state" stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log" From cf7da9f25ce629e8517393aeda859d0bacbba6f6 Mon Sep 17 00:00:00 2001 From: Jueli Moon Aung Date: Fri, 16 Feb 2018 03:05:10 +0000 Subject: [PATCH 5/5] secrets.yml edited online by julian --- config/secrets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/secrets.yml b/config/secrets.yml index a0220639..73e4fc37 100755 --- a/config/secrets.yml +++ b/config/secrets.yml @@ -24,7 +24,7 @@ test: # instead read values from the environment. production: secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22 - sx_provision_url: connect.smartsales.asia/api #192.168.1.147:3002/api + sx_provision_url: connect.smartsales.dev/api #192.168.1.147:3002/api server_mode: application cipher_type: AES-256-CBC sx_key: Wh@t1$C2L