From 9dba93ea9c1920964c1c171712a4e9f721102043 Mon Sep 17 00:00:00 2001 From: phyusin Date: Wed, 3 Oct 2018 10:22:50 +0630 Subject: [PATCH] change api update status func: --- .../order_reserve/order_reservation_controller.rb | 2 +- app/models/order_reservation.rb | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/controllers/api/order_reserve/order_reservation_controller.rb b/app/controllers/api/order_reserve/order_reservation_controller.rb index 76300129..6ebeda11 100644 --- a/app/controllers/api/order_reserve/order_reservation_controller.rb +++ b/app/controllers/api/order_reserve/order_reservation_controller.rb @@ -118,7 +118,7 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController if status == 'REMOVE' if order_reservation.status == "new" || order_reservation.status == "accepted" - OrderReservation.update_order_reservation(order_reservation_id, nil, "rejected",nil,remark) + OrderReservation.update_order_reservation(order_reservation_id, nil, "rejected",nil,remark, nil, current_login_employee) result = {:status=> true, :message => "rejected" } else result = {:status=> false, :message => "Status :: "+order_reservation.status+" cann't remove!" } diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb index f269c91f..bc7382c3 100644 --- a/app/models/order_reservation.rb +++ b/app/models/order_reservation.rb @@ -308,15 +308,22 @@ class OrderReservation < ApplicationRecord sale.sale_status = 'void' sale.save - # FOr Sale Audit + # For Sale Audit if !current_user.nil? action_by = current_user.name else - action_by = "code2LAB" + action_by = "doemal" end + + approved_name = nil approved_by = Employee.find_by_emp_id(access_code) + + if !approved_by.nil? + approved_name = approved_by.name + end + cashier_name = Employee.where("id=?",sale.cashier_id).name # 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" ) + sale_audit = SaleAudit.record_audit_for_edit(sale_id,cashier_name, approved_name,remark,"SALEVOID" ) # update complete order items in oqs SaleOrder.where("sale_id = '#{ sale_id }'").find_each do |sodr|