jev/opensem
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
ludo
2025-03-18 13:06:02 +01:00
parent 592402a6c1
commit adbba79bd2
6 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Shop/BasketController.php
View File

@@ -33,7 +33,7 @@ class BasketController extends Controller
return Baskets::addBasket($offerId, $quantity, $update); return Baskets::addBasket($offerId, $quantity, $update);
} }
public function modalBasket($offerId, $quantity) public function modalBasket($offerId, $quantity = 1)
{ {
$data = [ $data = [
'offer' => Offers::getFull($offerId)->toArray(), 'offer' => Offers::getFull($offerId)->toArray(),

3
app/Http/Controllers/Shop/OrderController.php
View File

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Shop;
use App\Datatables\Shop\CustomerOrdersDataTable; use App\Datatables\Shop\CustomerOrdersDataTable;
use App\Http\Requests\Shop\StoreOrderPost; use App\Http\Requests\Shop\StoreOrderPost;
use App\Repositories\Core\Auth\Users;
use App\Repositories\Core\User\ShopCart; use App\Repositories\Core\User\ShopCart;
use App\Repositories\Shop\Baskets; use App\Repositories\Shop\Baskets;
use App\Repositories\Shop\Contents; use App\Repositories\Shop\Contents;
@@ -20,7 +21,7 @@ class OrderController extends Controller
{ {
public function index(CustomerOrdersDataTable $dataTable) public function index(CustomerOrdersDataTable $dataTable)
{ {
if (Customers::isNotConnected()) { if (Users::isNotConnected() && Customers::isNotConnected()) {
abort(403); abort(403);
} }
return $dataTable->render('Shop.Orders.partials.list'); return $dataTable->render('Shop.Orders.partials.list');

4
app/Http/Controllers/Shop/PayboxController.php
View File

@@ -30,6 +30,8 @@ class PayboxController extends Controller
public function process(Request $request) public function process(Request $request)
{ {
return view('paybox.send'); $data = $request->all();
return view('paybox.send', $data);
} }
} }

5
app/Repositories/Core/Auth/Users.php
View File

@@ -83,6 +83,11 @@ class Users
return Auth::user(); return Auth::user();
} }
public static function isNotConnected()
{
return ! self::isConnected();
}
public static function isConnected() public static function isConnected()
{ {
return Auth::check(); return Auth::check();

6
app/Repositories/Core/User/ShopCart.php
View File

@@ -3,6 +3,7 @@
namespace App\Repositories\Core\User; namespace App\Repositories\Core\User;
use Cart; use Cart;
use Illuminate\Support\Facades\Auth;
class ShopCart class ShopCart
{ {
@@ -95,6 +96,9 @@ class ShopCart
public static function get() public static function get()
{ {
return Cart::session('_token'); $userId = Auth::guard('customer')->id();
$sessionKey = 'cart_'.sha1(static::class . ($userId ?? 'guest'));
return Cart::session($sessionKey);
} }
} }

10
app/Repositories/Shop/CustomerAddresses.php
View File

@@ -36,10 +36,10 @@ class CustomerAddresses
{ {
$delivery = $data['use_for_delivery'] ?? false; $delivery = $data['use_for_delivery'] ?? false;
$data = array_merge($data, [ $data = array_merge($data, [
'address' => $delivery ? $data['delivery_address'] : $data['address'], 'address' => $delivery ? $data['delivery_address'] ?? $data['address'] : $data['address'],
'address2' => $delivery ? $data['delivery_address2'] : $data['address2'], 'address2' => $delivery ? $data['delivery_address2'] ?? $data['address2'] : $data['address2'],
'zipcode' => $delivery ? $data['delivery_zipcode'] : $data['zipcode'], 'zipcode' => $delivery ? $data['delivery_zipcode'] ?? $data['zipcode'] : $data['zipcode'],
'city' => $delivery ? $data['delivery_city'] : $data['city'], 'city' => $delivery ? $data['delivery_city'] ?? $data['city'] : $data['city'],
]); ]);
return self::addAddress($customerId, $data, 2); return self::addAddress($customerId, $data, 2);
@@ -53,7 +53,7 @@ class CustomerAddresses
public static function addAddress($customerId, $data, $type) 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 = [ $data = [
'customer_id' => $customerId, 'customer_id' => $customerId,