Pull from master

2018-05-21 11:12:12 +06:30
parent 85625b7090
commit cfc672dc31
11 changed files with 129 additions and 110 deletions
--- a/app/controllers/origami/waste_spoile_controller.rb
+++ b/app/controllers/origami/waste_spoile_controller.rb
@@ -55,7 +55,7 @@ class Origami::WasteSpoileController < BaseOrigamiController

      # FOr Sale Audit 
      action_by = current_user.name
-      if access_code != "null"
+      if access_code != "null" && current_user.role == "cashier"
        action_by = Employee.find_by_emp_id(access_code).name
      end
      # remark = "Void Sale ID #{sale_id} | Receipt No #{sale.receipt_no} | Receipt No #{sale.receipt_no} | Table ->#{table.name}"