From 4098c99509a8327ecafb0714901dfac67263d23e Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 15 Jun 2017 17:13:11 +0630 Subject: [PATCH 1/3] update membership in sale detail --- .../transactions/sales_controller.rb | 12 +++ app/views/transactions/sales/show.html.erb | 78 ++++++++++++++++--- app/views/transactions/sales/void.html.erb | 2 - 3 files changed, 81 insertions(+), 11 deletions(-) diff --git a/app/controllers/transactions/sales_controller.rb b/app/controllers/transactions/sales_controller.rb index c4666c5e..f48478a6 100644 --- a/app/controllers/transactions/sales_controller.rb +++ b/app/controllers/transactions/sales_controller.rb @@ -50,6 +50,18 @@ class Transactions::SalesController < ApplicationController end @sale_receivables = SalePayment.where('sale_id = ?', @sale.id) + + #get customer amount + @customer = Customer.find(@sale.customer_id) + response = Customer.get_member_account(@customer) + + if(response["status"] == true) + @membership = response["data"] + else + @membership = 0 + end + #end customer amount + respond_to do |format| format.html # show.html.erb format.json { render json: @sale } diff --git a/app/views/transactions/sales/show.html.erb b/app/views/transactions/sales/show.html.erb index 6fc4dd03..29ecdc6f 100644 --- a/app/views/transactions/sales/show.html.erb +++ b/app/views/transactions/sales/show.html.erb @@ -21,11 +21,11 @@ Sale Details
  • - Orders + Orders Details +
    • +
  • + Customer Details
    • - @@ -124,6 +124,9 @@
    + + + @@ -154,11 +157,68 @@ -
    -

    Sale Details

    -
    +
    -
    +
    +
     
    Order ID Menu Item
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <% if @membership == 0 %> + + + + <% else %> + <% @membership.each do |member| %> + + + + + + <% end %> + + <% end %> + + + + + +

    Customer Detail

    Name<%= @customer.name %>
    Email<%= @customer.email %>
    Contact no<%= @customer.contact_no %>
    Company<%= @customer.company rescue '-' %>
    Date Of Birth<%= @customer.date_of_birth rescue '-' %>

    Membership Details

    "There is no membership data"
    <%= member["accountable_type"] %><%= member["balance"] %>
    +
    @@ -175,7 +235,7 @@ Void Sale - diff --git a/app/views/transactions/sales/void.html.erb b/app/views/transactions/sales/void.html.erb index 9d18cca1..0bcd6db6 100644 --- a/app/views/transactions/sales/void.html.erb +++ b/app/views/transactions/sales/void.html.erb @@ -60,8 +60,6 @@ var reason = $('input[type="radio"]:checked').val(); console.log(reason) - - var url = 'manual_void_sale';alert(url) var sale_id = $(this).find(".customer-id").text(); $.ajax({ type: 'POST', From 744e937f3d0a643c30f70ae0cda7644fa16923c9 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 15 Jun 2017 17:19:28 +0630 Subject: [PATCH 2/3] update sale detail --- app/views/transactions/sales/show.html.erb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/views/transactions/sales/show.html.erb b/app/views/transactions/sales/show.html.erb index 29ecdc6f..7671e39c 100644 --- a/app/views/transactions/sales/show.html.erb +++ b/app/views/transactions/sales/show.html.erb @@ -6,7 +6,7 @@ Sale
  • - <%= @sale.sale_id %> + <%= @sale.sale_id %>
    • @@ -164,7 +164,10 @@ -

    Customer Detail

    + + + +

    Customer Details

    From b5743eb7a713b5c9afc27c50006f1b60ee8b6557 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 15 Jun 2017 18:18:35 +0630 Subject: [PATCH 3/3] 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 @@ -
    +
    -
    +
    @@ -115,7 +115,7 @@
    -
    +

    Sale Details

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