From 3ddd4121dba25083fd439c488d22684ff1a53284 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 30 Nov 2017 17:24:15 +0630
Subject: [PATCH] update payment report

---
 .../reports/payment_method_controller.rb           |  2 +-
 .../settings/menu_item_instances_controller.rb     |  2 --
 app/models/sale.rb                                 |  5 +++--
 app/views/reports/payment_method/index.html.erb    | 14 +++++++++++---
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/controllers/reports/payment_method_controller.rb b/app/controllers/reports/payment_method_controller.rb
index 23c256d3..56c6c44c 100644
--- a/app/controllers/reports/payment_method_controller.rb
+++ b/app/controllers/reports/payment_method_controller.rb
@@ -21,7 +21,7 @@ class Reports::PaymentMethodController < BaseReportController
 	    end
 	    @payment_type = params[:payment_type]
         @sale_data,@pyament_method = Sale.get_payment_method_by_shift(@shift_sale_range,@shift,from,to,@payment_type) 
-       puts @pyament_method.to_json
+       puts @sale_data.to_json
        puts "sssssssssssss"
         @from       = from
         @to         = to
diff --git a/app/controllers/settings/menu_item_instances_controller.rb b/app/controllers/settings/menu_item_instances_controller.rb
index a214ffec..f63c09b7 100755
--- a/app/controllers/settings/menu_item_instances_controller.rb
+++ b/app/controllers/settings/menu_item_instances_controller.rb
@@ -26,8 +26,6 @@ class Settings::MenuItemInstancesController < ApplicationController
 
   def get_instance
     @id = MenuItemInstance.find(params[:id])
-    puts "iddddddddd"
-    puts @id.to_json
   end
 
   # GET /settings/menu_item_instances/1/edit
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 46f823d1..3bdaa8af 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -813,11 +813,12 @@ end
 
 def self.get_payment_method_by_shift(shift_sale_range,shift,from,to,payment_type)
     
-    sale_payment   = SalePayment.select("s.receipt_no, sale_payments.*,s.receipt_date as sale_date,
+    sale_payment   = SalePayment.select("s.amount_changed as change_amount,s.receipt_no, sale_payments.*,s.receipt_date as sale_date,
                                 s.cashier_name as cashier_name")
                       .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id")
+                      .order('s.receipt_no DESC')
 
-    payments_total = SalePayment.select("CAST((CONVERT_TZ(sales.receipt_date,'+00:00','+06:30')) AS DATE) as sale_date,
+    payments_total = SalePayment.select("sales.amount_changed as total_change_amount,CAST((CONVERT_TZ(sales.receipt_date,'+00:00','+06:30')) AS DATE) as sale_date,
                        SUM(case when (sale_payments.payment_method='mpu') then sale_payments.payment_amount else 0 end) as mpu_amount,
                        SUM(case when (sale_payments.payment_method='master') then sale_payments.payment_amount else 0 end) as master_amount,
                        SUM(case when (sale_payments.payment_method='visa') then sale_payments.payment_amount else 0 end) as visa_amount,
diff --git a/app/views/reports/payment_method/index.html.erb b/app/views/reports/payment_method/index.html.erb
index a4532457..c3be1bc3 100755
--- a/app/views/reports/payment_method/index.html.erb
+++ b/app/views/reports/payment_method/index.html.erb
@@ -82,7 +82,7 @@
 					    
 						<tr>
 							<th> <%= t("views.right_panel.detail.shift_name") %> </th>
-							<th> <%= t("views.right_panel.detail.payment_method") %></th>
+							<th><%= t("views.right_panel.detail.receipt_no") %></th>
 							<th> <%= t :cashier %> <%= t("views.right_panel.detail.name") %></th>
 							<th> <%= t :payment_method %></th>
 							<th> <%= t("views.right_panel.detail.amount") %> </th>
@@ -92,7 +92,11 @@
 					<tbody>
 					    <% total = 0 %>
 						<% @pyament_method.each do |payment| %>
-							<% total += payment.payment_amount + payment.outstanding_amount %>							
+							<% if payment.payment_method === 'cash'
+							total += payment.payment_amount - payment.change_amount
+						   else
+						   	total += payment.payment_amount  
+							end%>							
 							<tr> 
 								<% if @shift_from.nil? && @shift_to.nil? %>
 								<td><%= payment.sale_date.utc.getlocal.strftime("%e %b %I:%M%p")  rescue '-'%></td>
@@ -103,7 +107,11 @@
 								<td><%= payment.cashier_name rescue '-' %></td>
 								<!--<td><%= payment.sale.customer.name rescue '-' %></td>-->
 								<td><%= payment.payment_method rescue '-' %></td>
-								<td><%= payment.payment_amount + payment.outstanding_amount%> </td>
+								<% if payment.payment_method === 'cash' %>
+								<td><%= payment.payment_amount - payment.change_amount%> </td>
+								<%else%>
+								<td><%= payment.payment_amount%> </td>
+								<%end%>
 								<td><%= payment.sale.grand_total rescue '-' %></td>
 								
 							</tr>