merge with r-19

2020-01-11 11:08:33 +06:30
parent d43266bd7d 2d57faf7cf
commit 314cc507a3
106 changed files with 2722 additions and 3024 deletions
--- a/app/controllers/api/api_controller.rb
+++ b/app/controllers/api/api_controller.rb
@@ -1,10 +1,9 @@
 class Api::ApiController < ActionController::API
-
-
  include MultiTenancy
  include TokenVerification
  include ActionController::MimeResponds
  include ActionView::Rendering
+  include Customers

  before_action :core_allow
  helper_method :current_token, :current_login_employee, :get_cashier