X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fcart_class.inc;h=719f661733c058e8bc11c8dc5a5b400d3011ec7d;hb=0da4935c1fb5b588bfd7ead31f05069c9566eb8d;hp=38ffeba76be1147b2bb0dc9bff49cb59e741dfdf;hpb=b809585cf0244647799c9cecd52a380cb7ea32e0;p=fa-stable.git

diff --git a/sales/includes/cart_class.inc b/sales/includes/cart_class.inc
index 38ffeba7..719f6617 100644
--- a/sales/includes/cart_class.inc
+++ b/sales/includes/cart_class.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>.
+***********************************************************************/
 /* Definition of the cart class
 this class can hold all the information for:
 
@@ -14,10 +23,10 @@ include_once($path_to_root . "/taxes/tax_calc.inc");
 
 class cart
 {
-	var $trans_type; // invoice, order, delivery note ...
+	var $trans_type; // invoice, order, quotation, delivery note ...
 	var $trans_no = array();// array (num1=>ver1,..) or 0 for new
 	var $so_type = 0;		// for sales order: simple=0 template=1
-
+	var $cart_id;		// used to detect multi-tab edition conflits
 	var $line_items;  //array of objects of class line_details
 
 	var $src_docs = array();	// array of arrays(num1=>ver1,...) or 0 for no src
@@ -55,6 +64,14 @@ class cart
 	var $tax_group_name;
 	var $tax_group_array = null; // saves db queries
 	var $price_factor;	 // ditto for price calculations
+
+	var	$pos;			// user assigned POS
+	var $cash;			// cash transaction
+	var $cash_account;
+	var $account_name;
+	var $cash_discount;	// not used as of FA 2.1
+	var $dimension_id;
+	var $dimension2_id;
 	//-------------------------------------------------------------------------
 	//
 	//  $trans_no==0 => open new/direct document
@@ -65,8 +82,14 @@ class cart
 		/*Constructor function initialises a new shopping cart */
 		$this->line_items = array();
 		$this->sales_type = "";
-		$this->trans_type = 30;
+		if ($type == 32)
+			$this->trans_type = $type;
+		else	
+			$this->trans_type = 30;
+		$this->dimension_id = 0;
+		$this->dimension2_id = 0;
 		$this->read($type, $trans_no, $view );
+		$this->cart_id = uniqid('');
 	}
 
 	//-------------------------------------------------------------------------
@@ -75,21 +98,20 @@ class cart
 	function read($type, $trans_no = 0, $view=false ) {
 
 		if (!is_array($trans_no)) $trans_no = array($trans_no);
-
 		if ($trans_no[0]) {
-			if ($type == 30) { // sales order
-				read_sales_order($trans_no[0], $this);
+			if ($type == 30 || $type == 32) { // sales order || sales quotation
+				read_sales_order($trans_no[0], $this, $type);
 				if ($view) {	// prepare for DN/IV entry
 					for($line_no = 0; $line_no < count($this->line_items); $line_no++) {
 						$line = &$this->line_items[$line_no];
+						$line->src_id = $line->id; // save src line ids for update
 						$line->qty_dispatched = $line->quantity - $line->qty_done;
 					}
-					$this->document_date = Today();
 				}
-				} else {	// derivative transaction
+			} else {	// derivative transaction
 					read_sales_trans($type, $trans_no, $this);
 					if ($this->order_no) { // free hand credit notes have no order_no
-						$sodata = get_sales_order_header($this->order_no);
+						$sodata = get_sales_order_header($this->order_no, 30);
 						$this->cust_ref = $sodata["customer_ref"];
 					// currently currency is hard linked to debtor account
 					//	$this->customer_currency = $sodata["curr_code"];
@@ -101,7 +123,7 @@ class cart
 						$src_details = 0;
 						if ($src_type == 30) { // get src data from sales_orders
 							$this->src_docs = array( $sodata['order_no']=>$sodata['version']);
-							$srcdetails = get_sales_order_details($this->order_no);
+							$srcdetails = get_sales_order_details($this->order_no, 30);
 						} else {	// get src_data from debtor_trans
 							$this->src_docs = get_customer_trans_version($src_type, get_parent_trans($type,$trans_no[0]));
 							$srcdetails = get_customer_trans_details($src_type,array_keys($this->src_docs));
@@ -112,12 +134,14 @@ class cart
 							$sign = 1; // $type==13 ?  1 : -1; // this is strange debtor_trans atavism
 							$line = &$this->line_items[$line_no];
 
+							$line->src_id = $srcline['id']; // save src line ids for update
 							$line->qty_old = $line->qty_dispatched = $line->quantity;
 							$line->quantity += $sign * ($srcline['quantity'] - $srcline['qty_done']); // add free qty on src doc
 						}
 					} else {
 						for($line_no = 0; $line_no < count($this->line_items); $line_no++) {
 							$line = &$this->line_items[$line_no];
+							$line->src_id = $line->id; // save src line ids for update
 							$line->qty_dispatched = $line->quantity;
 						}
 					}
@@ -130,16 +154,50 @@ class cart
 				  $this->customer_id = get_global_customer();
 				else
 				  $this->customer_id = '';
-				$this->document_date = Today();
+				$this->document_date = 	new_doc_date();
 				if (!is_date_in_fiscalyear($this->document_date))
 					$this->document_date = end_fiscalyear();
 				$this->reference = references::get_next($this->trans_type);
-				if ($type == 10)
+				if ($type != 30 && $type != 32) // Added 2.1 Joe Hunt 2008-11-12
+				{
+					$dim = get_company_pref('use_dimension');
+					if ($dim > 0)
+					{
+						if ($this->customer_id == '')
+							$this->dimension_id = 0;
+						else
+						{
+							$cust = get_customer($this->customer_id);
+							$this->dimension_id = $cust['dimension_id'];
+						}	
+						if ($dim > 1)
+						{
+							if ($this->customer_id == '')
+								$this->dimension2_id = 0;
+							else
+								$this->dimension2_id = $cust['dimension2_id'];
+						}		
+					}		
+				}	
+				if ($type == 10) {
 				  $this->due_date =
 					get_invoice_duedate($this->customer_id, $this->document_date);
-				else
+				  $this->pos = user_pos();
+				  $pos = get_sales_point($this->pos);
+				  $this->cash = !$pos['credit_sale'];
+				  if (!$pos['cash_sale'] || !$pos['credit_sale']) 
+				  	$this->pos = -1; // mark not editable payment type
+				  else
+					$this->cash = date_diff($this->due_date, Today(), 'd')<2;
+				if ($this->cash) {
+					$this->Location = $pos['pos_location'];
+					$this->location_name = $pos['location_name'];
+					$this->cash_account = $pos['pos_account'];
+					$this->account_name = $pos['bank_account_name'];
+				}
+				} else
 				  $this->due_date =
-					add_days($this->document_date, 10); // FIX this should be in company prefs
+					add_days($this->document_date, sys_prefs::default_delivery_required_by());
 			}
 	}
 
@@ -155,17 +213,24 @@ class cart
 			$src->reference = 'auto';
 
 			$src->write(1);
-
 			$type = $this->trans_type;
 			$ref = $this->reference;
+			$date = $this->document_date;
 			// re-read document
 			$this->read($src->trans_type, key($src->trans_no), true);
+			$this->document_date = $date;
 			$this->reference = $ref;
 			$this->trans_type = $type;
 			$this->src_docs= $this->trans_no;
 			$this->trans_no = 0;
 			$this->order_no= $this->trans_type==13 ? key($src->trans_no) : $src->order_no;
 		}
+		$this->reference = @html_entity_decode($this->reference);
+		$this->Comments = @html_entity_decode($this->Comments);
+		foreach($this->line_items as $lineno => $line) {
+			$this->line_items[$lineno]->stock_id = @html_entity_decode($line->stock_id);
+			$this->line_items[$lineno]->item_description = @html_entity_decode($line->item_description);
+		}
 		switch($this->trans_type) {
 			case 10:
 				return write_sales_invoice($this);
@@ -174,6 +239,7 @@ class cart
 			case 13:
 				return write_sales_delivery($this, $policy);
 			case 30:
+			case 32:
 				if ($this->trans_no==0)	// new document
 					return add_sales_order($this);
 				else
@@ -181,11 +247,12 @@ class cart
 		}
 	}
 
-	function set_customer($customer_id, $customer_name, $currency, $discount)
+	function set_customer($customer_id, $customer_name, $currency, $discount, $cdiscount=0)
 	{
 		$this->customer_name = $customer_name;
 		$this->customer_id = $customer_id;
 		$this->default_discount = $discount;
+		$this->cash_discount = $cdiscount;
 		$this->customer_currency = $currency;
 	}
 
@@ -234,8 +301,10 @@ class cart
 		return 0;
 	}
 
-	function update_cart_item($line_no, $qty, $price, $disc)
+	function update_cart_item($line_no, $qty, $price, $disc, $description="")
 	{
+		if ($description != "")
+			$this->line_items[$line_no]->item_description = $description;
 		$this->line_items[$line_no]->quantity = $qty;
 		$this->line_items[$line_no]->qty_dispatched = $qty;
 		$this->line_items[$line_no]->price = $price;
@@ -249,7 +318,7 @@ class cart
 
 	function remove_from_cart($line_no)
 	{
-		unset($this->line_items[$line_no]);
+		array_splice($this->line_items, $line_no, 1);
 	}
 
 	function clear_items()
@@ -393,6 +462,7 @@ class line_details
 	var $tax_type;
 	var $tax_type_name;
 	var $src_no;	// number of src doc for this line
+	var $src_id;
 	var $quantity;
 	var $price;
 	var $discount_percent;