X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_payments.php;h=ca2fcf6243ca7f244d7fc462024c0ada18962678;hb=7202616e85a0fb8907ced404e418d8a16a5ed53a;hp=c93db3a1a704ae1a20da8336d48ef718764194e0;hpb=fed6bc04a7b050a0b69136a332e92ee651812487;p=fa-stable.git

diff --git a/sales/customer_payments.php b/sales/customer_payments.php
index c93db3a1..ca2fcf62 100644
--- a/sales/customer_payments.php
+++ b/sales/customer_payments.php
@@ -1,13 +1,24 @@
 <?php
-
-$path_to_root="..";
-$page_security = 3;
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
+$page_security = 'SA_SALESPAYMNT';
+$path_to_root = "..";
+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) {
@@ -16,6 +27,8 @@ if ($use_popup_windows) {
 if ($use_date_picker) {
 	$js .= get_js_date_picker();
 }
+add_js_file('payalloc.js');
+
 page(_("Customer Payment Entry"), false, false, "", $js);
 
 //----------------------------------------------------------------------------------------------
@@ -24,20 +37,34 @@ 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 (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(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;
@@ -75,6 +102,24 @@ function can_process()
 		return false;
 	}
 
+	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 (isset($_POST['_ex_rate']) && !check_num('_ex_rate', 0.000001))
+	{
+		display_error(_("The exchange rate must be numeric and greater than zero."));
+		set_focus('_ex_rate');
+		return false;
+	}
+
+	if ($_POST['discount'] == "") 
+	{
+		$_POST['discount'] = 0;
+	}
+
 	if (!check_num('discount')) {
 		display_error(_("The entered discount is not a valid number."));
 		set_focus('discount');
@@ -87,7 +132,8 @@ function can_process()
 		return false;
 	}
 
-	return true;
+	$_SESSION['alloc']->amount = input_num('amount');
+	return check_allocations();
 }
 
 //----------------------------------------------------------------------------------------------
@@ -101,14 +147,35 @@ if (isset($_POST['AddPaymentItem'])) {
 }
 if (isset($_POST['_customer_id_button'])) {
 //	unset($_POST['branch_id']);
-	$Ajax->activate('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'])) {
+	
+	$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['ReceiptType'], $_POST['ref'],
-		input_num('amount'), input_num('discount'), $_POST['memo_']);
+		$_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");
 }
@@ -132,25 +199,17 @@ function read_customer_data()
 	$_POST['ref'] = references::get_next(12);
 }
 
-//-------------------------------------------------------------------------------------------------
+//----------------------------------------------------------------------------------------------
+
+start_form();
+
+	start_outer_table("$table_style2 width=60%", 5);
+	table_section(1);
 
-function display_item_form()
-{
-	global $table_style2;
-	start_table($table_style2, 5, 7);
-	echo "<tr><td valign=top>"; // outer table
-
-	echo "<table>";
-
-	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'])) {
 		customer_branches_list_row(_("Branch:"), $_POST['customer_id'], 'BranchID', null, false, true, true);
 	} else {
@@ -160,61 +219,62 @@ 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'");
+		end_outer_table();
+		display_error(_("This customer account is on hold."));
 	} else {
 		$display_discount_percent = percent_format($_POST['pymt_discount']*100) . "%";
 
-		amount_row(_("Amount:"), 'amount');
+		table_section(2);
 
-		amount_row(_("Amount of Discount:"), 'discount');
+		bank_accounts_list_row(_("Into Bank Account:"), 'bank_account', null, true);
 
-		label_row(_("Customer prompt payment discount :"), $display_discount_percent);
 
-		date_row(_("Date of Deposit:"), 'DateBanked');
+		text_row(_("Reference:"), 'ref', null, 20, 40);
+
+		table_section(3);
 
-		echo "</table>";
-		echo "</td><td valign=top class='tableseparator'>"; // outer table
-		echo "<table>";
+		date_row(_("Date of Deposit:"), 'DateBanked', '', true, 0, 0, 0, null, true);
 
-		bank_accounts_list_row(_("Into Bank Account:"), 'bank_account', null, true);
 
+
+		$comp_currency = get_company_currency();
 		$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']);
+			exchange_rate_display($bank_currency, $cust_currency, $_POST['DateBanked'], ($bank_currency == $comp_currency));
 		}
 
-		bank_trans_types_list_row(_("Type:"), 'ReceiptType', null);
+		amount_row(_("Bank Charge:"), 'charge');
 
-		text_row(_("Reference:"), 'ref', null, 20, 40);
+		end_outer_table(1);
 
-		textarea_row(_("Memo:"), 'memo_', null, 22, 4);
+		if ($cust_currency == $bank_currency) {
+	  		div_start('alloc_tbl');
+			show_allocatable(false);
+			div_end();
+		}
+
+		start_table("$table_style width=60%");
 
-		echo "</table>";
+		label_row(_("Customer prompt payment discount :"), $display_discount_percent);
+		amount_row(_("Amount of Discount:"), 'discount');
 
-		echo "</td></tr>";
-		end_table(); // outer table
+		amount_row(_("Amount:"), 'amount');
+
+		textarea_row(_("Memo:"), 'memo_', null, 22, 4);
+		end_table(1);
 
 		if ($cust_currency != $bank_currency)
 			display_note(_("Amount and discount are in customer's currency."));
 
-		echo"<br>";
+		br();
 
-		submit_center('AddPaymentItem', _("Add Payment"), true, '', true);
+		submit_center('AddPaymentItem', _("Add Payment"), true, '', 'default');
 	}
 
-	echo "<br>";
-}
-
-//----------------------------------------------------------------------------------------------
-
-start_form();
-
-display_item_form();
+	br();
 
 end_form();
 end_page();