From b5743eb7a713b5c9afc27c50006f1b60ee8b6557 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 15 Jun 2017 18:18:35 +0630
Subject: [PATCH] update customer bolder

---
 .../transactions/sales_controller.rb          | 15 ++++++++++--
 app/models/sale_audit.rb                      | 23 ++++++++++++++-----
 app/views/crm/customers/show.html.erb         |  6 ++---
 app/views/transactions/sales/show.html.erb    |  2 +-
 config/routes.rb                              |  2 ++
 5 files changed, 36 insertions(+), 12 deletions(-)

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 @@
         </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">           
diff --git a/app/views/transactions/sales/show.html.erb b/app/views/transactions/sales/show.html.erb
index 7671e39c..b61f2312 100644
--- a/app/views/transactions/sales/show.html.erb
+++ b/app/views/transactions/sales/show.html.erb
@@ -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>
diff --git a/config/routes.rb b/config/routes.rb
index f1ad9961..fc21337a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -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