X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fshipping_companies.php;h=f83fad5a7ee521d90c6cc363e79bfbcba7418666;hb=5a3cbfe6d2df1c8c32edcab8bf93e8a8432a15fc;hp=646e7b11c6c5ebba7ba2809c082ee14b422a00cd;hpb=54d84ff9a67620ab38c676cdbcf87853632724f0;p=fa-stable.git diff --git a/admin/shipping_companies.php b/admin/shipping_companies.php index 646e7b11..f83fad5a 100644 --- 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 . ***********************************************************************/ -$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 = ".db_escape($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=".db_escape($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=".db_escape($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=".db_escape($selected_id); - db_query($sql,"could not delete shipper"); + delete_shipper($selected_id); display_notification(_('Selected shipping company has been deleted')); } } @@ -99,16 +78,18 @@ if ($Mode == 'Delete') if ($Mode == 'RESET') { $selected_id = -1; + $sav = get_post('show_inactive'); unset($_POST); + $_POST['show_inactive'] = $sav; } //---------------------------------------------------------------------------------------------- -$sql = "SELECT * FROM ".TB_PREF."shippers 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); $k = 0; //row colour counter @@ -119,35 +100,32 @@ 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"]); - edit_button_cell("Edit".$myrow[0], _("Edit")); - delete_button_cell("Delete".$myrow[0], _("Delete")); + inactive_control_cell($myrow["shipper_id"], $myrow["inactive"], 'shippers', 'shipper_id'); + edit_button_cell("Edit".$myrow["shipper_id"], _("Edit")); + delete_button_cell("Delete".$myrow["shipper_id"], _("Delete")); end_row(); } -end_table(); -end_form(); -echo '
'; +inactive_control_row($th); +end_table(1); //---------------------------------------------------------------------------------------------- -start_form(); - -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=".db_escape($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); @@ -157,14 +135,15 @@ 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); end_table(1); -submit_add_or_update_center($selected_id == -1, '', true); +submit_add_or_update_center($selected_id == -1, '', 'both'); end_form(); end_page(); -?>