git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'r-1902001-01-dev' of gitlab.com:code2lab/SXRestaurant into r-1902001-01-dev

Browse Source
This commit is contained in:
Thein Lin Kyaw
2019-12-09 10:30:13 +06:30
parent dc1f464b7f 3b5b6c78f3
commit 67e7658e56
10 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/api/api_controller.rb
View File

@@ -1,4 +1,5 @@
class Api::ApiController < ActionController::API class Api::ApiController < ActionController::API
include MultiTenancy include MultiTenancy
include TokenVerification include TokenVerification
include ActionController::MimeResponds include ActionController::MimeResponds

3
app/controllers/base_controller.rb
View File

@@ -1,7 +1,6 @@
class BaseController < ActionController::Base class BaseController < ActionController::Base
include MultiTenancy include MultiTenancy
layout "installation" layout "installation"
protect_from_forgery with: :exception protect_from_forgery with: :exception
end end

2
app/controllers/base_crm_controller.rb
View File

@@ -1,7 +1,7 @@
class BaseCrmController < ActionController::Base class BaseCrmController < ActionController::Base
include MultiTenancy include MultiTenancy
include LoginVerification include LoginVerification
layout "CRM" layout "CRM"
before_action :check_user before_action :check_user

2
app/controllers/base_inventory_controller.rb
View File

@@ -1,7 +1,7 @@
class BaseInventoryController < ActionController::Base class BaseInventoryController < ActionController::Base
include MultiTenancy include MultiTenancy
include LoginVerification include LoginVerification
layout "inventory" layout "inventory"
before_action :check_user before_action :check_user

3
app/controllers/base_oqs_controller.rb
View File

@@ -1,7 +1,8 @@
class BaseOqsController < ActionController::Base class BaseOqsController < ActionController::Base
include MultiTenancy include MultiTenancy
include LoginVerification include LoginVerification
layout "OQS" layout "OQS"
before_action :check_user before_action :check_user

2
app/controllers/base_origami_controller.rb
View File

@@ -1,7 +1,7 @@
class BaseOrigamiController < ActionController::Base class BaseOrigamiController < ActionController::Base
include MultiTenancy include MultiTenancy
include LoginVerification include LoginVerification
layout "origami" layout "origami"
before_action :check_user before_action :check_user

2
app/controllers/base_report_controller.rb
View File

@@ -1,7 +1,7 @@
class BaseReportController < ActionController::Base class BaseReportController < ActionController::Base
include MultiTenancy include MultiTenancy
include LoginVerification include LoginVerification
layout "application" layout "application"
before_action :check_user before_action :check_user

2
app/controllers/base_waiter_controller.rb
View File

@@ -1,7 +1,7 @@
class BaseWaiterController < ActionController::Base class BaseWaiterController < ActionController::Base
include MultiTenancy include MultiTenancy
include LoginVerification include LoginVerification
layout "waiter" layout "waiter"
before_action :check_user before_action :check_user

1
app/controllers/concerns/multi_tenancy.rb
View File

@@ -4,6 +4,7 @@ module MultiTenancy
included do included do
set_current_tenant_through_filter if respond_to? :set_current_tenant_through_filter set_current_tenant_through_filter if respond_to? :set_current_tenant_through_filter
before_action :find_shop_by_subdomain_or_frist if respond_to? :before_action before_action :find_shop_by_subdomain_or_frist if respond_to? :before_action
helper_method :current_shop if respond_to? :helper_method
end end
private private

1
app/controllers/origami/home_controller.rb
View File

@@ -4,6 +4,7 @@ class Origami::HomeController < BaseOrigamiController
def index def index
@webview = check_mobile @webview = check_mobile
@tables = Table.unscope(:order).includes(:zone).all.active.order('status desc') @tables = Table.unscope(:order).includes(:zone).all.active.order('status desc')
@rooms = Room.unscope(:order).includes(:zone).all.active.order('status desc') @rooms = Room.unscope(:order).includes(:zone).all.active.order('status desc')
@complete = Sale.completed_sale("cashier") @complete = Sale.completed_sale("cashier")