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

queue acess on cashier and shiftclose to logout

Browse Source
This commit is contained in:
Aung Myo
2017-07-11 16:20:30 +06:30
parent b1b9b5a93f
commit d840b08db2
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/crm/home_controller.rb
View File

@@ -1,12 +1,12 @@
class Crm::HomeController < BaseCrmController class Crm::HomeController < BaseCrmController
def index def index
# @booking = Booking.all @booking = Booking.all
# @customer = Customer.all @customer = Customer.all
# from = Time.now.beginning_of_day.utc from = Time.now.beginning_of_day.utc
# to = Time.now.end_of_day.utc to = Time.now.end_of_day.utc
# @queue = DiningQueue.where('created_at BETWEEN ? AND ?', from, to).order('queue_no ASC') @queue = DiningQueue.where('created_at BETWEEN ? AND ?', from, to).order('queue_no ASC')
redirect_to crm_customers_path # redirect_to crm_customers_path
# .where("dining_facilities.is_active=? and orders.date between ? and ?",true,from,to) # .where("dining_facilities.is_active=? and orders.date between ? and ?",true,from,to)
end end

4
app/controllers/origami/shifts_controller.rb
View File

@@ -39,8 +39,12 @@ class Origami::ShiftsController < BaseOrigamiController
printer.print_close_cashier(print_settings,@shift,shop_details) printer.print_close_cashier(print_settings,@shift,shop_details)
end end
session[:session_token] = nil
redirect_to root_path
end end
def edit def edit

2
app/models/ability.rb
View File

@@ -101,6 +101,8 @@ class Ability
can :create, :payment can :create, :payment
can :reprint, :payment can :reprint, :payment
can :manage, DiningQueue
elsif user.role == "accountant" elsif user.role == "accountant"
can :index, :dailysale can :index, :dailysale