X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fitems_cart.inc;h=a984c5c558ac14caceca260d197f9433ebf96807;hb=8c893a568ed275b1695b2f4df8cfda131a997a64;hp=a2d3e2d2e9a971494eee82baa76baa6d5de04872;hpb=c09be0dad6b05131e240349a375af7a4b7bf3444;p=fa-stable.git

diff --git a/includes/ui/items_cart.inc b/includes/ui/items_cart.inc
index a2d3e2d2..a984c5c5 100644
--- a/includes/ui/items_cart.inc
+++ b/includes/ui/items_cart.inc
@@ -1,5 +1,14 @@
 <?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>.
+***********************************************************************/
 include_once($path_to_root . "/includes/prefs/sysprefs.inc");
 include_once($path_to_root . "/inventory/includes/inventory_db.inc");
 
@@ -9,8 +18,6 @@ class items_cart
 	var $line_items;
 	var $gl_items;
 
-	var $gl_item_count;
-
 	var	$order_id;
 
 	var $editing_item, $deleting_item;
@@ -67,7 +74,7 @@ class items_cart
 
 	function remove_from_cart($line_no)
 	{
-			unset($this->line_items[$line_no]);
+		array_splice($this->line_items, $line_no, 1);
 	}
 
 	function count_items()
@@ -93,15 +100,13 @@ class items_cart
 		if (isset($code_id) && $code_id != "" && isset($amount) && isset($dimension_id)  &&
 			isset($dimension2_id))
 		{
-			$this->gl_items[$this->gl_item_count] = new gl_item($this->gl_item_count,
-				$code_id, $dimension_id, $dimension2_id, $amount, $reference, $description);
-			$this->gl_item_count++;
+			$this->gl_items[] = new gl_item($code_id, $dimension_id, $dimension2_id, $amount, $reference, $description);
 			return true;
 		}
 		else
 		{
 			// shouldn't come here under normal circumstances
-			display_db_error("unexpected - adding an invalid item or null quantity", "", true);
+			display_db_error("unexpected - invalid parameters in add_gl_item($code_id, $dimension_id, $dimension2_id, $amount,...)", "", true);
 		}
 
 		return false;
@@ -109,7 +114,6 @@ class items_cart
 
 	function update_gl_item($index, $dimension_id, $dimension2_id, $amount, $reference, $description=null)
 	{
-		$this->gl_items[$index]->index = $index;
 		$this->gl_items[$index]->dimension_id = $dimension_id;
 		$this->gl_items[$index]->dimension2_id = $dimension2_id;
 		$this->gl_items[$index]->amount = $amount;
@@ -121,10 +125,7 @@ class items_cart
 
 	function remove_gl_item($index)
 	{
-		if (isset($index))
-		{
-			unset($this->gl_items[$index]);
-		}
+		array_splice($this->gl_items, $index, 1);
 	}
 
 	function count_gl_items()
@@ -171,7 +172,6 @@ class items_cart
 
     	unset($this->gl_items);
 		$this->gl_items = array();
-		$this->gl_item_count = 1;
 
 	}
 }
@@ -245,7 +245,6 @@ class line_item
 class gl_item
 {
 
-	var $index;
 	var $code_id;
 	var $dimension_id;
 	var $dimension2_id;
@@ -253,7 +252,7 @@ class gl_item
 	var $reference;
 	var $description;
 
-	function gl_item($index, $code_id, $dimension_id, $dimension2_id, $amount, $reference,
+	function gl_item($code_id, $dimension_id, $dimension2_id, $amount, $reference,
 		$description=null)
 	{
 		//echo "adding $index, $code_id, $dimension_id, $amount, $reference<br>";
@@ -263,7 +262,6 @@ class gl_item
 		else
 			$this->description = $description;
 
-		$this->index = $index;
 		$this->code_id = $code_id;
 		$this->dimension_id = $dimension_id;
 		$this->dimension2_id = $dimension2_id;