X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fmanage%2Fsales_people.php;h=a6072ff893e56c1f468f7f78b1437dba444ccad5;hb=b1c79afd0a78ec37ff813f1305e9e0804be78ef3;hp=ff45e3e043ce9fb215c84ddaded95e25149d240a;hpb=2929f4274302269fcc09f23eb214a51c9d522adb;p=fa-stable.git

diff --git a/sales/manage/sales_people.php b/sales/manage/sales_people.php
index ff45e3e0..a6072ff8 100644
--- a/sales/manage/sales_people.php
+++ b/sales/manage/sales_people.php
@@ -8,18 +8,10 @@ page(_("Sales Persons"));
 
 include($path_to_root . "/includes/ui.inc");
 
-if (isset($_GET['selected_id']))
-{
-	$selected_id = strtoupper($_GET['selected_id']);
-}
-elseif (isset($_POST['selected_id']))
-{
-	$selected_id = strtoupper($_POST['selected_id']);
-}
-
+simple_page_mode(true);
 //------------------------------------------------------------------------------------------------
 
-if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM']))
+if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') 
 {
 
 	//initialise no input errors assumed initially before we test
@@ -29,6 +21,7 @@ if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM']))
 	{
 		$input_error = 1;
 		display_error(_("The sales person name cannot be empty."));
+		set_focus('salesman_name');
 	}
 	$pr1 = check_num('provision', 0,100);
 	if (!$pr1 || !check_num('provision2', 0, 100)) {
@@ -43,7 +36,7 @@ if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM']))
 	}
 	if ($input_error != 1)
 	{
-    	if (isset($selected_id))
+    	if ($selected_id != -1) 
     	{
     		/*selected_id could also exist if submit had not been clicked this code would not run in this case cos submit is false of course  see the delete code below*/
 
@@ -70,12 +63,15 @@ if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM']))
     	}
 
     	//run the sql from either of the above possibilites
-    	db_query($sql,"The insert or update of the salesperson failed");
-
-		meta_forward($_SERVER['PHP_SELF']);
+    	db_query($sql,"The insert or update of the sales person failed");
+    	if ($selected_id != -1) 
+			display_notification(_('Selected sales person data have been updated'));
+		else
+			display_notification(_('New sales person data have been added'));
+		$Mode = 'RESET';
 	}
 }
-if (isset($_GET['delete']))
+if ($Mode == 'Delete')
 {
 	//the link to delete a selected record was clicked instead of the submit button
 
@@ -92,16 +88,22 @@ if (isset($_GET['delete']))
 	{
 		$sql="DELETE FROM ".TB_PREF."salesman WHERE salesman_code='$selected_id'";
 		db_query($sql,"The sales-person could not be deleted");
-
-		meta_forward($_SERVER['PHP_SELF']);
+		display_notification(_('Selected sales person data have been deleted'));
 	}
+	$Mode = 'RESET';
 }
 
+if ($Mode == 'RESET')
+{
+	$selected_id = -1;
+	unset($_POST);
+}
 //------------------------------------------------------------------------------------------------
 
 $sql = "SELECT * FROM ".TB_PREF."salesman";
 $result = db_query($sql,"could not get sales persons");
 
+start_form();
 start_table("$table_style width=60%");
 $th = array(_("Name"), _("Phone"), _("Fax"), _("Email"), _("Provision"), _("Break Pt."), _("Provision")." 2", "", "");
 table_header($th);
@@ -120,39 +122,42 @@ while ($myrow = db_fetch($result))
 	label_cell(percent_format($myrow["provision"])." %", "nowrap align=right");
    	amount_cell($myrow["break_pt"]);
 	label_cell(percent_format($myrow["provision2"])." %", "nowrap align=right");
-	edit_link_cell(SID . "selected_id=" . $myrow["salesman_code"]);
-   	delete_link_cell(SID . "selected_id=" . $myrow["salesman_code"]. "&delete=1");
+ 	edit_button_cell("Edit".$myrow["salesman_code"], _("Edit"));
+ 	edit_button_cell("Delete".$myrow["salesman_code"], _("Delete"));
   	end_row();
 
 } //END WHILE LIST LOOP
 
 end_table();
-
-//------------------------------------------------------------------------------------------------
-
-hyperlink_no_params($_SERVER['PHP_SELF'], _("New Sales Person"));
+end_form();
+echo '<br>';
 
 //------------------------------------------------------------------------------------------------
 
 start_form();
 
-if (isset($selected_id))
+if ($selected_id != -1) 
 {
-	//editing an existing Sales-person
-	$sql = "SELECT *  FROM ".TB_PREF."salesman WHERE salesman_code='$selected_id'";
-
-	$result = db_query($sql,"could not get sales person");
-	$myrow = db_fetch($result);
-
-	$_POST['salesman_name'] = $myrow["salesman_name"];
-	$_POST['salesman_phone'] = $myrow["salesman_phone"];
-	$_POST['salesman_fax'] = $myrow["salesman_fax"];
-	$_POST['salesman_email'] = $myrow["salesman_email"];
-	$_POST['provision'] = percent_format($myrow["provision"]);
-	$_POST['break_pt'] = price_format($myrow["break_pt"]);
-	$_POST['provision2'] = percent_format($myrow["provision2"]);
-
+ 	if ($Mode == 'Edit') {
+		//editing an existing Sales-person
+		$sql = "SELECT *  FROM ".TB_PREF."salesman WHERE salesman_code='$selected_id'";
+
+		$result = db_query($sql,"could not get sales person");
+		$myrow = db_fetch($result);
+
+		$_POST['salesman_name'] = $myrow["salesman_name"];
+		$_POST['salesman_phone'] = $myrow["salesman_phone"];
+		$_POST['salesman_fax'] = $myrow["salesman_fax"];
+		$_POST['salesman_email'] = $myrow["salesman_email"];
+		$_POST['provision'] = percent_format($myrow["provision"]);
+		$_POST['break_pt'] = price_format($myrow["break_pt"]);
+		$_POST['provision2'] = percent_format($myrow["provision2"]);
+	}
 	hidden('selected_id', $selected_id);
+} elseif ($Mode != 'ADD_ITEM') {
+		$_POST['provision'] = percent_format(0);
+		$_POST['break_pt'] = price_format(0);
+		$_POST['provision2'] = percent_format(0);	
 }
 
 start_table("$table_style2 width=60%");
@@ -166,7 +171,7 @@ amount_row(_("Break Pt.:"), 'break_pt');
 percent_row(_("Provision")." 2:", 'provision2');
 end_table(1);
 
-submit_add_or_update_center(!isset($selected_id));
+submit_add_or_update_center($selected_id == -1, '', true);
 
 end_form();