X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_payments.php;h=f00a88dab6364a8a6e51674adb1531c8e4047e3f;hb=389721f442ea4dc96ba1cafd65919e717e0d8746;hp=0e38464f2a4fd0dd034bbd5e29407f769b930100;hpb=431531eebf3ba494002cfbf7ea36f9e82d4975c0;p=fa-stable.git diff --git a/sales/customer_payments.php b/sales/customer_payments.php index 0e38464f..f00a88da 100644 --- a/sales/customer_payments.php +++ b/sales/customer_payments.php @@ -1,22 +1,34 @@ . +***********************************************************************/ $path_to_root=".."; $page_security = 3; +include_once($path_to_root . "/includes/ui/allocation_cart.inc"); include_once($path_to_root . "/includes/session.inc"); - include_once($path_to_root . "/includes/date_functions.inc"); - include_once($path_to_root . "/includes/ui.inc"); include_once($path_to_root . "/includes/banking.inc"); include_once($path_to_root . "/includes/data_checks.inc"); - include_once($path_to_root . "/sales/includes/sales_db.inc"); +//include_once($path_to_root . "/sales/includes/ui/cust_alloc_ui.inc"); $js = ""; -if ($use_popup_windows) +if ($use_popup_windows) { $js .= get_js_open_window(900, 500); -if ($use_date_picker) +} +if ($use_date_picker) { $js .= get_js_date_picker(); +} +add_js_file('payalloc.js'); + page(_("Customer Payment Entry"), false, false, "", $js); //---------------------------------------------------------------------------------------------- @@ -25,92 +37,145 @@ check_db_has_customers(_("There are no customers defined in the system.")); 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 (isset($_GET['AddedID'])) -{ +if (list_updated('BranchID')) { + // when branch is selected via external editor also customer can change + $br = get_branch(get_post('BranchID')); + $_POST['customer_id'] = $br['debtor_no']; + $Ajax->activate('customer_id'); +} + +if (!isset($_POST['customer_id'])) + $_POST['customer_id'] = get_global_customer(false); +if (!isset($_POST['DateBanked'])) { + $_POST['DateBanked'] = new_doc_date(); + if (!is_date_in_fiscalyear($_POST['DateBanked'])) { + $_POST['DateBanked'] = end_fiscalyear(); + } +} + +if (isset($_GET['AddedID'])) { $payment_no = $_GET['AddedID']; display_notification_centered(_("The customer payment has been successfully entered.")); - display_note(get_gl_view_str(systypes::cust_payment(), $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=" . systypes::cust_payment()); - hyperlink_no_params($path_to_root . "/sales/customer_payments.php", _("Enter Another 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_no_params($path_to_root . "/sales/customer_payments.php", _("Enter Another &Customer Payment")); br(1); end_page(); - exit; + exit; } //---------------------------------------------------------------------------------------------- function can_process() { - if (!isset($_POST['DateBanked']) || !is_date($_POST['DateBanked'])) - { + 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'])) - { + } 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'])) - { + if (!references::is_valid($_POST['ref'])) { display_error(_("You must enter a reference.")); + set_focus('ref'); return false; } - if (!is_new_reference($_POST['ref'], systypes::cust_payment())) - { + 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 (isset($_POST['charge']) && !check_num('charge', 0)) { + display_error(_("The entered amount is invalid or negative and cannot be processed.")); + set_focus('charge'); + return false; + } - if (!is_numeric($_POST['discount'])) + if (isset($_POST['_ex_rate']) && !check_num('_ex_rate', 0.000001)) { - display_error(_("The entered discount is not a valid number.")); + display_error(_("The exchange rate must be numeric and greater than zero.")); + set_focus('_ex_rate'); return false; } - if (($_POST['amount'] - $_POST['discount'] <= 0)) + if ($_POST['discount'] == "") { + $_POST['discount'] = 0; + } + + if (!check_num('discount')) { + display_error(_("The entered discount is not a valid number.")); + set_focus('discount'); + return false; + } + + 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; } - return true; + $_SESSION['alloc']->amount = input_num('amount'); + return check_allocations(); } //---------------------------------------------------------------------------------------------- // validate inputs -if (isset($_POST['AddPaymentItem'])) -{ +if (isset($_POST['AddPaymentItem'])) { - if (!can_process()) + if (!can_process()) { 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 (list_updated('customer_id') || list_updated('bank_account')) { + $_SESSION['alloc']->read(); + $Ajax->activate('alloc_tbl'); } - //---------------------------------------------------------------------------------------------- -if (isset($_POST['AddPaymentItem'])) -{ - $payment_no = add_customer_payment($_POST['customer_id'], $_POST['BranchID'], - $_POST['bank_account'], $_POST['DateBanked'], $_POST['ReceiptType'], $_POST['ref'], - $_POST['amount'], $_POST['discount'], $_POST['memo_']); +if (isset($_POST['AddPaymentItem'])) { + + $cust_currency = get_customer_currency($_POST['customer_id']); + $bank_currency = get_bank_account_currency($_POST['bank_account']); + $comp_currency = get_company_currency(); + if ($comp_currency != $bank_currency && $bank_currency != $cust_currency) + $rate = 0; + else + $rate = input_num('_ex_rate'); + + new_doc_date($_POST['DateBanked']); + + $payment_no = write_customer_payment(0, $_POST['customer_id'], $_POST['BranchID'], + $_POST['bank_account'], $_POST['DateBanked'], $_POST['ref'], + input_num('amount'), input_num('discount'), $_POST['memo_'], $rate, input_num('charge')); + + $_SESSION['alloc']->trans_no = $payment_no; + $_SESSION['alloc']->write(); meta_forward($_SERVER['PHP_SELF'], "AddedID=$payment_no"); } @@ -131,100 +196,84 @@ function read_customer_data() $_POST['HoldAccount'] = $myrow["dissallow_invoices"]; $_POST['pymt_discount'] = $myrow["pymt_discount"]; - $_POST['ref'] = references::get_next(systypes::cust_payment()); + $_POST['ref'] = references::get_next(12); } -//------------------------------------------------------------------------------------------------- +//---------------------------------------------------------------------------------------------- -function display_item_form() -{ - global $table_style2; - start_table($table_style2, 5, 7); - echo ""; // outer table +start_form(); - echo ""; + start_outer_table("$table_style2 width=60%", 5); + table_section(1); - if (!isset($_POST['customer_id'])) - $_POST['customer_id'] = get_global_customer(false); - if (!isset($_POST['DateBanked'])) - { - $_POST['DateBanked'] = Today(); - if (!is_date_in_fiscalyear($_POST['DateBanked'])) - $_POST['DateBanked'] = end_fiscalyear(); - } customer_list_row(_("From Customer:"), 'customer_id', null, false, true); + if (!isset($_POST['bank_account'])) // first page call + $_SESSION['alloc'] = new allocation(12,0); - if (db_customer_has_branches($_POST['customer_id'])) - { + if (db_customer_has_branches($_POST['customer_id'])) { customer_branches_list_row(_("Branch:"), $_POST['customer_id'], 'BranchID', null, false, true, true); - } - else - { + } else { hidden('BranchID', reserved_words::get_any_numeric()); } - read_customer_data(); + read_customer_data(); - set_global_customer($_POST['customer_id']); + set_global_customer($_POST['customer_id']); + if (isset($_POST['HoldAccount']) && $_POST['HoldAccount'] != 0) { + end_outer_table(); + display_error(_("This customer account is on hold.")); + } else { + $display_discount_percent = percent_format($_POST['pymt_discount']*100) . "%"; - if (isset($_POST['HoldAccount']) && $_POST['HoldAccount'] != 0) - { - echo "
"; - 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()) . "%"; + table_section(2); - amount_row(_("Amount:"), 'amount'); + bank_accounts_list_row(_("Into Bank Account:"), 'bank_account', null, true); - amount_row(_("Amount of Discount:"), 'discount'); - label_row(_("Customer prompt payment discount :"), $display_discount_percent); + text_row(_("Reference:"), 'ref', null, 20, 40); - date_row(_("Date of Deposit:"), 'DateBanked'); + table_section(3); - echo ""; - echo ""; // outer table - echo ""; + date_row(_("Date of Deposit:"), 'DateBanked', '', true, 0, 0, 0, null, true); - bank_accounts_list_row(_("Into Bank Account:"), 'bank_account', null, true); - $cust_currency = get_customer_currency($_POST['customer_id']); - $bank_currency = get_bank_account_currency($_POST['bank_account']); - if ($cust_currency != $bank_currency) - { - exchange_rate_display($cust_currency, $bank_currency, $_POST['DateBanked']); - } + $cust_currency = get_customer_currency($_POST['customer_id']); + $bank_currency = get_bank_account_currency($_POST['bank_account']); - bank_trans_types_list_row(_("Type:"), 'ReceiptType', null); + if ($cust_currency != $bank_currency) { + exchange_rate_display($bank_currency, $cust_currency, $_POST['DateBanked'], true); + } - text_row(_("Reference:"), 'ref', null, 20, 40); + amount_row(_("Bank Charge:"), 'charge'); - textarea_row(_("Memo:"), 'memo_', null, 22, 4); + end_outer_table(1); - echo "
"; + if ($cust_currency == $bank_currency) { + div_start('alloc_tbl'); + show_allocatable(false); + div_end(); + } - echo ""; - end_table(); // outer table + start_table("$table_style width=60%"); - if ($cust_currency != $bank_currency) - display_note(_("Amount and discount are in customer's currency.")); + label_row(_("Customer prompt payment discount :"), $display_discount_percent); + amount_row(_("Amount of Discount:"), 'discount'); - echo"
"; + amount_row(_("Amount:"), 'amount'); - submit_center('AddPaymentItem', _("Add Payment")); - } + textarea_row(_("Memo:"), 'memo_', null, 22, 4); + end_table(1); - echo "
"; -} + if ($cust_currency != $bank_currency) + display_note(_("Amount and discount are in customer's currency.")); -//---------------------------------------------------------------------------------------------- + br(); -start_form(); + submit_center('AddPaymentItem', _("Add Payment"), true, '', 'default'); + } -display_item_form(); + br(); end_form(); end_page();