Added missing field for bank charges in bank_trans, rewritten bank transaction views...

[fa-stable.git] / sales / view / view_receipt.php

diff --git a/sales/view/view_receipt.php b/sales/view/view_receipt.php
index 0a10d40eae364694d07675b49b9db59267f24a5a..18d1fa0086ae33b8424b4953b53f505707476ffc 100644 (file)
--- a/sales/view/view_receipt.php
+++ b/sales/view/view_receipt.php
@@ -18,7 +18,7 @@ include_once($path_to_root . "/includes/ui.inc");
 include_once($path_to_root . "/sales/includes/sales_db.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
        $js .= get_js_open_window(900, 600);
 
 page(_($help_context = "View Customer Payment"), true, false, "", $js);
@@ -33,22 +33,22 @@ $receipt = get_customer_trans($trans_id, ST_CUSTPAYMENT);
 display_heading(sprintf(_("Customer Payment #%d"),$trans_id));
 
 echo "<br>";
-start_table("$table_style width=80%");
+start_table(TABLESTYLE, "width='80%'");
+start_row();
+label_cells(_("Into Bank Account"), $receipt['bank_account_name'].' ['.$receipt['bank_curr_code'].']', "class='tableheader2'");
+label_cells(_("Bank Amount"), price_format($receipt['bank_amount']+$receipt['bank_charge']), "class='tableheader2'");
+label_cells(_("Bank Fee"), price_format(abs($receipt['bank_charge'])), "class='tableheader2'");
+end_row();
 start_row();
 label_cells(_("From Customer"), $receipt['DebtorName'], "class='tableheader2'");
-label_cells(_("Into Bank Account"), $receipt['bank_account_name'], "class='tableheader2'");
+label_cells(_("Reference"), $receipt['reference'], "class='tableheader2'");
 label_cells(_("Date of Deposit"), sql2date($receipt['tran_date']), "class='tableheader2'");
 end_row();
 start_row();
-label_cells(_("Payment Currency"), $receipt['curr_code'], "class='tableheader2'");
+label_cells(_("Customer Currency"), $receipt['curr_code'], "class='tableheader2'");
 label_cells(_("Amount"), price_format($receipt['Total'] - $receipt['ov_discount']), "class='tableheader2'");
 label_cells(_("Discount"), price_format($receipt['ov_discount']), "class='tableheader2'");
 end_row();
-start_row();
-label_cells(_("Payment Type"), 
-       $bank_transfer_types[$receipt['BankTransType']], "class='tableheader2'");
-label_cells(_("Reference"), $receipt['reference'], "class='tableheader2'", "colspan=4");
-end_row();
 comments_display_row(ST_CUSTPAYMENT, $trans_id);
 
 end_table(1);
@@ -61,4 +61,3 @@ if (!$voided)
 }
 
 end_page(true, false, false, ST_CUSTPAYMENT, $trans_id);
-?>
\ No newline at end of file