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

update customer bolder

Browse Source
This commit is contained in:
Aung Myo
2017-06-15 18:18:35 +06:30
parent 744e937f3d
commit b5743eb7a7
5 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/controllers/transactions/sales_controller.rb
View File

@@ -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

23
app/models/sale_audit.rb
View File

@@ -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()

6
app/views/crm/customers/show.html.erb
View File

@@ -16,9 +16,9 @@
</ul>
<!-- 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="col-md-3"></div>
<div class="col-md-6">
@@ -115,7 +115,7 @@
</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>
<div class="table-responsive">
<table class="table table-striped">

2
app/views/transactions/sales/show.html.erb
View File

@@ -238,7 +238,7 @@
<i class="fa fa-trash fa-lg"></i> Void Sale
</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
</a> -->
</div>

2
config/routes.rb
View File

@@ -198,6 +198,8 @@ Rails.application.routes.draw do
namespace :transactions do
resources :sales
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"
post "sales/:sale_id/manual_void_sale", to: "sales#manual_void_sale", :as => "manual_void_sale"
end