X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=order_lines_view.php;h=4129e15f1bad5ee681caed18e54d87a0c4c32b54;hb=a13270c348c41972ac58d852d4dfded3aa8ef441;hp=7f57e4f2da2ee7e0ab2a78cc81eead9e3a25cc6f;hpb=1f28540127f27edcea2eec24c87ef2b34401e5d7;p=order_line_extra.git

diff --git a/order_lines_view.php b/order_lines_view.php
index 7f57e4f..4129e15 100644
--- a/order_lines_view.php
+++ b/order_lines_view.php
@@ -15,160 +15,71 @@ include_once($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");
 include_once($path_to_root . "/reporting/includes/reporting.inc");
+
+include_once("includes/order_lines.inc");
+
 $page_security = 'SA_ORDERLINEX_EDIT';
 add_access_extensions();
 
-	$_POST['order_view_mode'] = "Quotations";
-	$_SESSION['page_title'] = _($help_context = "Edit lines extra parameters");
-
-if (!@$_GET['popup'])
-{
-	$js = "";
-	if ($use_popup_windows)
-		$js .= get_js_open_window(900, 600);
-	if ($use_date_picker)
-		$js .= get_js_date_picker();
-	page($_SESSION['page_title'], false, false, "", $js);
-/*
-*/
-}
-?>Hello<br><?php
+$_SESSION['page_title'] = _($help_context = "Edit lines extra parameters");
 
-
-if (isset($_GET['selected_customer']))
-{
-	$selected_customer = $_GET['selected_customer'];
-}
-elseif (isset($_POST['selected_customer']))
-{
-	$selected_customer = $_POST['selected_customer'];
-}
-else
-	$selected_customer = -1;
+$js = "";
+if ($use_popup_windows)
+	$js .= get_js_open_window(900, 600);
+if ($use_date_picker)
+	$js .= get_js_date_picker();
+page($_SESSION['page_title'], false, false, "", $js);
 
 //---------------------------------------------------------------------------------------------
 
-if (isset($_POST['SelectStockFromList']) && ($_POST['SelectStockFromList'] != "") &&
-	($_POST['SelectStockFromList'] != ALL_TEXT))
-{
- 	$selected_stock_item = $_POST['SelectStockFromList'];
-}
-else
-{
-	unset($selected_stock_item);
-}
-
-
-/*
-if (!@$_GET['popup'])
-	start_form();
-*/
+start_form();
 
 start_table(TABLESTYLE_NOBORDER);
 start_row();
-ref_cells(_("#:"), 'OrderNumber', '',null, '', true);
-ref_cells(_("Ref"), 'OrderReference', '',null, '', true);
-if ($show_dates)
-{
-  	date_cells(_("from:"), 'OrdersAfterDate', '', null, -30);
-  	date_cells(_("to:"), 'OrdersToDate', '', null, 1);
-}
-locations_list_cells(_("Location:"), 'StockLocation', null, true);
 
-if($show_dates) {
-	end_row();
-	end_table();
+customer_list_cells(_("Select a customer: "), 'customer_id', false, false, true);
+
 
-	start_table(TABLESTYLE_NOBORDER);
-	start_row();
-}
-stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true);
-if (!@$_GET['popup'])
-	customer_list_cells(_("Select a customer: "), 'customer_id', null, true);
-if ($trans_type == ST_SALESQUOTE)
-	check_cells(_("Show All:"), 'show_all');
 
-submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default');
-hidden('order_view_mode', $_POST['order_view_mode']);
-hidden('type', $trans_type);
+
+
+//submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default');
 
 end_row();
 
 end_table(1);
+
 //---------------------------------------------------------------------------------------------
 //	Orders inquiry table
 //
-$sql = get_sql_for_sales_orders_view($selected_customer, $trans_type, $_POST['OrderNumber'], $_POST['order_view_mode'],
-	@$selected_stock_item, @$_POST['OrdersAfterDate'], @$_POST['OrdersToDate'], @$_POST['OrderReference'], $_POST['StockLocation'], $_POST['customer_id']);
+$customer_id = $_POST['customer_id'];
+if(isset($customer_id)) {
+	$sql = get_order_details_extra($customer_id);
+
 
-if ($trans_type == ST_SALESORDER)
-	$cols = array(
-		_("Order #") => array('fun'=>'view_link'),
-		_("Ref"),
-		_("Customer"),
-		_("Branch"), 
-		_("Cust Order Ref"),
-		_("Order Date") => 'date',
-		_("Required By") =>array('type'=>'date', 'ord'=>''),
-		_("Delivery To"), 
-		_("Order Total") => array('type'=>'amount', 'ord'=>''),
-		'Type' => 'skip',
-		_("Currency") => array('align'=>'center')
-	);
-else
 	$cols = array(
-		_("Quote #") => array('fun'=>'view_link'),
-		_("Ref"),
-		_("Customer"),
-		_("Branch"), 
-		_("Cust Order Ref"),
-		_("Quote Date") => 'date',
-		_("Valid until") =>array('type'=>'date', 'ord'=>''),
-		_("Delivery To"), 
-		_("Quote Total") => array('type'=>'amount', 'ord'=>''),
-		'Type' => 'skip',
-		_("Currency") => array('align'=>'center')
+		'detail_id' => 'skip'
+	,	_("Order #") => array('fun'=>'view_link', 'ord' => '')
+	,_("Item Code") => array('ord' => '')
+		,_("Quantity") => array('type' => 'qty')
+,_("Required Date") => array('fun' => 'input_date_details')
+,_("Comment") => array('fun' => 'input_comment_details')
 	);
-if ($_POST['order_view_mode'] == 'OutstandingOnly') {
-	//array_substitute($cols, 4, 1, _("Cust Order Ref"));
-	array_append($cols, array(
-		array('insert'=>true, 'fun'=>'dispatch_link'),
-		array('insert'=>true, 'fun'=>'edit_link')));
-
-} elseif ($_POST['order_view_mode'] == 'InvoiceTemplates') {
-	array_substitute($cols, 4, 1, _("Description"));
-	array_append($cols, array( array('insert'=>true, 'fun'=>'invoice_link')));
-
-} else if ($_POST['order_view_mode'] == 'DeliveryTemplates') {
-	array_substitute($cols, 4, 1, _("Description"));
-	array_append($cols, array(
-			array('insert'=>true, 'fun'=>'delivery_link'))
-	);
-
-} elseif ($trans_type == ST_SALESQUOTE) {
-	 array_append($cols,array(
-					array('insert'=>true, 'fun'=>'edit_link'),
-					array('insert'=>true, 'fun'=>'order_link'),
-					array('insert'=>true, 'fun'=>'prt_link')));
-} elseif ($trans_type == ST_SALESORDER) {
-	 array_append($cols,array(
-			_("Tmpl") => array('insert'=>true, 'fun'=>'tmpl_checkbox'),
-					array('insert'=>true, 'fun'=>'edit_link'),
-					array('insert'=>true, 'fun'=>'prt_link')));
-};
+}
+else {
+}
 
 
 $table =& new_db_pager('orders_tbl', $sql, $cols);
-$table->set_marker('check_overdue', _("Marked items are overdue."));
 
 $table->width = "80%";
 
 display_db_pager($table);
-submit_center('Update', _("Update"), true, '', null);
 
-if (!@$_GET['popup'])
-{
+br(1);
+submit_center_first('Update', _("Update"), true, '', 'default', true);
+submit_center_last('Cancel', _("Cancel"), true, '', 'cancel', true);
+
 	end_form();
 	end_page();
-}
 ?>