Pull from master

2018-04-19 10:49:25 +06:30
parent 70ec80a1d5
commit 0241d209ac
28 changed files with 529 additions and 220 deletions
--- a/app/controllers/api/api_controller.rb
+++ b/app/controllers/api/api_controller.rb
@@ -1,7 +1,7 @@
 class Api::ApiController < ActionController::API
  include TokenVerification

-  before_action :lookup_domain
+  # before_action :lookup_domain
  helper_method :current_token, :current_login_employee, :get_cashier

  private