git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change fun:

Browse Source
This commit is contained in:
phyusin
2018-10-03 09:41:45 +06:30
parent 12ceb8220c
commit 6e555e6b8c
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/api/order_reserve/order_reservation_controller.rb
View File

@@ -125,14 +125,14 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
end end
elsif status == 'FOC' elsif status == 'FOC'
if order_reservation.status == "new" || order_reservation.status == "accepted" || order_reservation.status == "send_to_kitchen" 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" } result = {:status=> true, :message => "FOC successfully" }
else else
result = {:status=> false, :message => "Status :: "+order_reservation.status+" cann't get FOC!" } result = {:status=> false, :message => "Status :: "+order_reservation.status+" cann't get FOC!" }
end end
elsif status == 'VOID' elsif status == 'VOID'
if order_reservation.status == "ready_to_delivery" || order_reservation.status == "delivered" 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" } result = {:status=> true, :message => "VOID successfully" }
else else
result = {:status=> false, :message => "Status :: "+order_reservation.status+" cann't VOID!" } result = {:status=> false, :message => "Status :: "+order_reservation.status+" cann't VOID!" }

12
app/models/order_reservation.rb
View File

@@ -256,7 +256,12 @@ class OrderReservation < ApplicationRecord
end end
if status == "delivered" if status == "delivered"
order_reservation.payment_status = "paid" order_reservation.payment_status = "paid"
elsif status == 'foc'
order_reservation.payment_status = "paid"
elsif status == 'void'
order_reservation.payment_status = "void"
end end
if status == "accepted" if status == "accepted"
action_times = {"accepted_time" => DateTime.now.utc, "kitchen_time" => "", "ready_time" => ""} action_times = {"accepted_time" => DateTime.now.utc, "kitchen_time" => "", "ready_time" => ""}
order_reservation.action_times = action_times.to_json order_reservation.action_times = action_times.to_json
@@ -273,9 +278,10 @@ class OrderReservation < ApplicationRecord
order_reservation.action_times = action_data.to_json order_reservation.action_times = action_data.to_json
end end
end end
order_reservation.save 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) void_doemal_payment(order_reservation.sale_id, remark, access_code, current_user)
end end
end end
@@ -303,7 +309,11 @@ class OrderReservation < ApplicationRecord
sale.save sale.save
# FOr Sale Audit # FOr Sale Audit
if !current_user.nil?
action_by = current_user.name action_by = current_user.name
else
action_by = "code2LAB"
end
approved_by = Employee.find_by_emp_id(access_code) 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}" # 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,sale.cashier_id, approved_by.name,remark,"SALEVOID" )