X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fcart_class.inc;h=286ada110dfad40eee5c2133c843f1e84eb6111d;hb=14402932d3256d0f89072d6d72516f6462830ce6;hp=46427af4cdc6492269df93ab7f7f61f22ace203e;hpb=c09be0dad6b05131e240349a375af7a4b7bf3444;p=fa-stable.git diff --git a/sales/includes/cart_class.inc b/sales/includes/cart_class.inc index 46427af4..286ada11 100644 --- a/sales/includes/cart_class.inc +++ b/sales/includes/cart_class.inc @@ -1,5 +1,14 @@ . +***********************************************************************/ /* Definition of the cart class this class can hold all the information for: @@ -17,7 +26,7 @@ class cart var $trans_type; // invoice, order, 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 @@ -66,7 +83,10 @@ class cart $this->line_items = array(); $this->sales_type = ""; $this->trans_type = 30; + $this->dimension_id = 0; + $this->dimension2_id = 0; $this->read($type, $trans_no, $view ); + $this->cart_id = uniqid(''); } //------------------------------------------------------------------------- @@ -75,17 +95,17 @@ 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 ($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; } } - } 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); @@ -111,12 +131,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; } } @@ -133,12 +155,46 @@ class cart 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) // 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()); } } @@ -166,15 +222,11 @@ class cart $this->trans_no = 0; $this->order_no= $this->trans_type==13 ? key($src->trans_no) : $src->order_no; } -// if we want to save old or derivative document first decode html entities -// from text fields. For new documents this is not needed. - if ($this->trans_no || $this->trans_type != 30) { - $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]->description = @html_entity_decode($line->description); - } + $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: @@ -191,11 +243,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; } @@ -244,8 +297,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; @@ -259,7 +314,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() @@ -403,6 +458,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;