Fixed default delivery address selection.

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

diff --git a/sales/includes/cart_class.inc b/sales/includes/cart_class.inc
index 78cf46a88f0712d84a72e3c55588980a94ad98a8..628ab43a3ea5e3fd34ea59ed2f03db2b65e769db 100644 (file)
--- a/sales/includes/cart_class.inc
+++ b/sales/includes/cart_class.inc
@@ -55,6 +55,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,6 +74,8 @@ 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 );
        }
 
@@ -135,10 +145,44 @@ 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['account_code'];
+                                       $this->account_name = $pos['bank_account_name'];
+                               }
+                               } else
                                  $this->due_date =
                                        add_days($this->document_date, sys_prefs::default_delivery_required_by());
                        }
@@ -193,11 +237,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;
        }