X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Finquiry%2Fcustomer_inquiry.php;h=c9d64bdc00548033f60f05fbe14699c26ff10a60;hb=fd59c60718609c1bf3240a303030167a4f1b1885;hp=db68dfdd36616e61c97812a895c88715a0e03657;hpb=7d866f768b8be95c82ab0664721da9ca09c7604f;p=fa-stable.git

diff --git a/sales/inquiry/customer_inquiry.php b/sales/inquiry/customer_inquiry.php
index db68dfdd..c9d64bdc 100644
--- a/sales/inquiry/customer_inquiry.php
+++ b/sales/inquiry/customer_inquiry.php
@@ -2,6 +2,7 @@
 
 $page_security = 1;
 $path_to_root="../..";
+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");
@@ -29,19 +30,20 @@ if (!isset($_POST['customer_id']))
 	$_POST['customer_id'] = get_global_customer();
 
 start_table("class='tablestyle_noborder'");
+start_row();
 
-customer_list_cells(_("Select a customer: "), 'customer_id', $_POST['customer_id'], true);
+customer_list_cells(_("Select a customer: "), 'customer_id', null, true);
 
-date_cells(_("From:"), 'TransAfterDate', null, -30);
-date_cells(_("To:"), 'TransToDate', null, 1);
+date_cells(_("From:"), 'TransAfterDate', '', null, -30);
+date_cells(_("To:"), 'TransToDate', '', null, 1);
 
 if (!isset($_POST['filterType']))
 	$_POST['filterType'] = 0;
 
 cust_allocations_list_cells(null, 'filterType', $_POST['filterType'], true);
 
-submit_cells('Refresh Inquiry', _("Search"));
-
+submit_cells('RefreshInquiry', _("Search"),'',_('Refresh Inquiry'), true);
+end_row();
 end_table();
 
 end_form();
@@ -82,206 +84,222 @@ function display_customer_summary($customer_record)
 
 	end_table();;
 }
+//------------------------------------------------------------------------------------------------
+
+div_start('totals_tbl');
+if ($_POST['customer_id'] != "" && $_POST['customer_id'] != reserved_words::get_all())
+{
+	$customer_record = get_customer_details($_POST['customer_id'], $_POST['TransToDate']);
+    display_customer_summary($customer_record);
+    echo "<br>";
+}
+div_end();
+
 
 //------------------------------------------------------------------------------------------------
+function systype_name($dummy, $type)
+{
+	return systypes::name($type);
+}
+
+function order_view($row)
+{
+	return $row['order_']>0 ?
+		get_customer_trans_view_str(systypes::sales_order(), $row['order_'])
+		: "";
+}
+
+function trans_view($trans)
+{
+	return get_trans_view_str($trans["type"], $trans["trans_no"]);
+}
+
+function due_date($row)
+{
+	return ($row["type"]==20 || $row["type"]==21)
+		? $row["due_date"] : '';
+}
+
+function gl_view($row)
+{
+	return get_gl_view_str($row["type"], $row["trans_no"]);
+}
+
+function fmt_debit($row)
+{
+	$value =
+	    $row['type']==11 || $row['type']==12 || $row['type']==2 ?
+		-$row["TotalAmount"] : $row["TotalAmount"];
+	return $value>=0 ? price_format($value) : '';
+
+}
+
+function fmt_credit($row)
+{
+	$value =
+	    !($row['type']==11 || $row['type']==12 || $row['type']==2) ?
+		-$row["TotalAmount"] : $row["TotalAmount"];
+	return $value>0 ? price_format($value) : '';
+}
+
+function alloc_link($row)
+{
+	if ($row['type'] == 10)
+		if ($row["TotalAmount"] - $row["Allocated"] > 0)
+			return pager_link(_("Allocation"),
+				"/sales/allocations/customer_allocate.php"
+				."?trans_no={$row['trans_no']}&trans_type="
+				.$row['type']);
+	return '';
+}
+
+function credit_link($row)
+{
+	return $row['type'] == 10 ?
+		pager_link(_("Credit This"),
+			"/sales/customer_credit_invoice.php?InvoiceNumber=".
+			$row['trans_no'])
+			: '';
+}
+
+function edit_link($row)
+{
+	$str = '';
+
+	switch($row['type']) {
+	case 10:
+		$str = "/sales/customer_invoice.php?ModifyInvoice=".$row['trans_no'];
+		break;
+	case 11:
+		if ($row['order_']==0) // free-hand credit note
+		    $str = "/sales/credit_note_entry.php?ModifyCredit=".$row['trans_no'];
+		else	// credit invoice
+		    $str = "/sales/customer_credit_invoice.php?ModifyCredit=".$row['trans_no'];
+		break;
+	 case 13:
+   		$str = "/sales/customer_delivery.php?ModifyDelivery=".$row['trans_no'];
+		break;
+	}
+	return pager_link(_('Edit'), $str);
+}
 
-function get_transactions()
+function prt_link($row)
 {
+  	if ($row['type'] != 12) // customer payment printout not defined yet.
+ 		return print_document_link($row['trans_no'], _("Print"), true, $row['type']);
+}
+
+function check_overdue($row)
+{
+	return $row['OverDue'] == 1
+		&& (abs($row["TotalAmount"]) - $row["Allocated"] != 0);
+}
+//------------------------------------------------------------------------------------------------
     $date_after = date2sql($_POST['TransAfterDate']);
     $date_to = date2sql($_POST['TransToDate']);
 
-    $sql = "SELECT ".TB_PREF."debtor_trans.*,
-		".TB_PREF."debtors_master.name AS CustName, ".TB_PREF."debtors_master.curr_code AS CustCurrCode,
-		(".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + "
-		.TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount)
-		AS TotalAmount, ".TB_PREF."debtor_trans.alloc AS Allocated,
-		((".TB_PREF."debtor_trans.type = 10)
-			AND ".TB_PREF."debtor_trans.due_date < '" . date2sql(Today()) . "') AS OverDue
-		FROM ".TB_PREF."debtor_trans, ".TB_PREF."debtors_master
-		WHERE ".TB_PREF."debtors_master.debtor_no = ".TB_PREF."debtor_trans.debtor_no
-			AND ".TB_PREF."debtor_trans.tran_date >= '$date_after'
-			AND ".TB_PREF."debtor_trans.tran_date <= '$date_to'";
+  $sql = "SELECT 
+  		trans.type, 
+		trans.trans_no, 
+		trans.order_, 
+		trans.reference,
+		trans.tran_date, 
+		trans.due_date, 
+		debtor.name, 
+		branch.br_name,
+		debtor.curr_code,
+		(trans.ov_amount + trans.ov_gst + trans.ov_freight 
+			+ trans.ov_freight_tax + trans.ov_discount)	AS TotalAmount, 
+		trans.alloc AS Allocated,
+		((trans.type = 10)
+			AND trans.due_date < '" . date2sql(Today()) . "') AS OverDue
+		FROM "
+			.TB_PREF."debtor_trans as trans, "
+			.TB_PREF."debtors_master as debtor, "
+			.TB_PREF."cust_branch as branch
+		WHERE debtor.debtor_no = trans.debtor_no
+			AND trans.tran_date >= '$date_after'
+			AND trans.tran_date <= '$date_to'";
 
    	if ($_POST['customer_id'] != reserved_words::get_all())
-   		$sql .= " AND ".TB_PREF."debtor_trans.debtor_no = '" . $_POST['customer_id'] . "'";
+   		$sql .= " AND trans.debtor_no = '" . $_POST['customer_id'] . "'";
 
    	if ($_POST['filterType'] != reserved_words::get_all())
    	{
    		if ($_POST['filterType'] == '1')
    		{
-   			$sql .= " AND (".TB_PREF."debtor_trans.type = 10 OR ".TB_PREF."debtor_trans.type = 1) ";
+   			$sql .= " AND (trans.type = 10 OR trans.type = 1) ";
    		}
    		elseif ($_POST['filterType'] == '2')
    		{
-   			$sql .= " AND (".TB_PREF."debtor_trans.type = 10) ";
+   			$sql .= " AND (trans.type = 10) ";
    		}
    		elseif ($_POST['filterType'] == '3')
    		{
-			$sql .= " AND (".TB_PREF."debtor_trans.type = " . systypes::cust_payment() . " OR ".TB_PREF."debtor_trans.type = 2) ";
+			$sql .= " AND (trans.type = " . systypes::cust_payment() 
+					." OR trans.type = 2) ";
    		}
    		elseif ($_POST['filterType'] == '4')
    		{
-			$sql .= " AND ".TB_PREF."debtor_trans.type = 11 ";
+			$sql .= " AND trans.type = 11 ";
    		}
    		elseif ($_POST['filterType'] == '5')
    		{
-			$sql .= " AND ".TB_PREF."debtor_trans.type = 13 ";
+			$sql .= " AND trans.type = 13 ";
    		}
 
     	if ($_POST['filterType'] == '2')
     	{
     		$today =  date2sql(Today());
-    		$sql .= " AND ".TB_PREF."debtor_trans.due_date < '$today'
-				AND (".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + "
-				.TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_freight + "
-				.TB_PREF."debtor_trans.ov_discount - ".TB_PREF."debtor_trans.alloc > 0) ";
+    		$sql .= " AND trans.due_date < '$today'
+				AND (trans.ov_amount + trans.ov_gst + trans.ov_freight_tax + 
+				trans.ov_freight + trans.ov_discount - trans.alloc > 0) ";
     	}
    	}
 
-    $sql .= " ORDER BY ".TB_PREF."debtor_trans.tran_date DESC,
-	  ".TB_PREF."debtor_trans.type,".TB_PREF."debtor_trans.trans_no ";
-
-    return db_query($sql,"No transactions were returned");
-}
-
-//------------------------------------------------------------------------------------------------
-
-if (($_POST['customer_id'] != "") && ($_POST['customer_id'] != reserved_words::get_all()))
-{
-	$customer_record = get_customer_details($_POST['customer_id']);
-    display_customer_summary($customer_record);
-    echo "<br>";
-}
-
 //------------------------------------------------------------------------------------------------
 
-$result = get_transactions();
-
-if (db_num_rows($result) == 0)
-{
-	display_note(_("The selected customer has no transactions for the given dates."), 0, 2);
-	end_page();
-	exit;
-}
-
-//------------------------------------------------------------------------------------------------
-
-print_hidden_script(10);
-start_table("$table_style width='80%'");
-
-	$th = array(_("Type"), _("#"), _("Order"), _("Reference"), _("Date"), _("Due Date"),
-		_("Customer"), _("Branch"), _("Currency"), _("Debit"), _("Credit"), "", "","","");
+$cols = array(
+	_("Type") => array('fun'=>'systype_name', 'ord'=>''),
+	_("#") => array('fun'=>'trans_view', 'ord'=>''),
+	_("Order") => array('fun'=>'order_view'), 
+	_("Reference"), 
+	_("Date") => array('type'=>'date', 'ord'=>'desc'),
+	_("Due Date") => array('type=>date', 'fun'=>'due_date'),
+	_("Customer") => array('ord'=>''), 
+	_("Branch") => array('ord'=>''), 
+	_("Currency") => array('align'=>'center'),
+	_("Debit") => array('align'=>'right', 'fun'=>'fmt_debit'), 
+	_("Credit") => array('align'=>'right','insert'=>true, 'fun'=>'fmt_credit'), 
+		array('insert'=>true, 'fun'=>'gl_view'),
+		array('insert'=>true, 'fun'=>'alloc_link'),
+		array('insert'=>true, 'fun'=>'credit_link'),
+		array('insert'=>true, 'fun'=>'edit_link'),
+		array('insert'=>true, 'fun'=>'prt_link')
+	);
 
 if ($_POST['customer_id'] != reserved_words::get_all()) {
-  unset($th[6], $th[8]);
+	$cols[_("Customer")] = 'skip';
+	$cols[_("Currency")] = 'skip';
 }
 
-table_header($th);
 
+$table =& new_db_pager('trans_tbl', $sql, $cols);
+$table->set_marker('check_overdue', _("Marked items are overdue."));
 
-$j = 1;
-$k = 0; //row colour counter
-$over_due = false;
-while ($myrow = db_fetch($result))
-{
-
-	if ($myrow['OverDue'] == 1)
-	{
-		start_row("class='overduebg'");
-		$over_due = true;
-	}
-	else
-		alt_table_row_color($k);
-
-	$edit_page='';
-	$due_date_str = '';
-	$credit_me_str = '';
-
-	switch($myrow['type']) {
-	 case 10:
-		$due_date_str = sql2date($myrow["due_date"]);
-			/*Show a link to allow an invoice to be credited */
-		    // only allow crediting if it's not been totally allocated
-		if ($myrow["TotalAmount"] - $myrow["Allocated"] > 0)
-			$credit_me_str = "<a href='$path_to_root/sales/customer_credit_invoice.php?InvoiceNumber=" . $myrow["trans_no"] . "'>" . _("Credit This") . "</a>";
-		$edit_page= $path_to_root.'/sales/customer_invoice.php?ModifyInvoice='
-					. $myrow['trans_no'];
-		break;
-
-	 case 11:
-		if ($myrow['order_']==0) // free-hand credit note
-		    $edit_page= $path_to_root.'/sales/credit_note_entry.php?ModifyCredit='
-					. $myrow['trans_no'];
-		else	// credit invoice
-		    $edit_page= $path_to_root.'/sales/customer_credit_invoice.php?ModifyCredit='
-					. $myrow['trans_no'];
-		break;
-
-	 case 13:
-   		$edit_page= $path_to_root.'/sales/customer_delivery.php?ModifyDelivery='
-					. $myrow['trans_no']; break;
-	}
-
-	$date = sql2date($myrow["tran_date"]);
 
-	if ($myrow["order_"] > 0)
-		$preview_order_str = get_customer_trans_view_str(systypes::sales_order(), $myrow["order_"]);
-	else
-		$preview_order_str = "";
-
-	$gl_trans_str = get_gl_view_str_cell($myrow["type"], $myrow["trans_no"]);
-
-	$branch_name = "";
-	if ($myrow["branch_code"] > 0)
-	{
-		$branch_name = get_branch_name($myrow["branch_code"]);
-	}
-
-	$preview_trans_str = get_trans_view_str($myrow["type"], $myrow["trans_no"]);
-
-	label_cell(systypes::name($myrow["type"]));
-
-	label_cell($preview_trans_str);
-	label_cell($preview_order_str);
-	label_cell($myrow["reference"]);
-	label_cell($date, "nowrap");
-	label_cell($due_date_str, "nowrap");
-	if ($_POST['customer_id'] == reserved_words::get_all())
-		label_cell($myrow["CustName"]);
-	label_cell($branch_name);
-	if ($_POST['customer_id'] == reserved_words::get_all())
-		label_cell($myrow["CustCurrCode"]);
-	display_debit_or_credit_cells(
-	    $myrow['type']==11 || $myrow['type']==12 || $myrow['type']==2 ?
-		-$myrow["TotalAmount"] : $myrow["TotalAmount"]);
-
-	echo $gl_trans_str;
-
-  	label_cell($edit_page=='' ? '' :	"<a href='$edit_page'>" . _('Edit') . '</a>');
-  	if ($myrow['type'] == 10 || $myrow['type'] == 11)
-  		label_cell(print_document_link($myrow['trans_no'], _("Print"), true, $myrow['type']));
-  	else
-  		label_cell("");
-
-	if ($credit_me_str != "")
-		label_cell($credit_me_str, "nowrap");
-	else
-		label_cell('');
-	end_row();
-
-	$j++;
-	if ($j == 12)
-	{
-		$j = 1;
-		table_header($th);
-	} //end of page full new headings if
-} //end of transaction while loop
-
-end_table(1);
-
-if ($over_due)
-	display_note(_("Marked items are overdue."), 0, 1, "class='overduefg'");
+if(get_post('RefreshInquiry'))
+{
+	$table->set_sql($sql);
+	$table->set_columns($cols);
+	$Ajax->activate('trans_tbl');
+	$Ajax->activate('totals_tbl');
+}
 
+	start_form();
+	display_db_pager($table);
+	end_form();
 end_page();
 
+
 ?>