Code cleanup.

[fa-stable.git] / sales / manage / customer_branches.php

diff --git a/sales/manage/customer_branches.php b/sales/manage/customer_branches.php
index 0e0fe1b9388cf9effbe48720e954bf3b2dcfa58b..e2a73af9007a1fd00426206f04598b0eade9b065 100644 (file)
--- a/sales/manage/customer_branches.php
+++ b/sales/manage/customer_branches.php
@@ -13,7 +13,7 @@ $page_security = 3;
 $path_to_root="../..";
 include($path_to_root . "/includes/session.inc");
 
-page(_("Customer Branches"));
+page(_("Customer Branches"), @$_REQUEST['popup']);
 
 include($path_to_root . "/includes/ui.inc");
 
@@ -40,17 +40,11 @@ $_POST['branch_code'] = $selected_id;
 
 if (isset($_GET['SelectedBranch']))
 {
-       $_POST['branch_code'] = strtoupper($_GET['SelectedBranch']);
-       $selected_id = $_GET['SelectedBranch'];
+       $br = get_branch($_GET['SelectedBranch']);
+       $_POST['customer_id'] = $br['debtor_no'];
+       $selected_id = $_POST['branch_code'] = $br['branch_code'];
+       $Mode = 'Edit';
 }
-
-$id = find_submit('Select');
-if ($id != -1)
-{
-       context_return(array('customer_id' => $_POST['customer_id'],
-               'branch_id' => $id)); // return to sales document
-}
-
 //-----------------------------------------------------------------------------------------------
 
 if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
@@ -168,7 +162,9 @@ if ($Mode == 'RESET' || get_post('_customer_id_update'))
 {
        $selected_id = -1;
        $cust_id = $_POST['customer_id'];
+       $inact = get_post('show_inactive');
        unset($_POST);
+       $_POST['show_inactive'] = $inact;
        $_POST['customer_id'] = $cust_id;
        $Ajax->activate('_page_body');
 }
@@ -176,7 +172,7 @@ start_form();
 
 echo "<center>" . _("Select a customer: ") . "&nbsp;&nbsp;";
 customer_list('customer_id', null, false, true);
-echo "</center><br><br>";
+echo "</center><br>";
 
 $num_branches = db_customer_has_branches($_POST['customer_id']);
 
@@ -191,13 +187,17 @@ if ($num_branches)
                AND ".TB_PREF."cust_branch.salesman=".TB_PREF."salesman.salesman_code
                AND ".TB_PREF."cust_branch.debtor_no = '" . $_POST['customer_id']. "'";
 
+       if (!check_value('show_inactive')) $sql .= " AND !".TB_PREF."cust_branch.inactive";
+
        $result = db_query($sql,"could not get customer branches");
 
        start_table("$table_style width=60%");
 
        $th = array(_("Name"), _("Contact"), _("Sales Person"), _("Area"),
                _("Phone No"), _("Fax No"), _("E-mail"), _("Tax Group"), "", "");
-       if (count($_SESSION['Context'])) $th[] = '';
+       inactive_control_column($th);
+       if (@$_REQUEST['popup']) $th[] = '';
+
        table_header($th);
 
        while ($myrow = db_fetch($result))
@@ -211,13 +211,16 @@ if ($num_branches)
                label_cell($myrow["fax"]);
                email_cell($myrow["email"]);
                label_cell($myrow["tax_group_name"]);
-               if (count($_SESSION['Context']))
-                       edit_button_cell("Select".$myrow["branch_code"], _("Select"));
+               inactive_control_cell($myrow["branch_code"], $myrow["inactive"],
+                       'cust_branch', 'branch_code');
+               if (@$_REQUEST['popup'])
+                       select_button_cell("Select".$myrow["branch_code"], $myrow["branch_code"], '');
                edit_button_cell("Edit".$myrow["branch_code"], _("Edit"));
                delete_button_cell("Delete".$myrow["branch_code"], _("Delete"));
                end_row();
        }
-       end_table();
+       inactive_control_row($th);
+       end_table(1);
        //END WHILE LIST LOOP
 }
 else
@@ -289,6 +292,7 @@ elseif ($Mode != 'ADD_ITEM')
 }
 hidden('selected_id', $selected_id);
 hidden('branch_code');
+hidden('popup', @$_REQUEST['popup']);
 
 table_section_title(_("Name and Contact"));