From 80f353ba3c0f99f05ba8ebc8d27d94a3e01ce4ec Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 10 May 2018 16:31:39 +0630
Subject: [PATCH] update void edit with access code

---
 app/controllers/origami/sale_edit_controller.rb | 8 ++++----
 app/controllers/origami/void_controller.rb      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/origami/sale_edit_controller.rb b/app/controllers/origami/sale_edit_controller.rb
index f90858e3..0f27567a 100755
--- a/app/controllers/origami/sale_edit_controller.rb
+++ b/app/controllers/origami/sale_edit_controller.rb
@@ -52,7 +52,7 @@ class Origami::SaleEditController < BaseOrigamiController
     end
     # FOr Sale Audit 
       action_by = current_user.name
-      if access_code.present?
+      if access_code != "null"
         action_by = Employee.find_by_emp_id(access_code).name
       end
     remark = "Void Sale Item ID #{saleitemObj.sale_item_id} | Receipt No #{saleObj.receipt_no} | Item Name ->#{saleitemObj.product_name}-Product Code ->#{saleitemObj.product_code}-Instance Code ->#{saleitemObj.item_instance_code}"
@@ -88,7 +88,7 @@ class Origami::SaleEditController < BaseOrigamiController
     order = Order.find(order_id)
 
     action_by = current_user.name
-      if access_code.present?
+      if access_code != "null"
         action_by = Employee.find_by_emp_id(access_code).name
       end
     remark = "FOC Sale Item ID #{saleitemObj.sale_item_id} | Receipt No #{saleObj.receipt_no} | Item Name ->#{saleitemObj.product_name}-Product Code ->#{saleitemObj.product_code}-Instance Code ->#{saleitemObj.item_instance_code}Receipt No #{saleObj.receipt_no}"
@@ -132,7 +132,7 @@ class Origami::SaleEditController < BaseOrigamiController
     saleitemObj.taxable_price = update_qty.to_f * update_price.to_f
 
     action_by = current_user.name
-      if access_code.present?
+      if access_code != "null"
         action_by = Employee.find_by_emp_id(access_code).name
       end
     remark = "Update Qty #{update_qty} Price [#{saleitemObj.price}]| Receipt No #{sale.receipt_no} | Item Name ->#{saleitemObj.product_name}-Product Code ->#{saleitemObj.product_code}-Instance Code ->#{saleitemObj.item_instance_code}"
@@ -185,7 +185,7 @@ class Origami::SaleEditController < BaseOrigamiController
     order = Order.find(order_id)
 
     action_by = current_user.name
-      if access_code.present?
+      if access_code != "null"
         action_by = Employee.find_by_emp_id(access_code).name
       end
     remark = "Cancle Void Sale Item ID #{saleitemObj.sale_item_id} | Item Name ->#{saleitemObj.product_name}-Product Code ->#{saleitemObj.product_code}-Instance Code ->#{saleitemObj.item_instance_code}|Receipt No #{saleObj.receipt_no}"
diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb
index f8311cd3..5d9aa923 100755
--- a/app/controllers/origami/void_controller.rb
+++ b/app/controllers/origami/void_controller.rb
@@ -72,7 +72,7 @@ class Origami::VoidController < BaseOrigamiController
 
       # FOr Sale Audit 
       action_by = current_user.name
-      if access_code.present?
+      if access_code != "null"
         action_by = Employee.find_by_emp_id(access_code).name
       end