Merge branch 'r-1902001-01' into foodcourt

2020-09-10 10:31:07 +06:30
parent 7dfcff5af5 5e8f08315c
commit b730da7a75
184 changed files with 2672 additions and 1021 deletions
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -36,7 +36,7 @@ private
      crm_root_path
    elsif current_user.role == "account"
      reports_dailysale_index_path
-    elsif @current_user.role == "kitchen"
+    elsif current_user.role == "kitchen"
      oqs_root_path
    elsif @current_user.role == "foodcourt_cashier"
      #check if cashier has existing open cashier