From 972a7173619a8298c7748a985447595288053168 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Sun, 2 Jul 2017 10:04:06 +0630
Subject: [PATCH] update payper and redeem

---
 app/models/sale_payment.rb  |  4 ++--
 app/pdf/receipt_bill_pdf.rb | 32 +++++++++++++++++---------------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 59cee9a6..5424e3d5 100644
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -223,7 +223,7 @@ class SalePayment < ApplicationRecord
     membership_data = SalePayment.redeem(membership_setting.gateway_url,membership_setting.auth_token,customer_data.membership_id,self.received_amount,self.sale.sale_id)
 
     if membership_data["status"]==true
-      self.payment_method = "paypar"
+      self.payment_method = "redeem"
       self.payment_amount = self.received_amount
       self.payment_reference  = self.voucher_no
       self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f
@@ -307,7 +307,7 @@ class SalePayment < ApplicationRecord
       paypar = sObj.sale_payments
       payparcost = 0
       paypar.each do |pp|
-        if pp.payment_method == "paypar"
+        if pp.payment_method == "redeem"
           payparcost = payparcost + pp.payment_amount
         end
       end
diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb
index 60e1203c..a2f3827b 100644
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -265,32 +265,34 @@ class ReceiptBillPdf < Prawn::Document
                 rebate = 0
                 rebate_amount["data"].each do |res|
 
-                    if res["receipt_no"]== sale_data.receipt_no && res["status"]== "Rebate"
-
-                        rebate = rebate + res["rebate"]
-                        
-                    end  
                     if res["receipt_no"]== sale_data.receipt_no && res["status"]== "Redeem"
 
                         move_down 5
                          y_position = cursor
                         bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
-                            text "Current Redeem Amount", :size => self.item_font_size,:align => :left
+                            text "Redeem Amount", :size => self.item_font_size,:align => :left
                         end
                         bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
                             text "#{number_with_precision(res["redeem"], :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
                         end
                     end
 
+                    if res["receipt_no"]== sale_data.receipt_no && res["status"]== "Rebate"
+
+                        rebate = rebate + res["rebate"]
+
+                        move_down 5
+                        y_position = cursor
+                        bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
+                            text "Rebate Earn", :size => self.item_font_size,:align => :left
+                        end
+                        bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
+                            text "#{number_with_precision(res["rebate"], :precision => precision.to_i, :delimiter => delimiter)}"  , :size => self.item_font_size,:align => :right
+                        end
+                        
+                    end  
                 end
-                move_down 5
-                y_position = cursor
-                bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
-                    text "Current Rebate Amount", :size => self.item_font_size,:align => :left
-                end
-                bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
-                    text "#{number_with_precision(rebate, :precision => precision.to_i, :delimiter => delimiter)}"  , :size => self.item_font_size,:align => :right
-                end
+                
             end
         end
         if member_info["status"] == true && member_info["data"].present?
@@ -306,7 +308,7 @@ class ReceiptBillPdf < Prawn::Document
             move_down 5
             y_position = cursor
             bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
-                 text "Current Balance", :size => self.item_font_size,:align => :left
+                 text "Total Balance", :size => self.item_font_size,:align => :left
             end
              bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
                   text "#{number_with_precision(balance, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right