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

diff --git a/order_lines_view.php b/order_lines_view.php
index 7f57e4f..362b3f0 100644
--- a/order_lines_view.php
+++ b/order_lines_view.php
@@ -15,160 +15,138 @@ 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");
 
+// Process POST
+update_extra_order_details();
+split_order_details();
 
-if (isset($_GET['selected_customer']))
-{
-	$selected_customer = $_GET['selected_customer'];
-}
-elseif (isset($_POST['selected_customer']))
-{
-	$selected_customer = $_POST['selected_customer'];
-}
-else
-	$selected_customer = -1;
 
-//---------------------------------------------------------------------------------------------
-
-if (isset($_POST['SelectStockFromList']) && ($_POST['SelectStockFromList'] != "") &&
-	($_POST['SelectStockFromList'] != ALL_TEXT))
-{
- 	$selected_stock_item = $_POST['SelectStockFromList'];
-}
-else
-{
-	unset($selected_stock_item);
-}
+$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 (!@$_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();
 
-	start_table(TABLESTYLE_NOBORDER);
-	start_row();
+if(!isset($_POST['customer_id'])) {
+	if(isset($_GET['customer_id'])) {
+		$customer_id = $_GET['customer_id'];
+		$_POST['customer_id'] = $customer_id;
+	}
+else $customer_id = null;
+
 }
-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');
+else {
+	$customer_id = $_POST['customer_id'];
+}
+customer_list_cells(_("Select a customer: "), 'customer_id', $customer_id, true, true);
+
 
-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']);
-
-if ($trans_type == ST_SALESORDER)
+if($customer_id) {
+	$sql = get_order_details_extra($customer_id, 'DEF');
 	$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')
+		'detail_id' => 'skip'
+		,	_("Order #") => array('fun'=>'view_link', 'ord' => '')
+		,_("Item Code") => array('ord' => '', 'fun' => 'item_link')
+		,_("Quantity") => array('type' => 'qty', 'dec' => 0)
+		,_("Available") => array('fun' => 'available_quantity', 'dec' => 0, 'ord' => '')
+		,_("Before") => 'skip'
+		,_("Priority") => array('fun' => 'input_priority_date_details', 'ord' => '')
+		,_("Hold Until") => array('fun' => 'input_hold_until_date_details', 'ord' => '')
+		,_("Require By") => array('fun' => 'input_required_date_details', 'ord' => '')
+		,_("Expiry Date") => array('fun' => 'input_expiry_date_details', 'ord' => '')
+	,_("Comment") => array('fun' => 'input_comment_details', 'ord' => '')
 	);
-else
+}
+else {
+	$sql = get_order_summary('DEF');
 	$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')
-	);
-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'))
+	'customer id' => 'skip',
+_("Customer") => array('ord' => '', 'fun' => 'customer_link'),
+_("Branch") => array('ord' => ''),
+_("Delivery Date") => array('ord' => '', 'type' => 'date'),
+_("Quantity") => array('ord' => '', 'type' => 'qty', 'dec' => 0),
+_("Amount") => array('ord' => '', 'type' => 'amount'),
+_("Avail. Q") => array('ord' => '', 'type' => 'qty', 'dec' => 0),
+_("Avail. A") => array('ord' => '', 'type' => 'amount', 'dec' => 0),
+_("required date") => array('ord' => '', 'type' => 'date'),
+_("Comments") => array('ord' => '', 'fun' => 'aggregate_comment'),
+_("comment 2 ") =>  'skip'
 	);
-
-} 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')));
-};
+}
 
 
 $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'])
-{
+function display_split_area() {
+start_table(TABLESTYLE_NOBORDER);
+date_cells('Start', 'name', 'title');
+date_cells('End', 'name', 'title');
+qty_cells('Max', 'huu', 6);
+submit_cells('Split', 'Split');
+end_table();
+
+}
+display_split_area();
+
+
+br(1);
+submit_center_first('Update', _("Update"), '', 'default', false);
+submit_center_last('Cancel', _("Cancel"), '', 'cancel', false);
+
 	end_form();
 	end_page();
-}
 ?>
+<style>
+span.tooltip{ display:none;}
+span.tooltip {
+      position: absolute;
+			right: -0px;
+			top: 20px;
+      width: 200px;
+      color: rgb(113, 157, 171);
+      background: rgb(255, 255, 255);
+      border: 1px solid rgb(113, 157, 171);
+}
+
+:hover > span.tooltip, span.tooltip:hover {
+	display: inline;
+}
+span.before-tooltip {
+	color: #800;
+	font-style: italic;
+	position: relative;
+}
+
+</style>