Code cleanup.

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

diff --git a/sales/manage/customers.php b/sales/manage/customers.php
index dd77466b32efccf7c8feb12387af54eb7b42c400..e5ea837ab7228c08f75c2ca6d5efe089d31f4017 100644 (file)
--- a/sales/manage/customers.php
+++ b/sales/manage/customers.php
@@ -13,7 +13,7 @@ $page_security = 3;
 $path_to_root="../..";
 
 include_once($path_to_root . "/includes/session.inc");
-page(_("Customers")); 
+page(_("Customers"), @$_REQUEST['popup']); 
 
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/banking.inc");
@@ -87,6 +87,11 @@ function handle_submit()
             WHERE debtor_no = '". $_POST['customer_id'] . "'";
 
                db_query($sql,"The customer could not be updated");
+
+               update_record_status($_POST['customer_id'], $_POST['inactive'],
+                       'debtors_master', 'debtor_no');
+
+               $Ajax->activate('customer_id'); // in case of status change
                display_notification(_("Customer has been updated."));
        } 
        else 
@@ -122,13 +127,6 @@ if (isset($_POST['submit']))
 }
 //-------------------------------------------------------------------------------------------- 
 
-if (isset($_POST['select']))
-{
-       context_return(array('customer_id' => $_POST['customer_id'], 
-               'branch_id' => '')); // this fires customer history checks
-}
-//-------------------------------------------------------------------------------------------- 
-
 if (isset($_POST['delete'])) 
 {
 
@@ -137,8 +135,8 @@ if (isset($_POST['delete']))
        $cancel_delete = 0;
 
        // PREVENT DELETES IF DEPENDENT RECORDS IN 'debtor_trans'
-
-       $sql= "SELECT COUNT(*) FROM ".TB_PREF."debtor_trans WHERE debtor_no='" . $_POST['customer_id'] . "'";
+       $sel_id = db_escape($_POST['customer_id']);
+       $sql= "SELECT COUNT(*) FROM ".TB_PREF."debtor_trans WHERE debtor_no=$sel_id";
        $result = db_query($sql,"check failed");
        $myrow = db_fetch_row($result);
        if ($myrow[0] > 0) 
@@ -148,7 +146,7 @@ if (isset($_POST['delete']))
        } 
        else 
        {
-               $sql= "SELECT COUNT(*) FROM ".TB_PREF."sales_orders WHERE debtor_no='" . $_POST['customer_id'] . "'";
+               $sql= "SELECT COUNT(*) FROM ".TB_PREF."sales_orders WHERE debtor_no=$sel_id";
                $result = db_query($sql,"check failed");
                $myrow = db_fetch_row($result);
                if ($myrow[0] > 0) 
@@ -158,7 +156,7 @@ if (isset($_POST['delete']))
                } 
                else 
                {
-                       $sql = "SELECT COUNT(*) FROM ".TB_PREF."cust_branch WHERE debtor_no='" . $_POST['customer_id'] . "'";
+                       $sql = "SELECT COUNT(*) FROM ".TB_PREF."cust_branch WHERE debtor_no=$sel_id";
                        $result = db_query($sql,"check failed");
                        $myrow = db_fetch_row($result);
                        if ($myrow[0] > 0) 
@@ -172,7 +170,7 @@ if (isset($_POST['delete']))
        
        if ($cancel_delete == 0) 
        {       //ie not cancelled the delete as a result of above tests
-               $sql = "DELETE FROM ".TB_PREF."debtors_master WHERE debtor_no='" . $_POST['customer_id'] . "'";
+               $sql = "DELETE FROM ".TB_PREF."debtors_master WHERE debtor_no=$sel_id";
                db_query($sql,"cannot delete customer");
 
                display_notification(_("Selected customer has been deleted."));
@@ -189,19 +187,22 @@ start_form();
 if (db_has_customers()) 
 {
        start_table("class = 'tablestyle_noborder'");
-       customer_list_row(_("Select a customer: "), 'customer_id', null,
-         _('New customer'), true);
+       start_row();
+       customer_list_cells(_("Select a customer: "), 'customer_id', null,
+               _('New customer'), true, check_value('show_inactive'));
+       check_cells(_("Show inactive:"), 'show_inactive', null, true);
+       end_row();
        end_table();
+       if (get_post('_show_inactive_update')) {
+               $Ajax->activate('customer_id');
+               set_focus('customer_id');
+       }
 } 
 else 
 {
        hidden('customer_id');
 }
 
-start_outer_table($table_style2, 5);
-
-table_section(1);
-
 if ($new_customer) 
 {
        $_POST['CustName'] = $_POST['address'] = $_POST['tax_id']  = '';
@@ -214,11 +215,12 @@ if ($new_customer)
        $_POST['payment_terms']  = '';
        $_POST['discount']  = $_POST['pymt_discount'] = percent_format(0);
        $_POST['credit_limit']  = price_format(sys_prefs::default_credit_limit());
+       $_POST['inactive'] = 0;
 } 
 else 
 {
 
-       $sql = "SELECT * FROM ".TB_PREF."debtors_master WHERE debtor_no = '" . $_POST['customer_id'] . "'";
+       $sql = "SELECT * FROM ".TB_PREF."debtors_master WHERE debtor_no = ".db_escape($_POST['customer_id']);
        $result = db_query($sql,"check failed");
 
        $myrow = db_fetch($result);
@@ -236,8 +238,11 @@ else
        $_POST['discount']  = percent_format($myrow["discount"] * 100);
        $_POST['pymt_discount']  = percent_format($myrow["pymt_discount"] * 100);
        $_POST['credit_limit']  = price_format($myrow["credit_limit"]);
+       $_POST['inactive'] = $myrow["inactive"];
 }
 
+start_outer_table($table_style2, 5);
+table_section(1);
 table_section_title(_("Name and Address"));
 
 text_row(_("Customer Name:"), 'CustName', $_POST['CustName'], 40, 80);
@@ -256,12 +261,12 @@ else
        label_row(_("Customer's Currency:"), $_POST['curr_code']);
        hidden('curr_code', $_POST['curr_code']);                               
 }      
+sales_types_list_row(_("Sales Type/Price List:"), 'sales_type', $_POST['sales_type']);
 
 table_section(2);
 
 table_section_title(_("Sales"));
 
-sales_types_list_row(_("Sales Type/Price List:"), 'sales_type', $_POST['sales_type']);
 percent_row(_("Discount Percent:"), 'discount', $_POST['discount']);
 percent_row(_("Prompt Payment Discount Percent:"), 'pymt_discount', $_POST['pymt_discount']);
 amount_row(_("Credit Limit:"), 'credit_limit', $_POST['credit_limit']);
@@ -282,11 +287,13 @@ if (!$new_customer)  {
        start_row();
        echo '<td>'._('Customer branches').':</td>';
        hyperlink_params_td($path_to_root . "/sales/manage/customer_branches.php",
-               '<b>'. (count($_SESSION['Context']) ?  _("Select or &Add") : _("&Add or Edit ")).'</b>', 
-               "debtor_no=".$_POST['customer_id']);
+               '<b>'. (@$_REQUEST['popup'] ?  _("Select or &Add") : _("&Add or Edit ")).'</b>', 
+               "debtor_no=".$_POST['customer_id'].(@$_REQUEST['popup'] ? '&popup=1':''));
        end_row();
+
 }
 
+record_status_list_row(_("Customer status:"), 'inactive');
 end_outer_table(1);
 
 div_start('controls');
@@ -298,11 +305,12 @@ else
 {
        submit_center_first('submit', _("Update Customer"), 
          _('Update customer data'), true);
-       submit_return('select', _("Return"), _("Select this customer and return to document entry."), 'default');
+       submit_return('select', get_post('customer_id'), _("Select this customer and return to document entry."));
        submit_center_last('delete', _("Delete Customer"), 
          _('Delete customer data if have been never used'), true);
 }
 div_end();
+hidden('popup', @$_REQUEST['popup']);
 end_form();
 end_page();