From 2d2a154c17a69f640524ab27b9453ae7b919456d Mon Sep 17 00:00:00 2001 From: phyusin Date: Thu, 11 Jan 2018 11:46:05 +0630 Subject: [PATCH] check multiple other payments in receipt --- app/assets/javascripts/origami.js | 2 +- .../origami/payments_controller.rb | 24 ++++++++++--------- app/models/sale.rb | 3 +-- app/pdf/receipt_bill_pdf.rb | 22 +++++++++-------- 4 files changed, 27 insertions(+), 24 deletions(-) diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js index 5bdbe861..64ff62ab 100755 --- a/app/assets/javascripts/origami.js +++ b/app/assets/javascripts/origami.js @@ -318,7 +318,7 @@ function resCBPay(resMsg,card_sale_trans_id,cmd_type,payment_type,bnk_bill_amoun closeOnCancel: false, allowOutsideClick: false }, function () { - window.location.href = '/origami/sale/'+ sale_id + "/payment/others_payment/MPU"; + window.location.href = '/origami/sale/'+ sale_id + "/payment/others_payment/"+payment_type.toUpperCase(); }); } } diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index 88577ac4..3c43ce0b 100755 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -123,14 +123,15 @@ class Origami::PaymentsController < BaseOrigamiController card_data = Array.new card_sale_trans_ref_no = Sale.getCardSaleTrans(sale_id) if !card_sale_trans_ref_no.nil? - card_res_date = card_sale_trans_ref_no.res_date.strftime("%Y-%m-%d").to_s - card_res_time = card_sale_trans_ref_no.res_time.strftime("%H:%M").to_s - card_no = card_sale_trans_ref_no.pan.last(4) + card_sale_trans_ref_no.each do |cash_sale_trans| + card_res_date = cash_sale_trans.res_date.strftime("%Y-%m-%d").to_s + card_res_time = cash_sale_trans.res_time.strftime("%H:%M").to_s + card_no = cash_sale_trans.pan.last(4) card_no = card_no.rjust(19,"**** **** **** ") - card_data.push({'res_date' => card_res_date, 'res_time' => card_res_time, 'batch_no' => card_sale_trans_ref_no.batch_no, 'trace' => card_sale_trans_ref_no.trace, 'pan' => card_no, 'app' => card_sale_trans_ref_no.app, 'tid' => card_sale_trans_ref_no.terminal_id, 'app_code' => card_sale_trans_ref_no.app_code, 'ref_no' => card_sale_trans_ref_no.ref_no, 'mid' => card_sale_trans_ref_no.merchant_id}) + card_data.push({'res_date' => card_res_date, 'res_time' => card_res_time, 'batch_no' => cash_sale_trans.batch_no, 'trace' => cash_sale_trans.trace, 'pan' => card_no, 'app' => cash_sale_trans.app, 'tid' => cash_sale_trans.terminal_id, 'app_code' => cash_sale_trans.app_code, 'ref_no' => cash_sale_trans.ref_no, 'mid' => cash_sale_trans.merchant_id}) + end end - puts "card_data" - puts card_data.to_json + # get printer info print_settings=PrintSetting.find_by_unique_code(unique_code) # Calculate Food and Beverage Total @@ -257,13 +258,14 @@ class Origami::PaymentsController < BaseOrigamiController card_data = Array.new card_sale_trans_ref_no = Sale.getCardSaleTrans(sale_id) if !card_sale_trans_ref_no.nil? - card_res_date = card_sale_trans_ref_no.res_date.strftime("%Y-%m-%d").to_s - card_res_time = card_sale_trans_ref_no.res_time.strftime("%H:%M").to_s - card_no = card_sale_trans_ref_no.pan.last(4) + card_sale_trans_ref_no.each do |cash_sale_trans| + card_res_date = cash_sale_trans.res_date.strftime("%Y-%m-%d").to_s + card_res_time = cash_sale_trans.res_time.strftime("%H:%M").to_s + card_no = cash_sale_trans.pan.last(4) card_no = card_no.rjust(19,"**** **** **** ") - card_data.push({'res_date' => card_res_date, 'res_time' => card_res_time, 'batch_no' => card_sale_trans_ref_no.batch_no, 'trace' => card_sale_trans_ref_no.trace, 'pan' => card_no, 'app' => card_sale_trans_ref_no.app, 'tid' => card_sale_trans_ref_no.terminal_id, 'app_code' => card_sale_trans_ref_no.app_code, 'ref_no' => card_sale_trans_ref_no.ref_no, 'mid' => card_sale_trans_ref_no.merchant_id}) + card_data.push({'res_date' => card_res_date, 'res_time' => card_res_time, 'batch_no' => cash_sale_trans.batch_no, 'trace' => cash_sale_trans.trace, 'pan' => card_no, 'app' => cash_sale_trans.app, 'tid' => cash_sale_trans.terminal_id, 'app_code' => cash_sale_trans.app_code, 'ref_no' => cash_sale_trans.ref_no, 'mid' => cash_sale_trans.merchant_id}) + end end - # get printer info print_settings=PrintSetting.find_by_unique_code(unique_code) diff --git a/app/models/sale.rb b/app/models/sale.rb index ee55159c..e0918d5f 100755 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -1129,8 +1129,7 @@ end def self.getCardSaleTrans(sale_id) query = Sale.select("cst.res_date,cst.res_time,cst.trace,cst.pan,cst.batch_no,cst.exp_date,cst.app,cst.res_type,cst.ref_no,cst.terminal_id,cst.merchant_id,cst.app_code") .joins("JOIN card_sale_trans as cst on cst.sale_id = sales.sale_id") - .where("sales.sale_id=?",sale_id) - .first() + .where("sales.sale_id=? and status = 'Approved'",sale_id) return query end diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index ab33d6e4..8c719825 100755 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -517,17 +517,19 @@ class ReceiptBillPdf < Prawn::Document move_down 5 y_position = cursor - if !card_data[0].nil? - if card_data[0]['app'] == 'CUP' - card_data[0]['app'] = 'UNIONPAY' - elsif card_data[0]['app'] == 'MASTERCARD' - card_data[0]['app'] = 'MASTER' + if !card_data.nil? + card_data.each do |data| + if data['app'] == 'CUP' + data['app'] = 'UNIONPAY' + elsif data['app'] == 'MASTERCARD' + data['app'] = 'MASTER' + end + text "DATE/TIME: #{data['res_date']} #{data['res_time']} ", :size => @item_font_size, :align => :left + text "BATCH NUM: #{data['batch_no']} TRACE#: #{data['trace']}",:size => @item_font_size, :align => :left + text "RREF NUM: #{data['ref_no']} APPR CODE: #{data['app_code']} ",:size => @item_font_size, :align => :left + text "TID: #{data['tid']} ",:size => @item_font_size, :align => :left + text "#{data['app']} #{data['pan']} ",:size => @item_font_size, :align => :left end - text "DATE/TIME: #{card_data[0]['res_date']} #{card_data[0]['res_time']} ", :size => @item_font_size, :align => :left - text "BATCH NUM: #{card_data[0]['batch_no']} TRACE#: #{card_data[0]['trace']}",:size => @item_font_size, :align => :left - text "RREF NUM: #{card_data[0]['ref_no']} APPR CODE: #{card_data[0]['app_code']} ",:size => @item_font_size, :align => :left - text "TID: #{card_data[0]['tid']} ",:size => @item_font_size, :align => :left - text "#{card_data[0]['app']} #{card_data[0]['pan']} ",:size => @item_font_size, :align => :left end end end