projects
/
fa-stable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3aada29
)
PHP 8.2 rerun of /sales/includes/cart_class.inc. Fixed back to deliver_to.
author
Joe
<joe.hunt.consulting@gmail.com>
Tue, 8 Aug 2023 14:55:12 +0000
(16:55 +0200)
committer
Joe
<joe.hunt.consulting@gmail.com>
Tue, 8 Aug 2023 14:55:12 +0000
(16:55 +0200)
sales/includes/cart_class.inc
patch
|
blob
|
history
diff --git
a/sales/includes/cart_class.inc
b/sales/includes/cart_class.inc
index adfe941a22b78c7f83a89051862175ab1482b7b9..e867cea0ec6324159096b64c761448d419907108 100644
(file)
--- a/
sales/includes/cart_class.inc
+++ b/
sales/includes/cart_class.inc
@@
-45,7
+45,7
@@
class Cart
var $Branch;
var $email;
var $Branch;
var $email;
- var $deliver
y
_to;
+ var $deliver_to;
var $delivery_address;
var $phone;
var $delivery_address;
var $phone;
@@
-225,7
+225,7
@@
class Cart
$sodata = get_sales_order_header($this->order_no, ST_SALESORDER);
$this->cust_ref = $sodata["customer_ref"];
// currently currency is hard linked to debtor account
$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->deliver
y
_to = $sodata["deliver_to"];
+ $this->deliver_to = $sodata["deliver_to"];
$this->delivery_address = $sodata["delivery_address"];
// child transaction reedition - update with parent info unless it is freehand
if (!$this->is_prepaid() && !$prepare_child) // this is read for view/reedition
$this->delivery_address = $sodata["delivery_address"];
// child transaction reedition - update with parent info unless it is freehand
if (!$this->is_prepaid() && !$prepare_child) // this is read for view/reedition
@@
-389,7
+389,7
@@
class Cart
function set_delivery($shipper, $destination, $address, $freight_cost=null)
{
$this->ship_via = $shipper;
function set_delivery($shipper, $destination, $address, $freight_cost=null)
{
$this->ship_via = $shipper;
- $this->deliver
y
_to = $destination;
+ $this->deliver_to = $destination;
$this->delivery_address = $address;
if (isset($freight_cost))
$this->freight_cost = $freight_cost;
$this->delivery_address = $address;
if (isset($freight_cost))
$this->freight_cost = $freight_cost;