X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fallocations%2Fcustomer_allocation_main.php;h=ee373036ac4be6b18e9a4589063ae6b31954582a;hb=21290a4a16ca78fe736f62cf1cb039c06cb53fca;hp=b0c67256423967e3397f0b739b655d5484cf311e;hpb=0e484731f1e6036625f5f22a59be003d0b409ef2;p=fa-stable.git

diff --git a/sales/allocations/customer_allocation_main.php b/sales/allocations/customer_allocation_main.php
index b0c67256..ee373036 100644
--- a/sales/allocations/customer_allocation_main.php
+++ b/sales/allocations/customer_allocation_main.php
@@ -1,7 +1,17 @@
 <?php
-
+/**********************************************************************
+    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>.
+***********************************************************************/
 $path_to_root="../..";
 $page_security = 3;
+include($path_to_root . "/includes/db_pager.inc");
 include_once($path_to_root . "/includes/session.inc");
 
 include_once($path_to_root . "/sales/includes/sales_ui.inc");
@@ -12,12 +22,15 @@ if ($use_popup_windows)
 page(_("Customer Allocations"), false, false, "", $js);
 
 //--------------------------------------------------------------------------------
+if ($ret = context_restore()) {
+	if(isset($ret['customer_id']))
+		$_POST['customer_id'] = $ret['customer_id'];
+}
+if (isset($_POST['_customer_id_editor'])) {
+	context_call($path_to_root.'/sales/manage/customers.php?debtor_no='.$_POST['customer_id'] );
+}
 
-function display_allocatable_transactions()
-{
-	global $table_style, $path_to_root;
-	start_form();
-
+start_form();
 	/* show all outstanding receipts and credits to be allocated */
 	/*Clear any previous allocation records */
 	if (isset($_SESSION['alloc']))
@@ -55,70 +68,65 @@ function display_allocatable_transactions()
 	if (isset($_POST['customer_id']))
 		$customer_id = $_POST['customer_id'];
 
-	$trans_items = get_allocatable_from_cust_transactions($customer_id, $settled);
- div_start('alloc_tbl');
-	start_table($table_style);
-	if (!isset($_POST['customer_id']))
-		$th = array(_("Transaction Type"), _("#"), _("Reference"), _("Date"), _("Customer"),
-			_("Currency"), _("Total"), _("Left To Allocate"), "");
-	else
-		$th = array(_("Transaction Type"), _("#"), _("Reference"), _("Date"),
-			_("Total"), _("Left To Allocate"), "");
-	table_header($th);
-	$k = 0; //row colour counter
-	$has_settled_items = false;
-
-	while ($myrow = db_fetch($trans_items))
-	{
-      	if ($myrow["settled"] == 1)
-      	{
-      		start_row("class='settledbg'");
-      		$has_settled_items = true;
-      	}
-      	else
-      	{
-    		alt_table_row_color($k);
-      	}
-
-    	label_cell(systypes::name($myrow["type"]));
-    	label_cell(get_trans_view_str($myrow["type"], $myrow["trans_no"]));
-		label_cell($myrow["reference"]);
-    	label_cell(sql2date($myrow["tran_date"]));
-
-		if (!isset($_POST['customer_id']))
-		{
-    		label_cell($myrow["DebtorName"]);
-    		label_cell($myrow["curr_code"]);
-		}
-		amount_cell($myrow["Total"]);
-    	amount_cell($myrow["Total"] - $myrow["alloc"]);
-    	if ($myrow["Total"] - $myrow["alloc"] != 0.0)
-    		label_cell("<a href='$path_to_root/sales/allocations/customer_allocate.php?trans_no="
-					.$myrow["trans_no"] . "&trans_type=" . $myrow["type"]  . "'>" . _("Allocate") . "</a>");
-    	else
-    		label_cell("");
-    	end_row();
-	}
+//--------------------------------------------------------------------------------
+function systype_name($dummy, $type)
+{
+	return systypes::name($type);
+}
 
-	end_table();
+function trans_view($trans)
+{
+	return get_trans_view_str($trans["type"], $trans["trans_no"]);
+}
 
-	if ($has_settled_items)
-		display_note(_("Marked items are settled."), 0, 1, "class='settledfg'");
+function alloc_link($row)
+{
+	return pager_link(_("Allocate"),
+		"/sales/allocations/customer_allocate.php?trans_no="
+			.$row["trans_no"] . "&trans_type=" . $row["type"], ICON_MONEY);
+}
 
-	if (db_num_rows($trans_items) == 0)
-		display_note(_("There are no allocations to be done."), 1, 2);
-	div_end();
-	end_form();
+function amount_left($row)
+{
+	return price_format($row["Total"]-$row["alloc"]);
 }
 
-//--------------------------------------------------------------------------------
-if (get_post('_ShowSettled_update')) {
-	$Ajax->activate('alloc_tbl');
+function check_settled($row)
+{
+	return $row['settled'] == 1;
 }
-display_allocatable_transactions();
 
-//--------------------------------------------------------------------------------
 
-end_page();
+$sql = get_allocatable_from_cust_sql($customer_id, $settled);
+
+$cols = array(
+	_("Transaction Type") => array('fun'=>'systype_name'),
+	_("#") => array('fun'=>'trans_view'),
+	_("Reference"), 
+	_("Date") => array('name'=>'tran_date', 'type'=>'date', 'ord'=>'asc'),
+	_("Customer") => array('ord'=>''),
+	_("Currency") => array('align'=>'center'),
+	_("Total") => 'amount', 
+	_("Left to Allocate") => array('align'=>'right','insert'=>true, 'fun'=>'amount_left'), 
+	array('insert'=>true, 'fun'=>'alloc_link')
+	);
 
+if (isset($_POST['customer_id'])) {
+	$cols[_("Customer")] = 'skip';
+	$cols[_("Currency")] = 'skip';
+}
+
+$table =& new_db_pager('alloc_tbl', $sql, $cols);
+$table->set_marker('check_settled', _("Marked items are settled."), 'settledbg', 'settledfg');
+
+if (get_post('_ShowSettled_update') || get_post('_customer_id_update')) {
+	$table->set_sql($sql);
+	$table->set_columns($cols);
+}
+$table->width = "75%";
+
+display_db_pager($table);
+end_form();
+
+end_page();
 ?>
\ No newline at end of file