Payment terms related functions moved to separate file, common function for calculati...

[fa-stable.git] / sales / includes / cart_class.inc

diff --git a/sales/includes/cart_class.inc b/sales/includes/cart_class.inc
index e1f63d5309fec9920e0df08cf716e0a2c70df1de..b35b25f4591d85b84cecfdb298f6930b4d490ef6 100644 (file)
--- a/sales/includes/cart_class.inc
+++ b/sales/includes/cart_class.inc
@@ -66,7 +66,6 @@ class Cart
        var     $pos;                   // user assigned POS
        var $cash_account;
        var $account_name;
-       var $cash_discount;     // not used as of FA 2.1
        var $dimension_id;
        var $dimension2_id;
        var $payment;
@@ -159,7 +158,7 @@ class Cart
                        $this->dimension2_id = $cust['dimension2_id'];
                }
                if ($type == ST_SALESINVOICE) {
-                       $this->due_date = get_invoice_duedate($this->payment, $this->document_date);
+                       $this->due_date = get_payment_due_date($this->payment, $this->document_date);
                }
 
                $this->src_docs = $this->trans_no;
@@ -271,7 +270,7 @@ class Cart
                        }       
                        if ($type == ST_SALESINVOICE) {
                                $this->due_date =
-                                       get_invoice_duedate($this->payment, $this->document_date);
+                                       get_payment_due_date($this->payment, $this->document_date);
                        } else
                                $this->due_date =
                                        add_days($this->document_date, $SysPrefs->default_delivery_required_by());
@@ -284,7 +283,7 @@ 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) {
-               
+
                global $SysPrefs, $Refs;
                
                begin_transaction(); // prevents partial database changes in case of direct delivery/invoice
@@ -344,7 +343,7 @@ class Cart
                return $ret;
        }
 
-       function set_customer($customer_id, $customer_name, $currency, $discount, $payment, $cdiscount=0)
+       function set_customer($customer_id, $customer_name, $currency, $discount, $payment)
        {
                $this->customer_name = $customer_name;
                $this->customer_id = $customer_id;
@@ -352,9 +351,8 @@ class Cart
                $this->customer_currency = $currency;
                $this->payment = $payment;
                $this->payment_terms = get_payment_terms($payment);
-               $this->cash_discount = $cdiscount;
 
-               if ($this->payment_terms['cash_sale']) {
+               if ($this->payment_terms['type'] == PTT_CASH) {
                        $this->Location = $this->pos['pos_location'];
                        $this->location_name = $this->pos['location_name'];
                }
@@ -517,8 +515,12 @@ class Cart
        {
                $items = array();
                $prices = array();
-               if ($shipping_cost == null)
-                       $shipping_cost = $this->freight_cost;
+               if ($this->ship_via != '') {
+                       if ($shipping_cost == null)
+                               $shipping_cost = $this->freight_cost;
+                       $items[] = $this->ship_via;
+                       $prices[] = $shipping_cost;
+               }
 
                foreach ($this->line_items as $ln_itm) {
                        $items[] = $ln_itm->stock_id;
@@ -527,8 +529,7 @@ class Cart
                                $ln_itm->line_price()* (1 - $ln_itm->discount_percent)),  user_price_dec());
                }
 
-               $taxes = get_tax_for_items($this->trans_type, $items, $prices, $shipping_cost,
-                       $this->tax_group_id, $this->tax_included);
+               $taxes = get_tax_for_items($this->trans_type, $items, $prices, $this->tax_group_id, $this->tax_included);
 
     // Adjustment for swiss franken, we always have 5 rappen = 1/20 franken
     if ($this->customer_currency == 'CHF') {
@@ -551,7 +552,7 @@ class Cart
 
        function get_shipping_tax()
        {
-               $freight = split_item_price(NULL, $this->freight_cost, $this->tax_group_id, $this->tax_included, $this->trans_type);
+               $freight = split_item_price($this->ship_via, $this->freight_cost, $this->tax_group_id, $this->tax_included, $this->trans_type);
 
                return $freight['Tax'];
        }
@@ -642,7 +643,7 @@ class Cart
                $remainder = prepaid_invoice_remainder($this->order_no);
 
                // recalculate prepaid part from payments
-               if ($this->payment_terms['days_before_due'] == -1)
+               if ($this->payment_terms['type'] == PTT_PREPAY)
                {       // this is partial invoice for selected prepayments made.
                        $paid = 0;
                        foreach($this->prepayments as $payment)