Feature 5388: Print Invoices (documents) list gets too long. Fixed by default 180...

[fa-stable.git] / admin / shipping_companies.php

diff --git a/admin/shipping_companies.php b/admin/shipping_companies.php
index 720c526476affa2efaa25b48e671a591836e9371..f83fad5a7ee521d90c6cc363e79bfbcba7418666 100644 (file)
--- a/admin/shipping_companies.php
+++ b/admin/shipping_companies.php
@@ -9,11 +9,12 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = 14;
+$page_security = 'SA_SHIPPING';
 $path_to_root="..";
 include($path_to_root . "/includes/session.inc");
-page(_("Shipping Company"));
+page(_($help_context = "Shipping Company"));
 include($path_to_root . "/includes/ui.inc");
+include($path_to_root . "/admin/db/shipping_db.inc");
 
 simple_page_mode(true);
 //----------------------------------------------------------------------------------------------
@@ -32,14 +33,7 @@ function can_process()
 //----------------------------------------------------------------------------------------------
 if ($Mode=='ADD_ITEM' && can_process()) 
 {
-
-       $sql = "INSERT INTO ".TB_PREF."shippers (shipper_name, contact, phone, address)
-               VALUES (" . db_escape($_POST['shipper_name']) . ", " .
-               db_escape($_POST['contact']). ", " .
-               db_escape($_POST['phone']). ", " .
-               db_escape($_POST['address']) . ")";
-
-       db_query($sql,"The Shipping Company could not be added");
+       add_shipper($_POST['shipper_name'], $_POST['contact'], $_POST['phone'], $_POST['phone2'], $_POST['address']);
        display_notification(_('New shipping company has been added'));
        $Mode = 'RESET';
 }
@@ -48,14 +42,7 @@ if ($Mode=='ADD_ITEM' && can_process())
 
 if ($Mode=='UPDATE_ITEM' && can_process()) 
 {
-
-       $sql = "UPDATE ".TB_PREF."shippers SET shipper_name=" . db_escape($_POST['shipper_name']). " ,
-               contact =" . db_escape($_POST['contact']). " ,
-               phone =" . db_escape($_POST['phone']). " ,
-               address =" . db_escape($_POST['address']). "
-               WHERE shipper_id = $selected_id";
-
-       db_query($sql,"The shipping company could not be updated");
+       update_shipper($selected_id, $_POST['shipper_name'], $_POST['contact'], $_POST['phone'], $_POST['phone2'], $_POST['address']);
        display_notification(_('Selected shipping company has been updated'));
        $Mode = 'RESET';
 }
@@ -66,10 +53,7 @@ if ($Mode == 'Delete')
 {
 // PREVENT DELETES IF DEPENDENT RECORDS IN 'sales_orders'
 
-       $sql= "SELECT COUNT(*) FROM ".TB_PREF."sales_orders WHERE ship_via='$selected_id'";
-       $result = db_query($sql,"check failed");
-       $myrow = db_fetch_row($result);
-       if ($myrow[0] > 0) 
+       if (key_in_foreign_table($selected_id, 'sales_orders', 'ship_via'))
        {
                $cancel_delete = 1;
                display_error(_("Cannot delete this shipping company because sales orders have been created using this shipper."));
@@ -77,19 +61,14 @@ if ($Mode == 'Delete')
        else 
        {
                // PREVENT DELETES IF DEPENDENT RECORDS IN 'debtor_trans'
-
-               $sql= "SELECT COUNT(*) FROM ".TB_PREF."debtor_trans WHERE ship_via='$selected_id'";
-               $result = db_query($sql,"check failed");
-               $myrow = db_fetch_row($result);
-               if ($myrow[0] > 0) 
+               if (key_in_foreign_table($selected_id, 'debtor_trans', 'ship_via'))
                {
                        $cancel_delete = 1;
                        display_error(_("Cannot delete this shipping company because invoices have been created using this shipping company."));
                } 
                else 
                {
-                       $sql="DELETE FROM ".TB_PREF."shippers WHERE shipper_id=$selected_id";
-                       db_query($sql,"could not delete shipper");
+                       delete_shipper($selected_id);
                        display_notification(_('Selected shipping company has been deleted'));
                }
        }
@@ -105,14 +84,11 @@ if ($Mode == 'RESET')
 }
 //----------------------------------------------------------------------------------------------
 
-$sql = "SELECT * FROM ".TB_PREF."shippers";
-if (!check_value('show_inactive')) $sql .= " WHERE !inactive";
-$sql .= " ORDER BY shipper_id";
-$result = db_query($sql,"could not get shippers");
+$result = get_shippers(check_value('show_inactive'));
 
 start_form();
-start_table($table_style);
-$th = array(_("Name"), _("Contact Person"), _("Phone Number"), _("Address"), "", "");
+start_table(TABLESTYLE);
+$th = array(_("Name"), _("Contact Person"), _("Phone Number"), _("Secondary Phone"), _("Address"), "", "");
 inactive_control_column($th);
 table_header($th);
 
@@ -124,6 +100,7 @@ while ($myrow = db_fetch($result))
        label_cell($myrow["shipper_name"]);
        label_cell($myrow["contact"]);
        label_cell($myrow["phone"]);
+       label_cell($myrow["phone2"]);
        label_cell($myrow["address"]);
        inactive_control_cell($myrow["shipper_id"], $myrow["inactive"], 'shippers', 'shipper_id');
        edit_button_cell("Edit".$myrow["shipper_id"], _("Edit"));
@@ -136,21 +113,19 @@ end_table(1);
 
 //----------------------------------------------------------------------------------------------
 
-start_table($table_style2);
+start_table(TABLESTYLE2);
 
 if ($selected_id != -1) 
 {
        if ($Mode == 'Edit') {
                //editing an existing Shipper
 
-               $sql = "SELECT * FROM ".TB_PREF."shippers WHERE shipper_id=$selected_id";
-
-               $result = db_query($sql, "could not get shipper");
-               $myrow = db_fetch($result);
+               $myrow = get_shipper($selected_id);
 
                $_POST['shipper_name']  = $myrow["shipper_name"];
                $_POST['contact']       = $myrow["contact"];
                $_POST['phone'] = $myrow["phone"];
+               $_POST['phone2']        = $myrow["phone2"];
                $_POST['address'] = $myrow["address"];
        }
        hidden('selected_id', $selected_id);
@@ -160,7 +135,9 @@ text_row_ex(_("Name:"), 'shipper_name', 40);
 
 text_row_ex(_("Contact Person:"), 'contact', 30);
 
-text_row_ex(_("Phone Number:"), 'phone', 20);
+text_row_ex(_("Phone Number:"), 'phone', 32, 30);
+
+text_row_ex(_("Secondary Phone Number:"), 'phone2', 32, 30);
 
 text_row_ex(_("Address:"), 'address', 50);
 
@@ -170,4 +147,3 @@ submit_add_or_update_center($selected_id == -1, '', 'both');
 
 end_form();
 end_page();
-?>