From adbba79bd27ecc99c8f03a8cbf4a115c84bbd94f Mon Sep 17 00:00:00 2001
From: ludo <ludo@huma.net>
Date: Tue, 18 Mar 2025 13:06:02 +0100
Subject: [PATCH] fixes

---
 app/Http/Controllers/Shop/BasketController.php |  2 +-
 app/Http/Controllers/Shop/OrderController.php  |  3 ++-
 app/Http/Controllers/Shop/PayboxController.php |  4 +++-
 app/Repositories/Core/Auth/Users.php           |  5 +++++
 app/Repositories/Core/User/ShopCart.php        |  6 +++++-
 app/Repositories/Shop/CustomerAddresses.php    | 10 +++++-----
 6 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/Shop/BasketController.php b/app/Http/Controllers/Shop/BasketController.php
index 4480976a..541969f1 100644
--- a/app/Http/Controllers/Shop/BasketController.php
+++ b/app/Http/Controllers/Shop/BasketController.php
@@ -33,7 +33,7 @@ class BasketController extends Controller
         return Baskets::addBasket($offerId, $quantity, $update);
     }
 
-    public function modalBasket($offerId, $quantity)
+    public function modalBasket($offerId, $quantity = 1)
     {
         $data = [
             'offer' => Offers::getFull($offerId)->toArray(),
diff --git a/app/Http/Controllers/Shop/OrderController.php b/app/Http/Controllers/Shop/OrderController.php
index 66e10dd5..0c945c29 100644
--- a/app/Http/Controllers/Shop/OrderController.php
+++ b/app/Http/Controllers/Shop/OrderController.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Shop;
 
 use App\Datatables\Shop\CustomerOrdersDataTable;
 use App\Http\Requests\Shop\StoreOrderPost;
+use App\Repositories\Core\Auth\Users;
 use App\Repositories\Core\User\ShopCart;
 use App\Repositories\Shop\Baskets;
 use App\Repositories\Shop\Contents;
@@ -20,7 +21,7 @@ class OrderController extends Controller
 {
     public function index(CustomerOrdersDataTable $dataTable)
     {
-        if (Customers::isNotConnected()) {
+        if (Users::isNotConnected() && Customers::isNotConnected()) {
             abort(403);
         }
         return $dataTable->render('Shop.Orders.partials.list');
diff --git a/app/Http/Controllers/Shop/PayboxController.php b/app/Http/Controllers/Shop/PayboxController.php
index 83650e16..8600446a 100644
--- a/app/Http/Controllers/Shop/PayboxController.php
+++ b/app/Http/Controllers/Shop/PayboxController.php
@@ -30,6 +30,8 @@ class PayboxController extends Controller
 
     public function process(Request $request)
     {
-        return view('paybox.send');
+        $data = $request->all();
+
+        return view('paybox.send', $data);
     }
 }
diff --git a/app/Repositories/Core/Auth/Users.php b/app/Repositories/Core/Auth/Users.php
index 9c2e263a..a0f3f720 100644
--- a/app/Repositories/Core/Auth/Users.php
+++ b/app/Repositories/Core/Auth/Users.php
@@ -83,6 +83,11 @@ class Users
         return Auth::user();
     }
 
+    public static function isNotConnected()
+    {
+        return ! self::isConnected();
+    }
+
     public static function isConnected()
     {
         return Auth::check();
diff --git a/app/Repositories/Core/User/ShopCart.php b/app/Repositories/Core/User/ShopCart.php
index 0a34ad6d..32ebe2e9 100644
--- a/app/Repositories/Core/User/ShopCart.php
+++ b/app/Repositories/Core/User/ShopCart.php
@@ -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);
     }
 }
diff --git a/app/Repositories/Shop/CustomerAddresses.php b/app/Repositories/Shop/CustomerAddresses.php
index 052d1a2f..3867ad2c 100644
--- a/app/Repositories/Shop/CustomerAddresses.php
+++ b/app/Repositories/Shop/CustomerAddresses.php
@@ -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,