From: Janusz Dobrowolski Date: Tue, 4 Nov 2008 12:24:24 +0000 (+0000) Subject: Paged inquire result. X-Git-Tag: v2.4.2~19^2~1808 X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=cdc9bbadcd71cbf5ba09c62286b1f390f9805322;p=fa-stable.git Paged inquire result. --- diff --git a/sales/inquiry/sales_orders_view.php b/sales/inquiry/sales_orders_view.php index f1724ac4..d5c7f768 100644 --- a/sales/inquiry/sales_orders_view.php +++ b/sales/inquiry/sales_orders_view.php @@ -2,10 +2,11 @@ $page_security = 2; $path_to_root="../.."; -include($path_to_root . "/includes/session.inc"); include($path_to_root . "/sales/includes/sales_ui.inc"); +include($path_to_root . "/includes/db_pager.inc"); include_once($path_to_root . "/reporting/includes/reporting.inc"); +include($path_to_root . "/includes/session.inc"); $js = ""; if ($use_popup_windows) @@ -47,13 +48,101 @@ elseif (isset($_POST['selected_customer'])) else $selected_customer = -1; -//----------------------------------------------------------------------------------- -// Ajax updates +//--------------------------------------------------------------------------------------------- + +if (isset($_POST['SelectStockFromList']) && ($_POST['SelectStockFromList'] != "") && + ($_POST['SelectStockFromList'] != reserved_words::get_all())) +{ + $selected_stock_item = $_POST['SelectStockFromList']; +} +else +{ + unset($selected_stock_item); +} +//--------------------------------------------------------------------------------------------- +// Query format functions // -if (get_post('SearchOrders')) +function check_overdue($row) +{ + return ($row['type'] == 0 + && date1_greater_date2(Today(), sql2date($row['ord_date'])) + && ($row['TotDelivered'] < $row['TotQuantity'])); +} + +function view_link($order_no) +{ + return get_customer_trans_view_str(systypes::sales_order(), $order_no); +} + +function prt_link($row) +{ + return print_document_link($row['order_no'], _("Print"), true, 30); +} + +function edit_link($row) { + return pager_link( _("Edit"), + "/sales/sales_order_entry.php?" . SID . "ModifyOrderNumber=" . $row['order_no']); +} + +function dispatch_link($row) +{ + return pager_link( _("Dispatch"), + "/sales/customer_delivery.php?" . SID . "OrderNumber=" .$row['order_no']); +} + +function invoice_link($row) +{ + return pager_link( _("Invoice"), + "/sales/sales_order_entry.php?" . SID . "NewInvoice=" .$row["order_no"]); +} + +function delivery_link($row) +{ + return pager_link( _("Delivery"), + "/sales/sales_order_entry.php?" . SID . "NewDelivery=" .$row['order_no']); +} + +function tmpl_checkbox($row) +{ + $name = "chgtpl" .$row['order_no']; + $value = $row['type'] ? ' checked' : ''; + + return "" +// add also old checkbox name+value for check after 'Update' + ."\n"; +} +//--------------------------------------------------------------------------------------------- +// Update db record if respective checkbox value has changed. +// +function change_tpl_flag($id) +{ + global $Ajax; + + $sql = "UPDATE ".TB_PREF."sales_orders SET type = !type WHERE order_no=$id"; + + db_query($sql, "Can't change sales order type"); $Ajax->activate('orders_tbl'); -} elseif (get_post('_OrderNumber_changed')) +} + +$id = find_submit('_chgtpl'); +if ($id != -1) + change_tpl_flag($id); + +if (isset($_POST['Update'])) { + foreach($_POST['last'] as $id => $value) + if ($value != check_value('chgtpl'.$id)) + change_tpl_flag($id); +} + +//--------------------------------------------------------------------------------------------- +// Order range form +// +if (get_post('_OrderNumber_changed')) // enable/disable selection controls { $disable = get_post('OrderNumber') !== ''; @@ -94,71 +183,50 @@ hidden('order_view_mode', $_POST['order_view_mode']); end_row(); -end_table(); +end_table(1); end_form(); //--------------------------------------------------------------------------------------------- - -if (isset($_POST['SelectStockFromList']) && ($_POST['SelectStockFromList'] != "") && - ($_POST['SelectStockFromList'] != reserved_words::get_all())) -{ - $selected_stock_item = $_POST['SelectStockFromList']; -} -else -{ - unset($selected_stock_item); -} - -function change_tpl_flag($id) -{ - global $Ajax; - - $sql = "UPDATE ".TB_PREF."sales_orders SET type = !type WHERE order_no=$id"; - - db_query($sql, "Can't change sales order type"); - $Ajax->activate('orders_tbl'); -} -//--------------------------------------------------------------------------------------------- -$id = find_submit('_chgtpl'); -if ($id != -1) - change_tpl_flag($id); - -//--------------------------------------------------------------------------------------------- - -$sql = "SELECT ".TB_PREF."sales_orders.order_no, ".TB_PREF."debtors_master.curr_code, ".TB_PREF."debtors_master.name, ".TB_PREF."cust_branch.br_name, - ".TB_PREF."sales_orders.ord_date, ".TB_PREF."sales_orders.deliver_to, ".TB_PREF."sales_orders.delivery_date, - ".TB_PREF."sales_orders.type, "; -$sql .= " Sum(".TB_PREF."sales_order_details.qty_sent) AS TotDelivered, "; -$sql .= " Sum(".TB_PREF."sales_order_details.quantity) AS TotQuantity, "; -$sql .= " Sum(".TB_PREF."sales_order_details.unit_price*".TB_PREF."sales_order_details.quantity*(1-".TB_PREF."sales_order_details.discount_percent)) AS OrderValue, "; - -//if ($_POST['order_view_mode']=='InvoiceTemplates' || $_POST['order_view_mode']=='DeliveryTemplates') - $sql .= TB_PREF."sales_orders.comments, "; -//else - $sql .= TB_PREF."sales_orders.customer_ref"; - -$sql .= " FROM ".TB_PREF."sales_orders, ".TB_PREF."sales_order_details, ".TB_PREF."debtors_master, ".TB_PREF."cust_branch +// Orders inquiry table +// +$sql = "SELECT ".TB_PREF."sales_orders.order_no, " + .TB_PREF."debtors_master.name, " + .TB_PREF."cust_branch.br_name, " + .($_POST['order_view_mode']=='InvoiceTemplates' + || $_POST['order_view_mode']=='DeliveryTemplates' ? + TB_PREF."sales_orders.comments, " : TB_PREF."sales_orders.customer_ref, ") + .TB_PREF."sales_orders.ord_date, " + .TB_PREF."sales_orders.delivery_date, " + .TB_PREF."sales_orders.deliver_to, " + ." Sum(".TB_PREF."sales_order_details.unit_price*" + .TB_PREF."sales_order_details.quantity*(1-" + .TB_PREF."sales_order_details.discount_percent)) AS OrderValue, " + .TB_PREF."sales_orders.type, " + .TB_PREF."debtors_master.curr_code, " + ." Sum(".TB_PREF."sales_order_details.qty_sent) AS TotDelivered, " + ." Sum(".TB_PREF."sales_order_details.quantity) AS TotQuantity " + + ." FROM ".TB_PREF."sales_orders, ".TB_PREF."sales_order_details, ".TB_PREF."debtors_master, ".TB_PREF."cust_branch WHERE ".TB_PREF."sales_orders.order_no = ".TB_PREF."sales_order_details.order_no - AND ".TB_PREF."sales_orders.debtor_no = ".TB_PREF."debtors_master.debtor_no - AND ".TB_PREF."sales_orders.branch_code = ".TB_PREF."cust_branch.branch_code - AND ".TB_PREF."debtors_master.debtor_no = ".TB_PREF."cust_branch.debtor_no "; + AND ".TB_PREF."sales_orders.debtor_no = ".TB_PREF."debtors_master.debtor_no + AND ".TB_PREF."sales_orders.branch_code = ".TB_PREF."cust_branch.branch_code + AND ".TB_PREF."debtors_master.debtor_no = ".TB_PREF."cust_branch.debtor_no "; -//figure out the sql required from the inputs available if (isset($_POST['OrderNumber']) && $_POST['OrderNumber'] != "") { -// if ($_POST['OrderNumber'] != '*') // TODO paged table - $sql .= " AND ".TB_PREF."sales_orders.order_no LIKE '%". $_POST['OrderNumber'] ."'"; - $sql .= " GROUP BY ".TB_PREF."sales_orders.order_no"; + // search orders with number like ... + $sql .= " AND ".TB_PREF."sales_orders.order_no LIKE '%". $_POST['OrderNumber'] ."'" + ." GROUP BY ".TB_PREF."sales_orders.order_no"; } -else +else // ... or select inquiry constraints { if ($_POST['order_view_mode']!='DeliveryTemplates' && $_POST['order_view_mode']!='InvoiceTemplates') { $date_after = date2sql($_POST['OrdersAfterDate']); $date_before = date2sql($_POST['OrdersToDate']); - $sql .= " AND ".TB_PREF."sales_orders.ord_date >= '$date_after'"; - $sql .= " AND ".TB_PREF."sales_orders.ord_date <= '$date_before'"; + $sql .= " AND ".TB_PREF."sales_orders.ord_date >= '$date_after'" + ." AND ".TB_PREF."sales_orders.ord_date <= '$date_before'"; } if ($selected_customer != -1) $sql .= " AND ".TB_PREF."sales_orders.debtor_no='" . $selected_customer . "'"; @@ -174,116 +242,63 @@ else elseif ($_POST['order_view_mode']=='InvoiceTemplates' || $_POST['order_view_mode']=='DeliveryTemplates') $sql .= " AND ".TB_PREF."sales_orders.type=1"; - $sql .= " GROUP BY ".TB_PREF."sales_orders.order_no, ".TB_PREF."sales_orders.debtor_no, ".TB_PREF."sales_orders.branch_code, - ".TB_PREF."sales_orders.customer_ref, ".TB_PREF."sales_orders.ord_date, ".TB_PREF."sales_orders.deliver_to"; + $sql .= " GROUP BY ".TB_PREF."sales_orders.order_no, " + .TB_PREF."sales_orders.debtor_no, " + .TB_PREF."sales_orders.branch_code, " + .TB_PREF."sales_orders.customer_ref, " + .TB_PREF."sales_orders.ord_date, " + .TB_PREF."sales_orders.deliver_to"; +} + +$cols = array( + _("Order #") => array('type'=>'spec', 'fun'=>'view_link'), + _("Customer"), + _("Branch"), + _("Comments"), + _("Order Date") => 'date', + _("Required By") =>array('type'=>'date', 'ord'=>''), + _("Delivery To"), + _("Order Total") => array('type'=>'amount', 'ord'=>''), + 'Type' => 'skip', + _("Currency") +); + +if ($_POST['order_view_mode'] == 'OutstandingOnly') { + array_remove($cols, 4); + array_insert($cols, 4, _("Cust Order Ref")); + $cols += array('' => array('type'=>'insert', 'fun'=>'dispatch_link')); + +} elseif ($_POST['order_view_mode'] == 'InvoiceTemplates') { + array_remove($cols, 4); + array_insert($cols, 4, _("Description")); + $cols += array('' => array('type'=>'insert', 'fun'=>'invoice_link')); + +} else if ($_POST['order_view_mode'] == 'DeliveryTemplates') { + array_remove($cols, 4); + array_insert($cols, 4, _("Description")); + $cols += array('' => array('type'=>'insert', 'fun'=>'delivery_link')); + +} else { + $cols += array( + _("Tmpl") => array('type'=>'insert', 'fun'=>'tmpl_checkbox'), + array('type'=>'insert', 'fun'=>'edit_link'), + array('type'=>'insert', 'fun'=>'prt_link')); +}; + + +$table =& new_db_pager('orders_tbl', $sql, $cols); +$table->set_marker('check_overdue', _("Marked items are overdue.")); + -} //end not order number selected -$result = db_query($sql,"No orders were returned"); -//----------------------------------------------------------------------------------- -if ($result) +if (get_post('SearchOrders')) { + $table->set_sql($sql); + $Ajax->activate('orders_tbl'); +} start_form(); - /*show a table of the orders returned by the sql */ - div_start('orders_tbl'); - - start_table("$table_style colspan=6 width=95%"); - $th = array(_("Order #"), _("Customer"), _("Branch"), _("Cust Order #"), _("Order Date"), - _("Required By"), _("Delivery To"), _("Order Total"), _("Currency"), ""); - - if($_POST['order_view_mode']=='InvoiceTemplates' || $_POST['order_view_mode']=='DeliveryTemplates') - { - $th[3] = _('Description'); - } elseif ($_POST['order_view_mode'] != 'OutstandingOnly') { - $th[9] = _('Tmpl'); - $th[] =''; $th[] =''; - } - - table_header($th); - - $j = 1; - $k = 0; //row colour counter - $overdue_items = false; - while ($myrow = db_fetch($result)) - { - $view_page = get_customer_trans_view_str(systypes::sales_order(), $myrow["order_no"]); - $formated_del_date = sql2date($myrow["delivery_date"]); - $formated_order_date = sql2date($myrow["ord_date"]); - if (isset($_POST['Update']) && - check_value( "chgtpl".$myrow["order_no"]) != $myrow["type"]) { - change_tpl_flag($myrow["order_no"]); - $myrow['type'] = !$myrow['type']; - } -// $not_closed = $myrow['type'] && ($myrow["TotDelivered"] < $myrow["TotQuantity"]); - - // if overdue orders, then highlight as so. 2008-10-15 added totdelivered < totquantity as well for qualifying overdue - if ($myrow['type'] == 0 && date1_greater_date2(Today(), $formated_del_date) && ($myrow["TotDelivered"] < $myrow["TotQuantity"])) - { - start_row("class='overduebg'"); - $overdue_items = true; - } - else - { - alt_table_row_color($k); - } - - label_cell($view_page); - label_cell($myrow["name"]); - label_cell($myrow["br_name"]); - if($_POST['order_view_mode']=='InvoiceTemplates' || $_POST['order_view_mode']=='DeliveryTemplates') - label_cell($myrow["comments"]); - else - label_cell($myrow["customer_ref"]); - label_cell($formated_order_date); - label_cell($formated_del_date); - label_cell($myrow["deliver_to"]); - amount_cell($myrow["OrderValue"]); - label_cell($myrow["curr_code"]); - if ($_POST['order_view_mode']=='OutstandingOnly'/* || $not_closed*/) - { - $delivery_note = $path_to_root . "/sales/customer_delivery.php?" . SID . "OrderNumber=" .$myrow["order_no"]; - label_cell("" . _("Dispatch") . ""); - } - elseif ($_POST['order_view_mode']=='InvoiceTemplates') - { - $select_order= $path_to_root . "/sales/sales_order_entry.php?" . SID . "NewInvoice=" .$myrow["order_no"]; - label_cell("" . _("Invoice") . ""); - } - elseif ($_POST['order_view_mode']=='DeliveryTemplates') - { - $select_order= $path_to_root . "/sales/sales_order_entry.php?" . SID . "NewDelivery=" .$myrow["order_no"]; - label_cell("" . _("Delivery") . ""); - } - else - { - check_cells( null, "chgtpl" .$myrow["order_no"], $myrow["type"], true, - _('Set this order as a template for direct deliveries/invoices')); - - $modify_page = $path_to_root . "/sales/sales_order_entry.php?" . SID . "ModifyOrderNumber=" . $myrow["order_no"]; - label_cell("" . _("Edit") . ""); - label_cell(print_document_link($myrow['order_no'], _("Print"), true, 30)); - } - end_row();; - - $j++; - if ($j == 12) - { - $j = 1; - table_header($th); - } - //end of page full new headings if - } - //end of while loop - end_table(); - - if ($overdue_items) - display_note(_("Marked items are overdue."), 0, 1, "class='overduefg'"); - else - echo '
'; - div_end(); + display_db_pager($table); + submit_center('Update', _("Update"), true, '', null); end_form(); -} - -echo "
"; end_page(); ?> \ No newline at end of file