X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcustomer_payments.php;h=de86600d802e644e54bbb13bc11ff25f732437bb;hb=492d633dd684e8308c7aafd5922ec52cbfc60498;hp=7153e4576b712f8cf220d2a28ebcc43b30c503a3;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git

diff --git a/sales/customer_payments.php b/sales/customer_payments.php
index 7153e457..de86600d 100644
--- a/sales/customer_payments.php
+++ b/sales/customer_payments.php
@@ -3,18 +3,19 @@
 $path_to_root="..";
 $page_security = 3;
 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");
 
 $js = "";
-if ($use_popup_windows)
+if ($use_popup_windows) {
 	$js .= get_js_open_window(900, 500);
+}
+if ($use_date_picker) {
+	$js .= get_js_date_picker();
+}
 page(_("Customer Payment Entry"), false, false, "", $js);
 
 //----------------------------------------------------------------------------------------------
@@ -27,65 +28,62 @@ check_db_has_bank_trans_types(_("There are no bank payment types defined in the
 
 //----------------------------------------------------------------------------------------
 
-if (isset($_GET['AddedID'])) 
-{
+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 (!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;
 	}
 
@@ -95,20 +93,19 @@ function can_process()
 //----------------------------------------------------------------------------------------------
 
 // validate inputs
-if (isset($_POST['AddPaymentItem']))
-{
+if (isset($_POST['AddPaymentItem'])) {
 
-	if (!can_process())
+	if (!can_process()) {
 		unset($_POST['AddPaymentItem']);
+	}
 }
 
 //----------------------------------------------------------------------------------------------
 
-if (isset($_POST['AddPaymentItem']))
-{
-	$payment_no = add_customer_payment($_POST['customer_id'], $_POST['BranchID'],
+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");
 }
@@ -129,7 +126,7 @@ 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);
 }
 
 //-------------------------------------------------------------------------------------------------
@@ -144,78 +141,71 @@ function display_item_form()
 
 	if (!isset($_POST['customer_id']))
 		$_POST['customer_id'] = get_global_customer(false);
-	if (!isset($_POST['DateBanked']))
-	{
+	if (!isset($_POST['DateBanked'])) {
 		$_POST['DateBanked'] = Today();
-		if (!is_date_in_fiscalyear($_POST['DateBanked']))
+		if (!is_date_in_fiscalyear($_POST['DateBanked'])) {
 			$_POST['DateBanked'] = end_fiscalyear();
-	}		
+		}
+	}
 	customer_list_row(_("From Customer:"), 'customer_id', null, false, true);
 
-	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)
-	{
+	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()) . "%";
+	} else {
+		$display_discount_percent = percent_format($_POST['pymt_discount']*100) . "%";
 
-    	amount_row(_("Amount:"), 'amount');
+		amount_row(_("Amount:"), 'amount');
 
-    	amount_row(_("Amount of Discount:"), 'discount');
+		amount_row(_("Amount of Discount:"), 'discount');
 
-    	label_row(_("Customer prompt payment discount :"), $display_discount_percent);
+		label_row(_("Customer prompt payment discount :"), $display_discount_percent);
 
-    	date_row(_("Date of Deposit:"), 'DateBanked');
+		date_row(_("Date of Deposit:"), 'DateBanked');
 
-    	echo "</table>";
-    	echo "</td><td valign=top class='tableseparator'>"; // outer table
-    	echo "<table>";
+		echo "</table>";
+		echo "</td><td valign=top class='tableseparator'>"; // outer table
+		echo "<table>";
 
-    	bank_accounts_list_row(_("Into Bank Account:"), 'bank_account', 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']);
+		$cust_currency = get_customer_currency($_POST['customer_id']);
+		$bank_currency = get_bank_account_currency($_POST['bank_account']);
 
-    	if ($cust_currency != $bank_currency) 
-    	{
+		if ($cust_currency != $bank_currency) {
 			exchange_rate_display($cust_currency, $bank_currency, $_POST['DateBanked']);
-    	}
+		}
 
 		bank_trans_types_list_row(_("Type:"), 'ReceiptType', null);
 
-    	text_row(_("Reference:"), 'ref', null, 20, 40);
+		text_row(_("Reference:"), 'ref', null, 20, 40);
 
-    	textarea_row(_("Memo:"), 'memo_', null, 22, 4);
+		textarea_row(_("Memo:"), 'memo_', null, 22, 4);
 
-    	echo "</table>";
+		echo "</table>";
 
 		echo "</td></tr>";
 		end_table(); // outer table
 
-    	if ($cust_currency != $bank_currency)
-    		display_note(_("Amount and discount are in customer's currency."));
+		if ($cust_currency != $bank_currency)
+			display_note(_("Amount and discount are in customer's currency."));
 
-    	echo"<br>";
+		echo"<br>";
 
-    	submit_center('AddPaymentItem', _("Add Payment"));
+		submit_center('AddPaymentItem', _("Add Payment"));
 	}
 
-    echo "<br>";
+	echo "<br>";
 }
 
 //----------------------------------------------------------------------------------------------