From 11bae95ac6c0c91f03e56d0af96d2c94156c93f0 Mon Sep 17 00:00:00 2001
From: San Wai Lwin <sanwailwin@code2lab.com>
Date: Mon, 14 May 2018 15:58:02 +0630
Subject: [PATCH] Edit Jcb and master in ShiftSale

---
 app/pdf/close_cashier_pdf.rb                     | 2 +-
 app/views/transactions/shift_sales/show.html.erb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/pdf/close_cashier_pdf.rb b/app/pdf/close_cashier_pdf.rb
index 8f971416..82203fb8 100755
--- a/app/pdf/close_cashier_pdf.rb
+++ b/app/pdf/close_cashier_pdf.rb
@@ -351,7 +351,7 @@ class CloseCashierPdf < Prawn::Document
 
         y_position = cursor
         bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do
-         text "Total Waste :", :size => self.item_font_size, :align => :right
+         text "Total Spoile :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
          text "(#{ number_with_precision(total_spoile, :precision => precision.to_i, :delimiter => delimiter)})", :size => self.item_font_size, :align => :right
diff --git a/app/views/transactions/shift_sales/show.html.erb b/app/views/transactions/shift_sales/show.html.erb
index 3b2b6c6d..77414ed0 100755
--- a/app/views/transactions/shift_sales/show.html.erb
+++ b/app/views/transactions/shift_sales/show.html.erb
@@ -150,13 +150,13 @@
                       <th></th>
                       <td style="text-align: right;">JCB Payment </td>
                       <td><%=other.master_amount.round(2) rescue 0.0 %></td>
-                      <% @total_amount = @total_amount+other.master_amount rescue 0.0 %>
+                      <% @total_amount = @total_amount+other.jcb_amount rescue 0.0 %>
                     </tr>
                     <tr>
                       <th></th>
                       <td style="text-align: right;">Master Payment </td>
                       <td><%=other.jcb_amount.round(2) rescue 0.0 %></td>
-                      <% @total_amount = @total_amount+other.jcb_amount rescue 0.0 %>
+                      <% @total_amount = @total_amount+other.master_amount rescue 0.0 %>
                     </tr>
                     <tr>
                       <th></th>