From f497957a56bdfd0f31dac87027b118986638a29c Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 13 Dec 2017 13:18:53 +0630 Subject: [PATCH] update add subcategory in addorder --- app/assets/javascripts/addorder.js | 2 +- app/controllers/origami/payments_controller.rb | 3 ++- app/views/origami/addorders/detail.html.erb | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index 0439efcb..aa84b398 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -949,7 +949,7 @@ $(function() { $(sub_category).removeClass('hidden'); for(var i in data) { - row = '' ; $(sub_category).append(row); diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index 4225b3dd..bd499ee0 100755 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -31,6 +31,7 @@ class Origami::PaymentsController < BaseOrigamiController rebate = MembershipSetting.find_by_rebate(1) if customer.membership_id != nil && rebate member_info = Customer.get_member_account(customer) + current_balance = SaleAudit.paymal_search(sale_id) end # get printer info print_settings=PrintSetting.find_by_unique_code(unique_code) @@ -44,7 +45,7 @@ class Origami::PaymentsController < BaseOrigamiController printer = Printer::ReceiptPrinter.new(print_settings) - printer.print_receipt_bill(print_settings,cashier_terminal,sale_items,sale_data,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, shop_details, "Frt") + printer.print_receipt_bill(print_settings,cashier_terminal,sale_items,sale_data,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, shop_details, "Frt",current_balance) end def create diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index 25c1e1cc..d8909915 100755 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -12,7 +12,7 @@