[Frontaccounting-cvs_updates] frontaccount/admin view_print_transaction.php, 1.2.2.8, 1.2.2.9

[itronics <itr...@us...>]

Update of /cvsroot/frontaccounting/frontaccount/admin
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11671

Modified Files:
      Tag: unstable
	view_print_transaction.php 
Log Message:
Added table pager.


Index: view_print_transaction.php
===================================================================
RCS file: /cvsroot/frontaccounting/frontaccount/admin/view_print_transaction.php,v
retrieving revision 1.2.2.8
retrieving revision 1.2.2.9
diff -C2 -d -r1.2.2.8 -r1.2.2.9
*** view_print_transaction.php	25 Nov 2008 00:35:19 -0000	1.2.2.8
--- view_print_transaction.php	11 Jan 2009 20:05:03 -0000	1.2.2.9
***************
*** 13,16 ****
--- 13,17 ----
  $page_security = 5;
  
+ include($path_to_root . "/includes/db_pager.inc");
  include_once($path_to_root . "/includes/session.inc");
  
***************
*** 26,34 ****
  
  //----------------------------------------------------------------------------------------
  
  function viewing_controls()
  {
  	display_note(_("Only documents can be printed."));
-     start_form(false, true);
  
      start_table("class='tablestyle_noborder'");
--- 27,49 ----
  
  //----------------------------------------------------------------------------------------
+ function view_link($trans)
+ {
+ 	return get_trans_view_str($trans["type"], $trans["trans_no"]);
+ }
+ 
+ function prt_link($row)
+ {
+   	if ($row['type'] != 12 && $row['type'] != 2) // customer payment or bank deposit printout not defined yet.
+  		return print_document_link($row['trans_no'], _("Print"), true, $row['type'], ICON_PRINT);
+ }
+ 
+ function gl_view($row)
+ {
+ 	return get_gl_view_str($row["type"], $row["trans_no"]);
+ }
  
  function viewing_controls()
  {
  	display_note(_("Only documents can be printed."));
  
      start_table("class='tablestyle_noborder'");
***************
*** 51,55 ****
      end_table(1);
  
- 	end_form();
  }
  
--- 66,69 ----
***************
*** 92,157 ****
  		$trans_ref = $db_info[3];
  
! 		$sql = "SELECT DISTINCT $trans_no_name ";
  
  		if ($trans_ref)
  			$sql .= " ,$trans_ref ";
  
! 		$sql .= " FROM $table_name
  			WHERE $trans_no_name >= " . $_POST['FromTransNo']. "
  			AND  $trans_no_name <= " . $_POST['ToTransNo'];
  
  		if ($type_name != null)
! 			$sql .= " AND $type_name = " . $_POST['filterType'];
  
  		$sql .= " ORDER BY $trans_no_name";
  
- 		$result = db_query($sql, "could not query transactions on $table_name");
  
- 		if (db_num_rows($result) == 0)
- 		{
- 			display_notification(_("There are no transactions for the given parameters."));
- 			return;
- 		}
  		$print_type = $_POST['filterType'];
  		$print_out = ($print_type == 10 || $print_type == 11 || $print_type == systypes::cust_dispatch() ||
  			$print_type == systypes::po() || $print_type == systypes::sales_order());
! 		if ($print_out)
! 		{
! 			if ($trans_ref)
! 				$th = array(_("#"), _("Reference"), _("View"), _("Print"), _("GL"));
! 			else
! 				$th = array(_("#"), _("View"), _("Print"), _("GL"));
  		}
! 		else
! 		{
! 			if ($trans_ref)
! 				$th = array(_("#"), _("Reference"), _("View"), _("GL"));
! 			else
! 				$th = array(_("#"), _("View"), _("GL"));
  		}
- 		div_start('transactions');
- 		start_table($table_style);
- 		table_header($th);
- 		$k = 0;
- 		while ($line = db_fetch($result))
- 		{
- 
- 			alt_table_row_color($k);
- 
- 			label_cell($line[$trans_no_name]);
- 			if ($trans_ref)
- 				label_cell($line[$trans_ref]);
- 			label_cell(get_trans_view_str($_POST['filterType'],$line[$trans_no_name], _("View"), ICON_VIEW));
- 			if ($print_out)
- 				label_cell(print_document_link($line[$trans_no_name], _("Print"), true,	$print_type, ICON_PRINT));
-         	label_cell(get_gl_view_str($_POST['filterType'], $line[$trans_no_name]));
- 
- 	    	end_row();
  
  		}
! 
! 		end_table();
! 		div_end();
  	}
  }
  
--- 106,151 ----
  		$trans_ref = $db_info[3];
  
! 		$sql = "SELECT DISTINCT $trans_no_name as trans_no";
  
  		if ($trans_ref)
  			$sql .= " ,$trans_ref ";
  
! 		$sql .= ", ".$_POST['filterType']." as type FROM $table_name
  			WHERE $trans_no_name >= " . $_POST['FromTransNo']. "
  			AND  $trans_no_name <= " . $_POST['ToTransNo'];
  
  		if ($type_name != null)
! 			$sql .= " AND `$type_name` = " . $_POST['filterType'];
  
  		$sql .= " ORDER BY $trans_no_name";
  
  
  		$print_type = $_POST['filterType'];
  		$print_out = ($print_type == 10 || $print_type == 11 || $print_type == systypes::cust_dispatch() ||
  			$print_type == systypes::po() || $print_type == systypes::sales_order());
! 
! 		$cols = array(
! 			_("#"), 
! 			_("Reference"), 
! 			_("View") => array('insert'=>true, 'fun'=>'view_link'),
! 			_("Print") => array('insert'=>true, 'fun'=>'prt_link'), 
! 			_("GL") => array('insert'=>true, 'fun'=>'gl_view')
! 		);
! 		if(!$print_out) {
! 			array_remove($cols, 3);
  		}
! 		if(!$trans_ref) {
! 			array_remove($cols, 1);
  		}
  
+ 		$table =& new_db_pager('transactions', $sql, $cols);
+ 		if (list_updated('filterType')) {
+ 			$table->set_sql($sql);
+ 			$table->set_columns($cols);
  		}
! 		$table->width = "40%";
! 		display_db_pager($table);
  	}
+ 
  }
  
***************
*** 167,175 ****
  //----------------------------------------------------------------------------------------
  
! viewing_controls();
! 
! handle_search();
! 
! br(2);
  
  end_page();
--- 161,168 ----
  //----------------------------------------------------------------------------------------
  
! start_form(false, true);
! 	viewing_controls();
! 	handle_search();
! end_form(2);
  
  end_page();