X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fpayment_terms.php;fp=admin%2Fpayment_terms.php;h=1412c372c90c8bc5bb3b6b8b3542c2dc8de87cb6;hb=0e9e4cf4f01431531dfed299bb501955bb0818ed;hp=7c7afeff77e5b1aaba7b68974fba248f7d31b495;hpb=89e8ca2be9235215ac2e2bf5e58d7eedd2dda84d;p=fa-stable.git

diff --git a/admin/payment_terms.php b/admin/payment_terms.php
index 7c7afeff..1412c372 100644
--- a/admin/payment_terms.php
+++ b/admin/payment_terms.php
@@ -19,25 +19,6 @@ include($path_to_root . "/includes/ui.inc");
 
 simple_page_mode(true);
 
-//------------------------------
-//	Helper to translate record content to more intuitive form
-//
-function term_days($myrow)
-{
-	return $myrow["day_in_following_month"] != 0 ? $myrow["day_in_following_month"] :
-		$myrow["days_before_due"];
-}
-
-function term_type($myrow)
-{
-	if ($myrow["day_in_following_month"] != 0)
-		return PTT_FOLLOWING;
-
-	$days = $myrow["days_before_due"];
-
-	return $days < 0 ? PTT_PRE : ($days ? PTT_DAYS : PTT_CASH);
-}
-
 //-------------------------------------------------------------------------------------------
 
 if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') 
@@ -63,22 +44,15 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM')
 
 	if ($input_error != 1)
 	{
-		$type = get_post('type');
-		$days = input_num('DayNumber');
-		$from_now = ($type != PTT_FOLLOWING);
-		if ($type == PTT_CASH)
-			$days = 0;
-		if ($type == PTT_PRE)
-			$days = -1;
 
     	if ($selected_id != -1) 
     	{
-    		update_payment_terms($selected_id, $from_now, $_POST['terms'], $days); 
+    		update_payment_terms($selected_id, get_post('terms'), get_post('type'), input_num('DayNumber', 0)); 
  			$note = _('Selected payment terms have been updated');
     	} 
     	else 
     	{
-			add_payment_terms($from_now, $_POST['terms'], $days);
+			add_payment_terms(get_post('terms'), get_post('type'), input_num('DayNumber', 0));
 			$note = _('New payment terms have been added');
     	}
     	//run the sql from either of the above possibilites
@@ -131,16 +105,14 @@ table_header($th);
 $k = 0; //row colour counter
 while ($myrow = db_fetch($result)) 
 {
-
+	$days = $myrow['days'];
 	alt_table_row_color($k);
-	$type = term_type($myrow);
-	$days = term_days($myrow);
     label_cell($myrow["terms"]);
-    label_cell($pterm_types[$type]);
-    label_cell($type == PTT_DAYS ? "$days "._("days") : ($type == PTT_FOLLOWING ? $days : _("N/A")));
-	inactive_control_cell($myrow["terms_indicator"], $myrow["inactive"], 'payment_terms', "terms_indicator");
- 	edit_button_cell("Edit".$myrow["terms_indicator"], _("Edit"));
- 	delete_button_cell("Delete".$myrow["terms_indicator"], _("Delete"));
+    label_cell($pterm_types[$myrow['type']]);
+    label_cell($myrow['type'] == PTT_DAYS ? "$days "._("days") : ($myrow['type'] == PTT_FOLLOWING ? $days : _("N/A")));
+	inactive_control_cell($myrow["id"], $myrow["inactive"], 'payment_terms', "id");
+ 	edit_button_cell("Edit".$myrow["id"], _("Edit"));
+ 	delete_button_cell("Delete".$myrow["id"], _("Delete"));
     end_row();
 
 }
@@ -157,7 +129,6 @@ div_start('edits');
 
 start_table(TABLESTYLE2);
 
-$day_in_following_month = $days_before_due = 0;
 if ($selected_id != -1) 
 {
 	if ($Mode == 'Edit') {
@@ -165,8 +136,8 @@ if ($selected_id != -1)
 		$myrow = get_payment_terms($selected_id);
 
 		$_POST['terms']  = $myrow["terms"];
-		$_POST['DayNumber'] = term_days($myrow);
-		$_POST['type'] = term_type($myrow);
+		$_POST['type'] = $myrow['type'];
+		$_POST['DayNumber'] = $myrow['days'];
 	}
 	hidden('selected_id', $selected_id);
 }