diff --git a/app/controllers/transactions/sales_controller.rb b/app/controllers/transactions/sales_controller.rb index f48478a6..8088e0a3 100644 --- a/app/controllers/transactions/sales_controller.rb +++ b/app/controllers/transactions/sales_controller.rb @@ -123,7 +123,6 @@ class Transactions::SalesController < ApplicationController end def manual_void_sale - sale_id = params[:sale_id] reason = params[:reason] sale = Sale.find(sale_id) @@ -135,9 +134,21 @@ class Transactions::SalesController < ApplicationController respond_to do |format| format.html { redirect_to transactions_sales_url, notice: 'Sale was successfully void.' } end - end + def manual_complete_sale + sale_id = params[:sale_id] + sale = Sale.find(sale_id) + sale.sale_status = 'completed' + sale.requested_by = current_login_employee.id + remark = remark = "Complete for Sale ID #{sale_id} By #{current_login_employee.name}" + if sale.save + sale = SaleAudit.record_audit_complete(sale_id, remark, current_login_employee.id) + end + redirect_to transactions_sales_path + end + + private # Use callbacks to share common setup or constraints between actions. def set_transactions_sale diff --git a/app/models/sale_audit.rb b/app/models/sale_audit.rb index d369b8e1..f8c38857 100644 --- a/app/models/sale_audit.rb +++ b/app/models/sale_audit.rb @@ -8,17 +8,28 @@ class SaleAudit < ApplicationRecord def self.record_audit_void(sale_id, void_by, approved_by, reason) #sale_audit - sale_audit = SaleAudit.new() - sale_audit.sale_id = sale_id - sale_audit.action = "SALEVOID" - sale_audit.action_at = DateTime.now.utc - sale_audit.action_by = void_by + sale_audit = SaleAudit.new() + sale_audit.sale_id = sale_id + sale_audit.action = "SALEVOID" + sale_audit.action_at = DateTime.now.utc + sale_audit.action_by = void_by sale_audit.approved_by = approved_by - sale_audit.remark = reason + sale_audit.remark = reason sale_audit.save! #sale_audit. end + def self.record_audit_complete(sale_id, remark, action_by) + sale_audit = SaleAudit.new() + sale_audit.sale_id = sale_id + sale_audit.action = "SALECOMPLETE" + sale_audit.action_at = DateTime.now.utc + sale_audit.action_by = action_by + sale_audit.remark = remark + sale_audit.approved_by = Time.now + sale_audit.save! + end + def record_audit_discount(sale_id, discount_by, approved_by, reason) #sale_audit sale_audit = SaleAudit.new() diff --git a/app/views/crm/customers/show.html.erb b/app/views/crm/customers/show.html.erb index b909a1c8..d806ec34 100644 --- a/app/views/crm/customers/show.html.erb +++ b/app/views/crm/customers/show.html.erb @@ -16,9 +16,9 @@ -