Fix on addresses

This commit is contained in:
ludo
2023-11-13 00:02:21 +01:00
parent 4ce3d528dd
commit 9f90f983ab
29 changed files with 660 additions and 447 deletions

View File

@@ -84,7 +84,9 @@ class Customers
public static function getWithAddresses($id = false)
{
return self::get($id, ['invoicing_addresses', 'delivery_addresses']);
$id = $id ? $id : self::getId();
return self::get($id, ['invoice_addresses', 'delivery_addresses']);
}
public static function getName($id = false)
@@ -99,18 +101,16 @@ class Customers
return self::guard()->user();
}
public static function get($id, $relations = false, $relationsCount = false)
{
$id = $id ? $id : self::getId();
return self::getModelRelations($relations, $relationsCount)->find($id);
}
public static function getId()
{
return self::guard()->id();
}
public static function isNotConnected()
{
return ! self::isConnected();
}
public static function isConnected()
{
return self::guard()->check();
@@ -118,7 +118,7 @@ class Customers
public static function edit($id)
{
$customer = self::get($id, 'addresses');
$customer = self::get($id, ['delivery_addresses', 'invoice_addresses']);
$data = $customer->toArray();
$data['deliveries'] = $customer->deliveries->pluck('id')->toArray();
@@ -128,12 +128,12 @@ class Customers
public static function storeFull($data)
{
$deliveries = $data['deliveries'];
$addresses = $data['addresses'];
$invoices = $data['invoices'];
unset($data['deliveries']);
unset($data['addresses']);
unset($data['invoices']);
$customer = self::store($data);
self::storeDeliveries($customer, $deliveries);
self::storeAddresses($customer, $addresses);
self::storeAddresses($customer, $deliveries);
self::storeAddresses($customer, $invoices);
return $customer->id;
}