From 4552a4a9acec353a55bf522826d84e91cface31f Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Wed, 21 Feb 2018 16:42:19 +0630
Subject: [PATCH] license update, base controllers extends app controller

---
 app/controllers/base_crm_controller.rb       | 3 +--
 app/controllers/base_inventory_controller.rb | 3 +--
 app/controllers/base_oqs_controller.rb       | 3 +--
 app/controllers/base_origami_controller.rb   | 3 +--
 app/controllers/base_report_controller.rb    | 3 +--
 app/controllers/base_waiter_controller.rb    | 5 +----
 6 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/app/controllers/base_crm_controller.rb b/app/controllers/base_crm_controller.rb
index ff44bbbf..5c412fcf 100755
--- a/app/controllers/base_crm_controller.rb
+++ b/app/controllers/base_crm_controller.rb
@@ -1,5 +1,4 @@
-class BaseCrmController < ActionController::Base
-	include LicenseVerification
+class BaseCrmController < ApplicationController
 	layout "CRM"
 
   #before_action :check_installation
diff --git a/app/controllers/base_inventory_controller.rb b/app/controllers/base_inventory_controller.rb
index 0ef47129..f44747d3 100755
--- a/app/controllers/base_inventory_controller.rb
+++ b/app/controllers/base_inventory_controller.rb
@@ -1,5 +1,4 @@
-class BaseInventoryController < ActionController::Base
-	include LicenseVerification
+class BaseInventoryController < ApplicationController
 	layout "inventory"
 
   #before_action :check_installation
diff --git a/app/controllers/base_oqs_controller.rb b/app/controllers/base_oqs_controller.rb
index 4fc58402..f1f2831a 100755
--- a/app/controllers/base_oqs_controller.rb
+++ b/app/controllers/base_oqs_controller.rb
@@ -1,5 +1,4 @@
-class BaseOqsController < ActionController::Base
-  include LicenseVerification
+class BaseOqsController < ApplicationController
   layout "OQS"
 
   #before_action :check_installation
diff --git a/app/controllers/base_origami_controller.rb b/app/controllers/base_origami_controller.rb
index 318c40f2..58d9b801 100755
--- a/app/controllers/base_origami_controller.rb
+++ b/app/controllers/base_origami_controller.rb
@@ -1,5 +1,4 @@
-class BaseOrigamiController < ActionController::Base
-  include LicenseVerification
+class BaseOrigamiController < ApplicationController
   layout "origami"
 
   # before_action :checkin_process
diff --git a/app/controllers/base_report_controller.rb b/app/controllers/base_report_controller.rb
index a164c499..f7551f22 100755
--- a/app/controllers/base_report_controller.rb
+++ b/app/controllers/base_report_controller.rb
@@ -1,5 +1,4 @@
-class BaseReportController < ActionController::Base
-	include LicenseVerification
+class BaseReportController < ApplicationController
 	layout "application" 
 
 	#before_action :check_installation
diff --git a/app/controllers/base_waiter_controller.rb b/app/controllers/base_waiter_controller.rb
index 38749af0..248e32a6 100755
--- a/app/controllers/base_waiter_controller.rb
+++ b/app/controllers/base_waiter_controller.rb
@@ -1,9 +1,6 @@
-class BaseWaiterController < ActionController::Base
-  include LicenseVerification
+class BaseWaiterController < ApplicationController  
   layout "waiter"
 
   #before_action :check_installation
   protect_from_forgery with: :exception
-
-
 end