update customer bolder
This commit is contained in:
@@ -123,7 +123,6 @@ class Transactions::SalesController < ApplicationController
|
|||||||
end
|
end
|
||||||
|
|
||||||
def manual_void_sale
|
def manual_void_sale
|
||||||
|
|
||||||
sale_id = params[:sale_id]
|
sale_id = params[:sale_id]
|
||||||
reason = params[:reason]
|
reason = params[:reason]
|
||||||
sale = Sale.find(sale_id)
|
sale = Sale.find(sale_id)
|
||||||
@@ -135,9 +134,21 @@ class Transactions::SalesController < ApplicationController
|
|||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
format.html { redirect_to transactions_sales_url, notice: 'Sale was successfully void.' }
|
format.html { redirect_to transactions_sales_url, notice: 'Sale was successfully void.' }
|
||||||
end
|
end
|
||||||
|
|
||||||
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
|
private
|
||||||
# Use callbacks to share common setup or constraints between actions.
|
# Use callbacks to share common setup or constraints between actions.
|
||||||
def set_transactions_sale
|
def set_transactions_sale
|
||||||
|
|||||||
@@ -19,6 +19,17 @@ class SaleAudit < ApplicationRecord
|
|||||||
#sale_audit.
|
#sale_audit.
|
||||||
end
|
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)
|
def record_audit_discount(sale_id, discount_by, approved_by, reason)
|
||||||
#sale_audit
|
#sale_audit
|
||||||
sale_audit = SaleAudit.new()
|
sale_audit = SaleAudit.new()
|
||||||
|
|||||||
@@ -16,9 +16,9 @@
|
|||||||
</ul>
|
</ul>
|
||||||
<!-- Nav tabs - End -->
|
<!-- Nav tabs - End -->
|
||||||
|
|
||||||
<div class="tab-content" style="min-height:670px; max-height:670px; overflow-y:scroll">
|
<div class="tab-content">
|
||||||
|
|
||||||
<div class="tab-pane active" id="queue" role="tabpanel" style="min-height:670px; max-height:670px; overflow-y:">
|
<div class="tab-pane active" id="queue" role="tabpanel"">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-3"></div>
|
<div class="col-md-3"></div>
|
||||||
<div class="col-md-6">
|
<div class="col-md-6">
|
||||||
@@ -115,7 +115,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="tab-pane" id="customer" role="tabpanel" style="min-height:670px; max-height:670px; overflow-y:">
|
<div class="tab-pane" id="customer" role="tabpanel">
|
||||||
<h3>Sale Details</h3>
|
<h3>Sale Details</h3>
|
||||||
<div class="table-responsive">
|
<div class="table-responsive">
|
||||||
<table class="table table-striped">
|
<table class="table table-striped">
|
||||||
|
|||||||
@@ -238,7 +238,7 @@
|
|||||||
|
|
||||||
<i class="fa fa-trash fa-lg"></i> Void Sale
|
<i class="fa fa-trash fa-lg"></i> Void Sale
|
||||||
</a>
|
</a>
|
||||||
<!-- <a href="<%= %>" style="margin-top: 10px " class="btn btn-success pull-right btn-lg">
|
<!-- <a href="<%= transactions_manual_complete_sale_path(@sale)%>" style="margin-top: 10px " class="btn btn-success pull-right btn-lg">
|
||||||
<i class="fa fa-invoice fa-lg"></i> Complete Sale
|
<i class="fa fa-invoice fa-lg"></i> Complete Sale
|
||||||
</a> -->
|
</a> -->
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -198,6 +198,8 @@ Rails.application.routes.draw do
|
|||||||
namespace :transactions do
|
namespace :transactions do
|
||||||
resources :sales
|
resources :sales
|
||||||
resources :orders
|
resources :orders
|
||||||
|
|
||||||
|
get "/sales/:sale_id/manual_complete_sale" =>"sales#manual_complete_sale", :as => "manual_complete_sale"
|
||||||
get "/sales/:sale_id/void" =>"sales#void", :as => "void"
|
get "/sales/:sale_id/void" =>"sales#void", :as => "void"
|
||||||
post "sales/:sale_id/manual_void_sale", to: "sales#manual_void_sale", :as => "manual_void_sale"
|
post "sales/:sale_id/manual_void_sale", to: "sales#manual_void_sale", :as => "manual_void_sale"
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user