From 1895936f38812cd0ee6b91f8b2b1ca1da9c3881b Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 20 Jul 2018 17:26:15 +0630
Subject: [PATCH] add other charges amt for void Transactions

---
 app/controllers/transactions/sales_controller.rb | 5 +++--
 app/views/transactions/sales/show.html.erb       | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/controllers/transactions/sales_controller.rb b/app/controllers/transactions/sales_controller.rb
index 2a823888..7568a39a 100755
--- a/app/controllers/transactions/sales_controller.rb
+++ b/app/controllers/transactions/sales_controller.rb
@@ -345,7 +345,7 @@ class Transactions::SalesController < ApplicationController
         customer= Customer.find(sale.customer_id)
         
          #shop detail
-        shop_details = Shop.find(1)
+        shop_details = Shop.find_by_id(1)
          # get member information
         rebate = MembershipSetting.find_by_rebate(1)
         if customer.membership_id != nil && rebate
@@ -361,8 +361,9 @@ class Transactions::SalesController < ApplicationController
         item_price_by_accounts = SaleItem.calculate_price_by_accounts(sale.sale_items)
         discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(sale.sale_items)
 
+        other_amount = SaleItem.calculate_other_charges(sale.sale_items) #other charges
         printer = Printer::ReceiptPrinter.new(print_settings)                                    
-        filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings,cashier_terminal,sale.sale_items,sale,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "VOID",current_balance,nil)   
+        filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings,cashier_terminal,sale.sale_items,sale,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "VOID",current_balance,nil,other_amount)   
         result = { 
               :filepath => filename, 
               :printer_model => print_settings.brand_name, 
diff --git a/app/views/transactions/sales/show.html.erb b/app/views/transactions/sales/show.html.erb
index eeb17c6c..44b2f95f 100755
--- a/app/views/transactions/sales/show.html.erb
+++ b/app/views/transactions/sales/show.html.erb
@@ -281,7 +281,7 @@
         }, function (isConfirm) {
           if (isConfirm) {
             var sale_id = "<%= @sale.sale_id %>"
-            console.log(sale_id)
+            // console.log(sale_id)
             var ajax_url = "/transactions/sales/" + sale_id + '/cashier/void';
             var remark  = $("#remark").val();