Merged bugfixes since 2.0.6

[fa-stable.git] / includes / ui / items_cart.inc

diff --git a/includes/ui/items_cart.inc b/includes/ui/items_cart.inc
index fb2ac021694058ed01d676935ebb70fe15951122..8afd898103fb39ad8d3bae8c0b1df1974987d6fc 100644 (file)
--- 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 Affero General Public License,
+       AGPL, 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/agpl-3.0.html>.
+***********************************************************************/
 include_once($path_to_root . "/includes/prefs/sysprefs.inc");
 include_once($path_to_root . "/inventory/includes/inventory_db.inc");
 
@@ -67,7 +76,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()
@@ -83,6 +92,7 @@ class items_cart
                        if ($item_ret != null)
                                return $line_no;
                }
+               return -1;
        }
 
        // ----------- GL item functions
@@ -100,7 +110,7 @@ class items_cart
                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;
@@ -122,7 +132,7 @@ class items_cart
        {
                if (isset($index))
                {
-                       unset($this->gl_items[$index]);
+                       array_splice($this->gl_items, $line_no, 1);
                }
        }