update authorize void and edit in cashier
This commit is contained in:
@@ -7,7 +7,7 @@ class BaseOrigamiController < ActionController::Base
|
|||||||
|
|
||||||
rescue_from CanCan::AccessDenied do |exception|
|
rescue_from CanCan::AccessDenied do |exception|
|
||||||
flash[:warning] = exception.message
|
flash[:warning] = exception.message
|
||||||
redirect_to root_path
|
redirect_to origami_root_path
|
||||||
end
|
end
|
||||||
|
|
||||||
def current_user
|
def current_user
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
class Origami::SaleEditController < BaseOrigamiController
|
class Origami::SaleEditController < BaseOrigamiController
|
||||||
|
authorize_resource :class => false
|
||||||
# Index for sale item void OR edit
|
# Index for sale item void OR edit
|
||||||
def edit
|
def edit
|
||||||
sale_id = params[:sale_id]
|
sale_id = params[:sale_id]
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
class Origami::VoidController < BaseOrigamiController
|
class Origami::VoidController < BaseOrigamiController
|
||||||
|
authorize_resource :class => false
|
||||||
def overall_void
|
def overall_void
|
||||||
|
|
||||||
sale_id = params[:sale_id]
|
sale_id = params[:sale_id]
|
||||||
|
|||||||
@@ -54,6 +54,14 @@ class Ability
|
|||||||
|
|
||||||
can :move_dining, :moveroom
|
can :move_dining, :moveroom
|
||||||
|
|
||||||
|
can :edit, :sale_edit
|
||||||
|
can :item_void, :sale_edit
|
||||||
|
can :item_void_cancel, :sale_edit
|
||||||
|
can :cancel_all_void, :sale_edit
|
||||||
|
can :apply_void, :sale_edit
|
||||||
|
|
||||||
|
can :overall_void, :void
|
||||||
|
|
||||||
elsif user.role == "cashier"
|
elsif user.role == "cashier"
|
||||||
|
|
||||||
can :read, Order
|
can :read, Order
|
||||||
|
|||||||
@@ -19,14 +19,14 @@
|
|||||||
<%= render 'layouts/header_orgiami' %>
|
<%= render 'layouts/header_orgiami' %>
|
||||||
<div class="container-fluid">
|
<div class="container-fluid">
|
||||||
<% flash.each do |type, message| %>
|
<% flash.each do |type, message| %>
|
||||||
<% if !flash["errors"]%>
|
<% if !flash["errors"]%>
|
||||||
<div class="alert fade in">
|
<div class="alert fade in">
|
||||||
<button class="close" aria-hidden="true" data-dismiss="alert" type="button">×</button>
|
<button class="close" aria-hidden="true" data-dismiss="alert" type="button">×</button>
|
||||||
<%=message%>
|
<%=message%>
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<% end %>
|
<% end %>
|
||||||
<%= yield %>
|
<%= yield %>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user