fixes
This commit is contained in:
@@ -83,6 +83,11 @@ class Users
|
||||
return Auth::user();
|
||||
}
|
||||
|
||||
public static function isNotConnected()
|
||||
{
|
||||
return ! self::isConnected();
|
||||
}
|
||||
|
||||
public static function isConnected()
|
||||
{
|
||||
return Auth::check();
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
namespace App\Repositories\Core\User;
|
||||
|
||||
use Cart;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
|
||||
class ShopCart
|
||||
{
|
||||
@@ -95,6 +96,9 @@ class ShopCart
|
||||
|
||||
public static function get()
|
||||
{
|
||||
return Cart::session('_token');
|
||||
$userId = Auth::guard('customer')->id();
|
||||
$sessionKey = 'cart_'.sha1(static::class . ($userId ?? 'guest'));
|
||||
|
||||
return Cart::session($sessionKey);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -36,10 +36,10 @@ class CustomerAddresses
|
||||
{
|
||||
$delivery = $data['use_for_delivery'] ?? false;
|
||||
$data = array_merge($data, [
|
||||
'address' => $delivery ? $data['delivery_address'] : $data['address'],
|
||||
'address2' => $delivery ? $data['delivery_address2'] : $data['address2'],
|
||||
'zipcode' => $delivery ? $data['delivery_zipcode'] : $data['zipcode'],
|
||||
'city' => $delivery ? $data['delivery_city'] : $data['city'],
|
||||
'address' => $delivery ? $data['delivery_address'] ?? $data['address'] : $data['address'],
|
||||
'address2' => $delivery ? $data['delivery_address2'] ?? $data['address2'] : $data['address2'],
|
||||
'zipcode' => $delivery ? $data['delivery_zipcode'] ?? $data['zipcode'] : $data['zipcode'],
|
||||
'city' => $delivery ? $data['delivery_city'] ?? $data['city'] : $data['city'],
|
||||
]);
|
||||
|
||||
return self::addAddress($customerId, $data, 2);
|
||||
@@ -53,7 +53,7 @@ class CustomerAddresses
|
||||
|
||||
public static function addAddress($customerId, $data, $type)
|
||||
{
|
||||
$name = $data['company'] ? $data['company'] : $data['first_name'] . ' ' . $data['last_name'];
|
||||
$name = $data['company'] ? $data['company'] : $data['first_name'].' '.$data['last_name'];
|
||||
|
||||
$data = [
|
||||
'customer_id' => $customerId,
|
||||
|
||||
Reference in New Issue
Block a user