diff --git a/app/controllers/api/order_reserve/order_reservation_controller.rb b/app/controllers/api/order_reserve/order_reservation_controller.rb
index aa157a2c..76300129 100644
--- a/app/controllers/api/order_reserve/order_reservation_controller.rb
+++ b/app/controllers/api/order_reserve/order_reservation_controller.rb
@@ -125,14 +125,14 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
 				end
 			elsif status == 'FOC'
 				if order_reservation.status == "new" || order_reservation.status == "accepted" || order_reservation.status == "send_to_kitchen"
-					OrderReservation.update_order_reservation(order_reservation_id, nil, nil,nil,reason)
+					OrderReservation.update_order_reservation(order_reservation_id, nil, 'foc',nil,reason, nil, current_login_employee)
 					result = {:status=> true, :message => "FOC successfully" }
 				else
 					result = {:status=> false, :message => "Status :: "+order_reservation.status+" cann't get FOC!" }
 				end
 			elsif status == 'VOID'
 				if order_reservation.status == "ready_to_delivery" || order_reservation.status == "delivered"
-					OrderReservation.update_order_reservation(order_reservation_id, nil, nil,nil,reason)
+					OrderReservation.update_order_reservation(order_reservation_id, nil, 'void',nil,reason, nil, current_login_employee)
 					result = {:status=> true, :message => "VOID successfully" }
 				else
 					result = {:status=> false, :message => "Status :: "+order_reservation.status+" cann't VOID!" }
diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb
index 3185671f..f269c91f 100644
--- a/app/models/order_reservation.rb
+++ b/app/models/order_reservation.rb
@@ -256,7 +256,12 @@ class OrderReservation < ApplicationRecord
     	end
     	if status == "delivered"
     		order_reservation.payment_status = "paid"
+    	elsif status == 'foc'
+    		order_reservation.payment_status = "paid"
+    	elsif status == 'void'
+    		order_reservation.payment_status = "void"
     	end
+
     	if status == "accepted"
     		action_times = {"accepted_time" => DateTime.now.utc, "kitchen_time" => "", "ready_time" => ""}
     		order_reservation.action_times = action_times.to_json
@@ -273,9 +278,10 @@ class OrderReservation < ApplicationRecord
     			order_reservation.action_times = action_data.to_json
     		end
     	end
+
     	order_reservation.save
 
-    	if !order_reservation.sale_id.nil? && status == "rejected"
+    	if !order_reservation.sale_id.nil? && (status == "rejected" || status == "void")
     		void_doemal_payment(order_reservation.sale_id, remark, access_code, current_user)
     	end
     end
@@ -303,7 +309,11 @@ class OrderReservation < ApplicationRecord
 	      sale.save
 
 	      # FOr Sale Audit 
-	      action_by = current_user.name
+	      if !current_user.nil?
+	      	action_by = current_user.name
+	      else
+	      	action_by = "code2LAB"
+	      end
 	      approved_by = Employee.find_by_emp_id(access_code)
 	      # remark = "Void Sale ID #{sale_id} | Receipt No #{sale.receipt_no} | Receipt No #{sale.receipt_no} | Table ->#{table.name}"
 	      sale_audit = SaleAudit.record_audit_for_edit(sale_id,sale.cashier_id, approved_by.name,remark,"SALEVOID" )