X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fincludes%2Fcart_class.inc;h=286f9f373dcd89642d3f9f8ffe2e1eb8849177a1;hb=23936f0bdf11736bff72d90513846cf94def317e;hp=5cf5f7bdda80e522eb13cd267a68a36eddf3ae20;hpb=df94c3c07a136d21b5cae1687bd2b6316c2744dc;p=fa-stable.git diff --git a/sales/includes/cart_class.inc b/sales/includes/cart_class.inc index 5cf5f7bd..286f9f37 100644 --- a/sales/includes/cart_class.inc +++ b/sales/includes/cart_class.inc @@ -55,7 +55,6 @@ class cart var $Location; var $location_name; var $order_no; // the original order number - var $trans_link = 0; var $ship_via; var $freight_cost = 0; @@ -66,7 +65,6 @@ class cart var $price_factor; // ditto for price calculations var $pos; // user assigned POS - 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 @@ -74,6 +72,8 @@ class cart var $dimension2_id; var $payment; var $payment_terms; // cached payment terms + var $credit; + //------------------------------------------------------------------------- // // $trans_no==0 => open new/direct document @@ -90,6 +90,7 @@ class cart $this->trans_type = ST_SALESORDER; $this->dimension_id = 0; $this->dimension2_id = 0; + $this->pos = get_sales_point(user_pos()); $this->read($type, $trans_no, $no_edit); $this->cart_id = uniqid(''); } @@ -110,8 +111,6 @@ class cart 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_min = 0; -// $line->qty_max = $line->quantity - $line->qty_done; $line->qty_dispatched = $type == ST_CUSTCREDIT ? '0' : $line->quantity - $line->qty_done; $line->qty_old = 0; } @@ -136,24 +135,33 @@ class cart // function set_parent_constraints($sodata, $src_no) { + $srcdetails = get_sales_parent_lines($this->trans_type, $src_no); + $src_type = get_parent_type($this->trans_type); - if ($src_type == ST_SALESORDER || $src_type == 0) { // get src data from sales_orders + if ($src_type == ST_SALESORDER || $src_type == 0) { $this->src_docs = array( $sodata['order_no']=>$sodata['version']); - $srcdetails = get_sales_order_details($this->order_no, $this->trans_type); } else { // get src_data from debtor_trans - $this->src_docs = get_customer_trans_version($src_type, - get_parent_trans($this->trans_type, $src_no)); - $srcdetails = get_customer_trans_details($src_type, array_keys($this->src_docs)); + $srcnum = array(); + while ($line = db_fetch($srcdetails)) { + $srcnum[] = $line['debtor_trans_no']; + } + $this->src_docs = get_customer_trans_version($src_type, array_values($srcnum)); } // calculate & save: qtys on other docs and free qtys on src doc - for($line_no = 0; $srcline = db_fetch($srcdetails); $line_no++) { + $line_no = 0; + // Loop speed optimisation below depends on fact + // that child line_items contains subset of parent lines in _the_same_ order ! + while ($line_no < count($this->line_items) && $srcline = db_fetch($srcdetails)) { $line = &$this->line_items[$line_no]; - - $line->src_id = $srcline['id']; // save src line ids for update - if ($this->trans_type == ST_SALESINVOICE) - $line->src_no = $srcline['debtor_trans_no']; - $line->qty_old = $line->qty_dispatched = $line->quantity; - $line->quantity += $srcline['quantity'] - $srcline['qty_done']; // add free qty on src doc + if ($srcline['id'] == $line->src_id) { + if ($this->trans_type == ST_SALESINVOICE) + $line->src_no = $srcline['debtor_trans_no']; + $line->qty_old = $line->qty_dispatched = $line->quantity; + $line->quantity += $srcline['quantity'] - + ($src_type==ST_SALESORDER ? $srcline['qty_sent'] : $srcline['qty_done']); // add free qty on src doc + $line_no++; + break; + } } } //------------------------------------------------------------------------- @@ -177,10 +185,10 @@ class cart // $this->customer_currency = $sodata["curr_code"]; $this->delivery_to = $sodata["deliver_to"]; $this->delivery_address = $sodata["delivery_address"]; - } // child transaction reedition - update with parent info unless it is freehand - if (!$no_edit && !($type==ST_CUSTCREDIT && $this->trans_link==0)) - $this->set_parent_constraints($sodata, $trans_no[0]); + if (!$no_edit) + $this->set_parent_constraints($sodata, $trans_no[0]); + } } // prepare qtys for derivative document entry (not used in display) if($no_edit) { @@ -227,21 +235,11 @@ class cart 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, $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 + } + $this->credit = get_current_cust_credit($this->customer_id); } //------------------------------------------------------------------------- @@ -303,8 +301,15 @@ class cart $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; + + if ($this->payment_terms['cash_sale']) { + $this->Location = $this->pos['pos_location']; + $this->location_name = $this->pos['location_name']; + $this->cash_account = $this->pos['pos_account']; + $this->account_name = $this->pos['bank_account_name']; + } + $this->credit = get_current_cust_credit($customer_id); } function set_branch($branch_id, $tax_group_id, $tax_group_name, $phone='', $email='') @@ -339,10 +344,11 @@ 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, + $src_id=0) { $line = new line_details($stock_id, $qty, $price, $disc, - $qty_done, $standard_cost, $description, $id, $src_no); + $qty_done, $standard_cost, $description, $id, $src_no, $src_id); if ($line->valid) { $this->line_items[$line_no] = $line; @@ -456,7 +462,8 @@ class cart foreach ($this->line_items as $ln_itm) { $items[] = $ln_itm->stock_id; - $prices[] = round(($ln_itm->qty_dispatched * + $prices[] = round((( + $this->trans_type==ST_SALESORDER ? $ln_itm->quantity : $ln_itm->qty_dispatched) * $ln_itm->line_price()* (1 - $ln_itm->discount_percent)), user_price_dec()); } @@ -466,7 +473,7 @@ class cart // Adjustment for swiss franken, we always have 5 rappen = 1/20 franken if ($this->customer_currency == 'CHF') { $val = $taxes['1']['Value']; - $val1 = (floatval((intval(round(($val*20),0)))/20)); + $val1 = (floatval((intval(round(($val*20),0)))/20)); $taxes['1']['Value'] = $val1; } return $taxes; @@ -500,7 +507,22 @@ class cart else return round($this->freight_cost*$tax_rate/100, user_price_dec()); } + /* + Returns transaction value including all taxes + */ + function get_trans_total() { + + $total = $this->get_items_total() + $this->freight_cost; + $dec = user_price_dec(); + if (!$this->tax_included ) { + $total += $this->get_shipping_tax(); + $taxes = $this->get_taxes(); + foreach($taxes as $tax) + $total += round($tax['Value'], $dec); + } + return $total; + } } /* end of class defintion */ class line_details @@ -549,12 +571,13 @@ class line_details function line_details ($stock_id, $qty, $prc, $disc_percent, - $qty_done, $standard_cost, $description, $id=0, $src_no=0 ) + $qty_done, $standard_cost, $description, $id=0, $src_no=0, $src_id=0) { /* Constructor function to add a new LineDetail object with passed params */ $this->id = $id; $this->src_no = $src_no; + $this->src_id = $src_id; $item_row = get_item($stock_id); if (!$item_row)