diff --git a/README.md b/README.md index 18eaed7b..6aab5a8a 100755 --- a/README.md +++ b/README.md @@ -164,6 +164,9 @@ For CloseCashierCustomisePdf in lookups 3) settings/lookups => { type:tax_profiles, name: Doemal, value: doemal } /* Tax Profile Group Types in lookups */ +Add Kitchen Role of Employee + => 1) settings/lookups => { type:employee_roles, name: Kitchen, value:kitchen } + * ToDo list 1. Migration diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index d2b0ad36..e720444f 100755 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -70,6 +70,9 @@ class HomeController < ApplicationController elsif @employee.role == "account" session[:session_token] = @employee.token_session redirect_to reports_dailysale_index_path + elsif @employee.role == "kitchen" + session[:session_token] = @employee.token_session + redirect_to oqs_root_path else render :index end diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb index ccef4e4a..3da6c31e 100644 --- a/app/controllers/oqs/edit_controller.rb +++ b/app/controllers/oqs/edit_controller.rb @@ -1,4 +1,5 @@ class Oqs::EditController < BaseOqsController + authorize_resource :class => false def index assigned_item_id = params[:id] @link_type = params[:type] diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb index 19d4c17f..23d6341e 100755 --- a/app/controllers/oqs/home_controller.rb +++ b/app/controllers/oqs/home_controller.rb @@ -1,8 +1,6 @@ class Oqs::HomeController < BaseOqsController + authorize_resource :class => false def index - - - # Query for OQS with delivery status false # @queue_items_details = queue_items_query(false) diff --git a/app/controllers/oqs/print_controller.rb b/app/controllers/oqs/print_controller.rb index baa4af40..d4218666 100755 --- a/app/controllers/oqs/print_controller.rb +++ b/app/controllers/oqs/print_controller.rb @@ -1,4 +1,5 @@ class Oqs::PrintController < ApplicationController + authorize_resource :class => false # Print Order Item def print if ENV["SERVER_MODE"] != "cloud" #no print in cloud server diff --git a/app/models/ability.rb b/app/models/ability.rb index 0b1edcc3..801b501b 100755 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -98,6 +98,22 @@ class Ability can :create, :split_bill can :update_sale, :split_bill + #oqs Home + can :index, :home + can :index, :show + can :get_order_items, :home + can :get_items_by_oqs, :home + can :update_delivery_status, :home + can :queue_items_query, :home + can :completed_order, :home + can :queue_items_count_query, :home + + can :index, :edit + can :update, :edit + + can :print, :print + can :print_order_summary, :print + elsif user.role == "cashier" # can :overall_void, :void @@ -144,6 +160,22 @@ class Ability can :index, :split_bill can :create, :split_bill can :update_sale, :split_bill + + #oqs Home + can :index, :home + can :index, :show + can :get_order_items, :home + can :get_items_by_oqs, :home + can :update_delivery_status, :home + can :queue_items_query, :home + can :completed_order, :home + can :queue_items_count_query, :home + + can :index, :edit + can :update, :edit + + can :print, :print + can :print_order_summary, :print elsif user.role == "account" @@ -201,6 +233,23 @@ class Ability can :index, :split_bill can :create, :split_bill can :update_sale, :split_bill + + #oqs Home + can :index, :home + can :index, :show + can :get_order_items, :home + can :get_items_by_oqs, :home + can :update_delivery_status, :home + can :queue_items_query, :home + can :completed_order, :home + can :queue_items_count_query, :home + + can :index, :edit + can :update, :edit + + can :print, :print + can :print_order_summary, :print + elsif user.role == "waiter" can :index, :home can :show, :home @@ -227,6 +276,40 @@ class Ability #ability for split_bill can :index, :split_bill can :create, :split_bill + + #oqs Home + can :index, :home + can :index, :show + can :get_order_items, :home + can :get_items_by_oqs, :home + can :update_delivery_status, :home + can :queue_items_query, :home + can :completed_order, :home + can :queue_items_count_query, :home + + can :index, :edit + can :update, :edit + + can :print, :print + can :print_order_summary, :print + + elsif user.role == "kitchen" + + #oqs Home + can :index, :home + can :index, :show + can :get_order_items, :home + can :get_items_by_oqs, :home + can :update_delivery_status, :home + can :queue_items_query, :home + can :completed_order, :home + can :queue_items_count_query, :home + + can :index, :edit + can :update, :edit + + can :print, :print + can :print_order_summary, :print end end end