X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=admin%2Fshipping_companies.php;h=720c526476affa2efaa25b48e671a591836e9371;hb=a39265e56d8242281a694fb619804c67388b13c5;hp=ec9f89536d93744df579f8c28963a36cdfa508cc;hpb=f00216978947d0fd076550f1969430265a270ce7;p=fa-stable.git

diff --git a/admin/shipping_companies.php b/admin/shipping_companies.php
index ec9f8953..720c5264 100644
--- a/admin/shipping_companies.php
+++ b/admin/shipping_companies.php
@@ -1,22 +1,21 @@
 <?php
-
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 $page_security = 14;
 $path_to_root="..";
 include($path_to_root . "/includes/session.inc");
 page(_("Shipping Company"));
 include($path_to_root . "/includes/ui.inc");
 
-
-if (isset($_GET['selected_id']))
-{
-	$selected_id = $_GET['selected_id'];
-} 
-else if (isset($_POST['selected_id']))
-{
-	$selected_id = $_POST['selected_id'];
-}
-
+simple_page_mode(true);
 //----------------------------------------------------------------------------------------------
 
 function can_process() 
@@ -31,8 +30,7 @@ function can_process()
 }
 
 //----------------------------------------------------------------------------------------------
-
-if (isset($_POST['ADD_ITEM']) && can_process()) 
+if ($Mode=='ADD_ITEM' && can_process()) 
 {
 
 	$sql = "INSERT INTO ".TB_PREF."shippers (shipper_name, contact, phone, address)
@@ -42,12 +40,13 @@ if (isset($_POST['ADD_ITEM']) && can_process())
 		db_escape($_POST['address']) . ")";
 
 	db_query($sql,"The Shipping Company could not be added");
-	meta_forward($_SERVER['PHP_SELF']);
+	display_notification(_('New shipping company has been added'));
+	$Mode = 'RESET';
 }
 
 //----------------------------------------------------------------------------------------------
 
-if (isset($_POST['UPDATE_ITEM']) && can_process()) 
+if ($Mode=='UPDATE_ITEM' && can_process()) 
 {
 
 	$sql = "UPDATE ".TB_PREF."shippers SET shipper_name=" . db_escape($_POST['shipper_name']). " ,
@@ -57,12 +56,13 @@ if (isset($_POST['UPDATE_ITEM']) && can_process())
 		WHERE shipper_id = $selected_id";
 
 	db_query($sql,"The shipping company could not be updated");
-	meta_forward($_SERVER['PHP_SELF']);
+	display_notification(_('Selected shipping company has been updated'));
+	$Mode = 'RESET';
 }
 
 //----------------------------------------------------------------------------------------------
 
-if (isset($_GET['delete']))
+if ($Mode == 'Delete')
 {
 // PREVENT DELETES IF DEPENDENT RECORDS IN 'sales_orders'
 
@@ -90,19 +90,30 @@ if (isset($_GET['delete']))
 		{
 			$sql="DELETE FROM ".TB_PREF."shippers WHERE shipper_id=$selected_id";
 			db_query($sql,"could not delete shipper");
-
-			meta_forward($_SERVER['PHP_SELF']);
+			display_notification(_('Selected shipping company has been deleted'));
 		}
 	}
+	$Mode = 'RESET';
 }
 
+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";
+$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");
 
+start_form();
 start_table($table_style);
 $th = array(_("Name"), _("Contact Person"), _("Phone Number"), _("Address"), "", "");
+inactive_control_column($th);
 table_header($th);
 
 $k = 0; //row colour counter
@@ -114,35 +125,34 @@ while ($myrow = db_fetch($result))
 	label_cell($myrow["contact"]);
 	label_cell($myrow["phone"]);
 	label_cell($myrow["address"]);
-    edit_link_cell("selected_id=".$myrow[0]);
-    delete_link_cell("selected_id=".$myrow[0]."&delete=1");
+	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();
+inactive_control_row($th);
+end_table(1);
 
 //----------------------------------------------------------------------------------------------
 
-hyperlink_no_params($_SERVER['PHP_SELF'], _("New Shipping Company"));
-
-start_form();
-
 start_table($table_style2);
 
-if (isset($selected_id)) 
+if ($selected_id != -1) 
 {
-	//editing an existing Shipper
+ 	if ($Mode == 'Edit') {
+		//editing an existing Shipper
 
-	$sql = "SELECT * FROM ".TB_PREF."shippers WHERE shipper_id=$selected_id";
+		$sql = "SELECT * FROM ".TB_PREF."shippers WHERE shipper_id=$selected_id";
 
-	$result = db_query($sql, "could not get shipper");
-	$myrow = db_fetch($result);
-
-	$_POST['shipper_name']	= $myrow["shipper_name"];
-	$_POST['contact']	= $myrow["contact"];
-	$_POST['phone']	= $myrow["phone"];
-	$_POST['address'] = $myrow["address"];
+		$result = db_query($sql, "could not get shipper");
+		$myrow = db_fetch($result);
 
+		$_POST['shipper_name']	= $myrow["shipper_name"];
+		$_POST['contact']	= $myrow["contact"];
+		$_POST['phone']	= $myrow["phone"];
+		$_POST['address'] = $myrow["address"];
+	}
 	hidden('selected_id', $selected_id);
 }
 
@@ -156,7 +166,7 @@ text_row_ex(_("Address:"), 'address', 50);
 
 end_table(1);
 
-submit_add_or_update_center(!isset($selected_id));
+submit_add_or_update_center($selected_id == -1, '', 'both');
 
 end_form();
 end_page();