Code cleanup.

[fa-stable.git] / sales / customer_payments.php

diff --git a/sales/customer_payments.php b/sales/customer_payments.php
index cd48b65805823dd7e8ea64af78d564572616a742..ec98198dab9ff8de15d3e8f2d7a3e8fe2ac9ad6e 100644 (file)
--- a/sales/customer_payments.php
+++ b/sales/customer_payments.php
@@ -27,17 +27,28 @@ check_db_has_bank_accounts(_("There are no bank accounts defined in the system."
 check_db_has_bank_trans_types(_("There are no bank payment types defined in the system."));
 
 //----------------------------------------------------------------------------------------
+if ($ret = context_restore()) {
+       if(isset($ret['customer_id']))
+               $_POST['customer_id'] = $ret['customer_id'];
+       if(isset($ret['branch_id']))
+               $_POST['BranchID'] = $ret['branch_id'];
+}
+if (isset($_POST['_customer_id_editor'])) {
+       context_call($path_to_root.'/sales/manage/customers.php?debtor_no='.$_POST['customer_id'], 
+               array( 'customer_id', 'BranchID', 'bank_account', 'DateBanked', 
+                       'ReceiptType', 'ref', 'amount', 'discount', 'memo_') );
+}
 
 if (isset($_GET['AddedID'])) {
        $payment_no = $_GET['AddedID'];
 
        display_notification_centered(_("The customer payment has been successfully entered."));
 
-       display_note(get_gl_view_str(12, $payment_no, _("View the GL Journal Entries for this Customer Payment")));
+       display_note(get_gl_view_str(12, $payment_no, _("&View the GL Journal Entries for this Customer Payment")));
 
-       hyperlink_params($path_to_root . "/sales/allocations/customer_allocate.php", _("Allocate this Customer Payment"), "trans_no=$payment_no&trans_type=12");
+       hyperlink_params($path_to_root . "/sales/allocations/customer_allocate.php", _("&Allocate this Customer Payment"), "trans_no=$payment_no&trans_type=12");
 
-       hyperlink_no_params($path_to_root . "/sales/customer_payments.php", _("Enter Another Customer Payment"));
+       hyperlink_no_params($path_to_root . "/sales/customer_payments.php", _("Enter Another &Customer Payment"));
        br(1);
        end_page();
        exit;
@@ -49,38 +60,41 @@ function can_process()
 {
        if (!isset($_POST['DateBanked']) || !is_date($_POST['DateBanked'])) {
                display_error(_("The entered date is invalid. Please enter a valid date for the payment."));
+               set_focus('DateBanked');
                return false;
        } elseif (!is_date_in_fiscalyear($_POST['DateBanked'])) {
                display_error(_("The entered date is not in fiscal year."));
+               set_focus('DateBanked');
                return false;
        }
 
        if (!references::is_valid($_POST['ref'])) {
                display_error(_("You must enter a reference."));
+               set_focus('ref');
                return false;
        }
 
        if (!is_new_reference($_POST['ref'], 12)) {
                display_error(_("The entered reference is already in use."));
+               set_focus('ref');
                return false;
        }
 
-       if ((!is_numeric($_POST['amount']) || $_POST['amount'] < 0)) {
+       if (!check_num('amount', 0)) {
                display_error(_("The entered amount is invalid or negative and cannot be processed."));
+               set_focus('amount');
                return false;
        }
 
-       if (!isset($_POST['discount']) || ($_POST['discount'] == "")) {
-               $_POST['discount'] = 0;
-       }
-
-       if (!is_numeric($_POST['discount'])) {
+       if (!check_num('discount')) {
                display_error(_("The entered discount is not a valid number."));
+               set_focus('discount');
                return false;
        }
 
-       if (($_POST['amount'] - $_POST['discount'] <= 0)) {
+       if ((input_num('amount') - input_num('discount') <= 0)) {
                display_error(_("The balance of the amount and discout is zero or negative. Please enter valid amounts."));
+               set_focus('discount');
                return false;
        }
 
@@ -96,13 +110,19 @@ if (isset($_POST['AddPaymentItem'])) {
                unset($_POST['AddPaymentItem']);
        }
 }
-
+if (isset($_POST['_customer_id_button'])) {
+//     unset($_POST['branch_id']);
+       $Ajax->activate('BranchID');
+}
+if (isset($_POST['_DateBanked_changed'])) {
+  $Ajax->activate('_ex_rate');
+}
 //----------------------------------------------------------------------------------------------
 
 if (isset($_POST['AddPaymentItem'])) {
        $payment_no = write_customer_payment(0, $_POST['customer_id'], $_POST['BranchID'],
                $_POST['bank_account'], $_POST['DateBanked'], $_POST['ReceiptType'], $_POST['ref'],
-               $_POST['amount'], $_POST['discount'], $_POST['memo_']);
+               input_num('amount'), input_num('discount'), $_POST['memo_']);
 
        meta_forward($_SERVER['PHP_SELF'], "AddedID=$payment_no");
 }
@@ -145,7 +165,6 @@ function display_item_form()
                }
        }
        customer_list_row(_("From Customer:"), 'customer_id', null, false, true);
-
        if (db_customer_has_branches($_POST['customer_id'])) {
                customer_branches_list_row(_("Branch:"), $_POST['customer_id'], 'BranchID', null, false, true, true);
        } else {
@@ -155,12 +174,11 @@ function display_item_form()
        read_customer_data();
 
        set_global_customer($_POST['customer_id']);
-
        if (isset($_POST['HoldAccount']) && $_POST['HoldAccount'] != 0) {
                echo "</table></table>";
                display_note(_("This customer account is on hold."), 0, 0, "class='redfb'");
        } else {
-               $display_discount_percent = number_format2($_POST['pymt_discount']*100,user_price_dec()) . "%";
+               $display_discount_percent = percent_format($_POST['pymt_discount']*100) . "%";
 
                amount_row(_("Amount:"), 'amount');
 
@@ -168,7 +186,7 @@ function display_item_form()
 
                label_row(_("Customer prompt payment discount :"), $display_discount_percent);
 
-               date_row(_("Date of Deposit:"), 'DateBanked');
+               date_row(_("Date of Deposit:"), 'DateBanked','',null, 0, 0, 0, null, true);
 
                echo "</table>";
                echo "</td><td valign=top class='tableseparator'>"; // outer table
@@ -199,7 +217,7 @@ function display_item_form()
 
                echo"<br>";
 
-               submit_center('AddPaymentItem', _("Add Payment"));
+               submit_center('AddPaymentItem', _("Add Payment"), true, '', true);
        }
 
        echo "<br>";