X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fcart_class.inc;h=3566d686ff14bdd4c2bb82ee91d9b686d9da9f66;hb=5088ee92669272ebac6f1bd1acebc05fe382829f;hp=1f54a613b487ef5f065ff1350010a4131187c00e;hpb=e1c22a904052bae141ace1ebdaaf2b81d9111139;p=fa-stable.git diff --git a/sales/includes/cart_class.inc b/sales/includes/cart_class.inc index 1f54a613..3566d686 100644 --- a/sales/includes/cart_class.inc +++ b/sales/includes/cart_class.inc @@ -1,13 +1,13 @@ . + See the License here . ***********************************************************************/ /* Definition of the cart class this class can hold all the information for: @@ -23,7 +23,7 @@ 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 @@ -66,12 +66,14 @@ class cart var $price_factor; // ditto for price calculations var $pos; // user assigned POS - var $cash; // cash transaction + var $cash; // cash transaction - helper variable not stored in db var $cash_account; var $account_name; var $cash_discount; // not used as of FA 2.1 var $dimension_id; var $dimension2_id; + var $payment; + var $payment_terms; // cached payment terms //------------------------------------------------------------------------- // // $trans_no==0 => open new/direct document @@ -82,7 +84,10 @@ class cart /*Constructor function initialises a new shopping cart */ $this->line_items = array(); $this->sales_type = ""; - $this->trans_type = 30; + if ($type == ST_SALESQUOTE) + $this->trans_type = $type; + else + $this->trans_type = ST_SALESORDER; $this->dimension_id = 0; $this->dimension2_id = 0; $this->read($type, $trans_no, $view ); @@ -94,10 +99,13 @@ class cart // function read($type, $trans_no = 0, $view=false ) { + global $SysPrefs, $Refs; + 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 ($trans_no[0]) // read old transaction + { + if ($type == ST_SALESORDER || $type == ST_SALESQUOTE) { // 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]; @@ -105,28 +113,27 @@ class cart $line->qty_dispatched = $line->quantity - $line->qty_done; } } - } else { // derivative transaction + } else { // other type of sales 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, ST_SALESORDER); $this->cust_ref = $sodata["customer_ref"]; // currently currency is hard linked to debtor account // $this->customer_currency = $sodata["curr_code"]; $this->delivery_to = $sodata["deliver_to"]; $this->delivery_address = $sodata["delivery_address"]; } - if (!$view && ($type!=11 || $this->trans_link!=0)) { + // old derivative transaction edit + if (!$view && ($type!=ST_CUSTCREDIT || $this->trans_link!=0)) { $src_type = get_parent_type($type); - $src_details = 0; - if ($src_type == 30) { // get src data from sales_orders + if ($src_type == ST_SALESORDER) { // 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, ST_SALESORDER); } 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)); } // calculate & save: qtys on other docs and free qtys on src doc - $line_no = 0; for($line_no = 0; $srcline = db_fetch($srcdetails); $line_no++) { $sign = 1; // $type==13 ? 1 : -1; // this is strange debtor_trans atavism $line = &$this->line_items[$line_no]; @@ -135,27 +142,28 @@ class cart $line->qty_old = $line->qty_dispatched = $line->quantity; $line->quantity += $sign * ($srcline['quantity'] - $srcline['qty_done']); // add free qty on src doc } - } else { + } else { // prepare qtys for derivative document entry (not used in display) 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_dispatched = $line->quantity - $line->qty_done; } } } - } else { + } else { // new document $this->trans_type = $type; $this->trans_no = 0; + $this->customer_currency = get_company_currency(); // set new sales document defaults here - if (get_global_customer() != reserved_words::get_all()) + if (get_global_customer() != ALL_TEXT) $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 != 30) // Added 2.1 Joe Hunt 2008-11-12 + $this->reference = $Refs->get_next($this->trans_type); + if ($type != ST_SALESORDER && $type != ST_SALESQUOTE) // Added 2.1 Joe Hunt 2008-11-12 { $dim = get_company_pref('use_dimension'); if ($dim > 0) @@ -176,26 +184,24 @@ class cart } } } - if ($type == 10) { - $this->due_date = - get_invoice_duedate($this->customer_id, $this->document_date); - $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']; - } + if ($type == ST_SALESINVOICE) { + $this->due_date = + get_invoice_duedate($this->payment, $this->document_date); + $this->cash = $this->payment_terms['cash_sale']; + 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, sys_prefs::default_delivery_required_by()); + $this->due_date = + add_days($this->document_date, $SysPrefs->default_delivery_required_by()); } + $this->pos = user_pos(); + $pos = get_sales_point($this->pos); + if (!$pos['cash_sale'] && !$pos['credit_sale']) + $this->pos = -1; // mark not editable payment type } //------------------------------------------------------------------------- @@ -203,7 +209,8 @@ class cart // Makes parent documents for direct delivery/invoice by recurent call. // $policy - 0 or 1: writeoff/return for IV, back order/cancel for DN function write($policy=0) { - if (count($this->src_docs) == 0 && ($this->trans_type == 10 || $this->trans_type == 13)) { + begin_transaction(); // prevents partial database changes in case of direct delivery/invoice + if (count($this->src_docs) == 0 && ($this->trans_type == ST_SALESINVOICE || $this->trans_type == ST_CUSTDELIVERY)) { // this is direct document - first add parent $src = (PHP_VERSION<5) ? $this : clone( $this ); // make local copy of this cart $src->trans_type = get_parent_type($src->trans_type); @@ -220,40 +227,42 @@ class cart $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->order_no= $this->trans_type==ST_CUSTDELIVERY ? 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, ENT_QUOTES); + $this->Comments = @html_entity_decode($this->Comments, ENT_QUOTES); + foreach($this->line_items as $lineno => $line) { + $this->line_items[$lineno]->stock_id = @html_entity_decode($line->stock_id, ENT_QUOTES); + $this->line_items[$lineno]->item_description = @html_entity_decode($line->item_description, ENT_QUOTES); } switch($this->trans_type) { - case 10: - return write_sales_invoice($this); - case 11: - return write_credit_note($this, $policy); - case 13: - return write_sales_delivery($this, $policy); - case 30: + case ST_SALESINVOICE: + write_sales_invoice($this); break; + case ST_CUSTCREDIT: + write_credit_note($this, $policy); break; + case ST_CUSTDELIVERY: + write_sales_delivery($this, $policy); break; + case ST_SALESORDER: + case ST_SALESQUOTE: if ($this->trans_no==0) // new document - return add_sales_order($this); + add_sales_order($this); else - return update_sales_order($this); + update_sales_order($this); } + + commit_transaction(); } - function set_customer($customer_id, $customer_name, $currency, $discount, $cdiscount=0) + function set_customer($customer_id, $customer_name, $currency, $discount, $payment, $cdiscount=0) { $this->customer_name = $customer_name; $this->customer_id = $customer_id; $this->default_discount = $discount; - $this->cash_discount = $cdiscount; $this->customer_currency = $currency; + $this->payment = $payment; + $this->payment_terms = get_payment_terms($payment); + $this->cash = $this->payment_terms['cash_sale']; + $this->cash_discount = $cdiscount; } function set_branch($branch_id, $tax_group_id, $tax_group_name, $phone='', $email='') @@ -288,16 +297,16 @@ class cart $this->freight_cost = $freight_cost; } - function add_to_cart($line_no,$stock_id, $qty, $price, $disc, $qty_done=0, $standard_cost=0, $description=null, $id=0, $src_no=0) + function add_to_cart($line_no, $stock_id, $qty, $price, $disc, $qty_done=0, $standard_cost=0, $description=null, $id=0, $src_no=0) { - if (isset($stock_id) && $stock_id != "" && isset($qty)/* && $qty > 0*/) { - $this->line_items[$line_no] = new line_details($stock_id, $qty, $price, $disc, - $qty_done, $standard_cost, $description, $id, $src_no); + $line = new line_details($stock_id, $qty, $price, $disc, + $qty_done, $standard_cost, $description, $id, $src_no); + + if ($line->valid) { + $this->line_items[$line_no] = $line; return 1; - } else { - // shouldn't come here under normal circumstances - display_db_error("unexpected - adding an invalid item or null quantity", "", true); - } + } else + display_error(_("You have to enter valid stock code or nonempty description")); return 0; } @@ -470,6 +479,9 @@ class line_details var $qty_dispatched; // quantity selected to process var $qty_old=0; // quantity dispatched before edition var $standard_cost; + var $descr_editable; + + var $valid; // validation in constructor function line_details ($stock_id, $qty, $prc, $disc_percent, $qty_done, $standard_cost, $description, $id=0, $src_no=0 ) @@ -480,19 +492,19 @@ class line_details $this->src_no = $src_no; $item_row = get_item($stock_id); - if ($item_row == null) - display_db_error("invalid item added to order : $stock_id", ""); - + if (!$item_row) + return; + $this->mb_flag = $item_row["mb_flag"]; $this->units = $item_row["units"]; - if ($description == null) + $this->descr_editable = $item_row["editable"]; + if ($description == null || !$this->descr_editable) $this->item_description = $item_row["description"]; else $this->item_description = $description; //$this->standard_cost = $item_row["material_cost"] + $item_row["labour_cost"] + $item_row["overhead_cost"]; $this->tax_type = $item_row["tax_type_id"]; $this->tax_type_name = $item_row["tax_type_name"]; - $this->stock_id = $stock_id; $this->quantity = $qty; $this->qty_dispatched = $qty; @@ -500,6 +512,7 @@ class line_details $this->discount_percent = $disc_percent; $this->qty_done = $qty_done; $this->standard_cost = $standard_cost; + $this->valid = true; } // get unit price as stated on document