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

update cancan

Browse Source
This commit is contained in:
Aung Myo
2017-06-26 19:49:02 +06:30
parent 75dd4db10f
commit 0726af072e
3 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/reports/daily_sales_controller.rb
View File

@@ -1,5 +1,5 @@
class Reports::DailySalesController < BaseReportController class Reports::DailySalesController < BaseReportController
# authorize_resource :class => false authorize_resource :class => false
def index def index
from, to ,report_type = get_date_range_from_params from, to ,report_type = get_date_range_from_params
@sale_data = Sale.daily_sales_list(from,to) @sale_data = Sale.daily_sales_list(from,to)

2
app/controllers/reports/sale_items_controller.rb
View File

@@ -1,5 +1,5 @@
class Reports::SaleItemsController < BaseReportController class Reports::SaleItemsController < BaseReportController
# authorize_resource :class => false authorize_resource :class => false
def index def index
from, to, report_type = get_date_range_from_params from, to, report_type = get_date_range_from_params

27
app/models/ability.rb
View File

@@ -20,9 +20,9 @@ class Ability
can :manage, Zone can :manage, Zone
can :manage, CashierTerminal can :manage, CashierTerminal
can :manage, Employee can :manage, Employee
can :manage, MembershipSetting # can :manage, MembershipSetting
can :manage, MembershipAction # can :manage, MembershipAction
can :manage, PaymentMethodSetting # can :manage, PaymentMethodSetting
can :manage, TaxProfile can :manage, TaxProfile
can :manage, PrintSetting can :manage, PrintSetting
can :manage, Account can :manage, Account
@@ -30,9 +30,26 @@ class Ability
can :manage, Order can :manage, Order
can :manage, Sale can :manage, Sale
can :manage, Customer
can :index, :dailysale can :index, :dailysale
can :index, :saleitem can :index, :saleitem
can :add_customer, Customer
can :update_sale_by_customer, Customer
can :index, :discount
can :create, :discount
can :show, :payment
can :create, :payment
can :reprint, :payment
can :move_dining, :movetable
can :moving, :movetable
can :move_dining, :moveroom
elsif user.role == "cashier" elsif user.role == "cashier"
can :read, Order can :read, Order
@@ -56,6 +73,10 @@ class Ability
can :move_dining, :moveroom can :move_dining, :moveroom
can :index, :dailysale
can :index, :saleitem
elsif user.role == "accountant" elsif user.role == "accountant"
can :index, :dailysale can :index, :dailysale