fix: display only delivery types that have a price and auto-select first

This captures the Paybox verification flow, duplicate-payment guard, and cart cleanup.

Dockerfile

@@ -55,6 +55,7 @@ RUN chmod +x artisan
 
 RUN ./artisan vendor:publish --tag=public --force  ## creates public/vendor/jsvalidation
 RUN ./artisan vendor:publish --tag=boilerplate-public --force --ansi ## creates public/vendor/boilerplate
+RUN ./artisan vendor:publish --tag=datatables-buttons --force --ansi ## creates public/vendor/datatables/buttons
 
 ## XXXvlab: 2025-09-25 these migration files are breaking first
 ## install, but we had to resolve to not install from scratch and use
@@ -93,7 +94,8 @@ RUN mkdir -p /out \
     --exclude=.editorconfig --exclude=phpunit.xml \
     --exclude=.travis.yml --exclude=composer.lock --exclude=.styleci.yml \
     --exclude=Makefile --exclude=.gitkeep --exclude=test \
-    artisan app build config database vendor public resources routes stubs bootstrap storage composer.json \
+    --exclude=resources/shop \
+    artisan app config database vendor public resources routes stubs bootstrap storage composer.json \
  && xz -T0 -9e /out/app.tar \
  && mv /out/app.tar.xz /out/opensem-prod.tar.xz
 

Gruntfile.js

@@ -19,8 +19,8 @@ var jsSite = [
 	jsBootstrap,
 	'node_modules/jquery-serializejson/jquery.serializejson.min.js',
 	'node_modules/currency.js/dist/currency.min.js',
-	'build/js/plugins/smooth_products/js/smoothproducts.min.js',
-	'build/js/site.js',
+	'resources/shop/js/plugins/smooth_products/js/smoothproducts.min.js',
+	'resources/shop/js/site.js',
 ]
 
 var cssSite = [
@@ -28,8 +28,8 @@ var cssSite = [
 	'node_modules/@fortawesome/fontawesome-free/css/all.min.css',
 	'node_modules/animate.css/animate.min.css',
 	'node_modules/icheck-bootstrap/icheck-bootstrap.min.css',
-	'build/js/plugins/smooth_products/css/smoothproducts.css',
-	'build/css/site.css',
+	'resources/shop/js/plugins/smooth_products/css/smoothproducts.css',
+	'resources/shop/css/site.css',
 ]
 
 var jsAdminLTE = [
@@ -41,15 +41,15 @@ var jsAdminLTE = [
 ]
 
 var jsCoreInclude = [
-	'build/js/include/core/objectLength.js',
-	'build/js/include/core/url.js',
-	'build/js/include/core/user.js',
-	'build/js/include/form/radio.js',
-	'build/js/include/form/upload.js',
-	'build/js/include/form/validator.js',
-	'build/js/include/layout/animate.js',
-	'build/js/include/layout/scroll.js',
-	'build/js/include/layout/tooltip.js',
+	'resources/shop/js/include/core/objectLength.js',
+	'resources/shop/js/include/core/url.js',
+	'resources/shop/js/include/core/user.js',
+	'resources/shop/js/include/form/radio.js',
+	'resources/shop/js/include/form/upload.js',
+	'resources/shop/js/include/form/validator.js',
+	'resources/shop/js/include/layout/animate.js',
+	'resources/shop/js/include/layout/scroll.js',
+	'resources/shop/js/include/layout/tooltip.js',
 ]
 
 var jsBundle = [
@@ -84,7 +84,7 @@ var jsMain = [
 var cssPrint = [
 	// 'node_modules/bootstrap/dist/css/bootstrap.min.css',
 	'cssIcons',
-	'build/print.css'
+	'resources/shop/print.css'
 ]
 
 var cssBundle = [
@@ -109,7 +109,7 @@ var cssIcons = [
 var cssMain = [
 	cssBundle,
 	cssIcons,
-	'build/css/main.css',
+	'resources/shop/css/main.css',
 ]
 
 var jsDataTables = [
@@ -251,31 +251,31 @@ module.exports = function(grunt) {
 					},
 					{
 						expand: true,
-						cwd: 'build/fonts',
+						cwd: 'resources/shop/fonts',
 						src: ['**'],
 						dest: 'public/fonts/'
 					},
 					{
 						expand: true,
-						cwd: 'build/img',
+						cwd: 'resources/shop/img',
 						src: ['**'],
 						dest: 'public/img/'
 					},
 					{
 						expand: true,
-						cwd: 'build/lang',
+						cwd: 'resources/shop/lang',
 						src: ['**'],
 						dest: 'public/assets/lang/'
 					},
 					{
 						expand: true,
-						cwd: 'build/plugins',
+						cwd: 'resources/shop/plugins',
 						src: ['**'],
 						dest: 'public/assets/plugins/'
 					},
 					{
 						expand: true,
-						cwd: 'build/assets/tpl',
+						cwd: 'resources/shop/assets/tpl',
 						src: ['**'],
 						dest: 'public/assets/tpl/'
 					},
@@ -395,7 +395,7 @@ module.exports = function(grunt) {
 					},
 					{
 						expand: true,
-						cwd: 'build/plugins/pdfjs/',
+						cwd: 'resources/shop/plugins/pdfjs/',
 						src: ['**'],
 						dest: 'public/assets/plugins/pdfjs',	
 					},
@@ -461,7 +461,7 @@ module.exports = function(grunt) {
 					},
 					{
 						expand: true,
-						cwd: 'build/js/include/plugins/datatables_lang/',
+						cwd: 'resources/shop/js/include/plugins/datatables_lang/',
 						src: ['*.json'],
 						dest: 'public/assets/plugins/datatables_lang',
 					},
@@ -539,7 +539,7 @@ module.exports = function(grunt) {
 					},
 					{
 						expand: true,
-						cwd: 'build/js/include/',
+						cwd: 'resources/shop/js/include/',
 						src: ['boilerplate.js'],
 						dest: 'public/assets/plugins',
 					},
@@ -548,7 +548,7 @@ module.exports = function(grunt) {
 		},
 		watch: {
 			dist: {
-				files: ['build/js/*', 'build/css/*'],
+				files: ['resources/shop/js/*', 'resources/shop/css/*'],
 				// tasks: ['concat', 'copy']
 				tasks: ['concat']
 			}

app/Datatables/Admin/Shop/CustomerInvoicesDataTable.php

@@ -11,7 +11,7 @@ use Yajra\DataTables\Html\Column;
 
 class CustomerInvoicesDataTable extends DataTable
 {
-    public $model_name = 'invoices';
+    public $model_name = 'customer_invoices';
 
     public $sortedColumn = 1;
 

app/Http/Controllers/Admin/Shop/CustomerInvoiceController.php

@@ -12,15 +12,6 @@ class CustomerInvoiceController extends Controller
         return $dataTable->render('Admin.Shop.CustomerInvoices.list');
     }
 
-    public function show($id)
-    {
-        $data = [
-            'invoice' => Invoices::get($id),
-        ];
-
-        return view('Admin.Shop.CustomerInvoices.view', $data);
-    }
-
     public function destroy($id)
     {
         return Invoices::destroy($id);

app/Http/Controllers/Shop/Auth/LoginController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Shop\Auth;
 
 use App\Http\Controllers\Controller;
+use App\Repositories\Core\User\ShopCart;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
@@ -31,6 +32,7 @@ class LoginController extends Controller
         ]);
 
         if ($this->guard()->attempt($credentials, $request->get('remember'))) {
+            ShopCart::migrateGuestCartToUser();
             $request->session()->regenerate();
             if (back()->getTargetUrl() === route('Shop.Orders.store')) {
                 $route = 'Shop.Orders.order';

app/Http/Controllers/Shop/Auth/RegisterController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Shop\Auth;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Shop\RegisterCustomer;
+use App\Repositories\Core\User\ShopCart;
 use App\Repositories\Shop\CustomerSaleChannels;
 use App\Repositories\Shop\CustomerAddresses;
 use App\Repositories\Shop\Customers;
@@ -33,6 +34,7 @@ class RegisterController extends Controller
         $user = $this->create($request->all());
 
         $this->guard()->login($user);
+        ShopCart::migrateGuestCartToUser();
 
         return $request->wantsJson()
             ? new JsonResponse([], 201)

app/Http/Controllers/Shop/CustomerController.php

@@ -2,9 +2,13 @@
 
 namespace App\Http\Controllers\Shop;
 
+use App\Repositories\Core\User\ShopCart;
+use App\Repositories\Shop\Baskets;
 use App\Repositories\Shop\CustomerAddresses;
 use App\Repositories\Shop\Customers;
+use App\Repositories\Shop\Offers;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Validator;
 
 class CustomerController extends Controller
 {
@@ -43,8 +47,50 @@ class CustomerController extends Controller
     public function storeProfileAjax(Request $request)
     {
         $data = $request->all();
+
+        if (array_key_exists('default_sale_channel_id', $data)) {
+            $customer = Customers::get(Customers::getId());
+            $newSaleChannelId = (int) $data['default_sale_channel_id'];
+            $currentSaleChannelId = (int) ($customer->default_sale_channel_id ?? 0);
+
+            if ($newSaleChannelId && $newSaleChannelId !== $currentSaleChannelId && ShopCart::count() > 0) {
+                $cartItems = ShopCart::getContent();
+                $unavailable = [];
+
+                foreach ($cartItems as $item) {
+                    $offerId = (int) $item->id;
+
+                    if (! Offers::getPrice($offerId, 1, $newSaleChannelId)) {
+                        $offer = Offers::get($offerId, ['article']);
+                        $unavailable[] = $offer->article->name ?? $item->name;
+
+                        if (count($unavailable) >= 3) {
+                            break;
+                        }
+                    }
+                }
+
+                if (! empty($unavailable)) {
+                    $list = implode(', ', $unavailable);
+
+                    return response()->json([
+                        'error' => 1,
+                        'message' => __('Certains articles de votre panier ne sont pas disponibles dans ce canal : :products. Merci de finaliser votre commande ou de retirer ces articles avant de changer de canal.', ['products' => $list]),
+                    ], 422);
+                }
+            }
+        }
+
         $customer = Customers::store($data);
 
+        if ($customer) {
+            Customers::guard()->setUser($customer->fresh(['sale_channels']));
+            if (array_key_exists('default_sale_channel_id', $data)) {
+                session(['shop.default_sale_channel_id' => $data['default_sale_channel_id']]);
+                Baskets::refreshPrices((int) $data['default_sale_channel_id']);
+            }
+        }
+
         return response()->json(['error' => 0]);
     }
 
@@ -56,10 +102,89 @@ class CustomerController extends Controller
         return redirect()->route('Shop.Customers.edit');
     }
 
+    public function storeAddress(Request $request)
+    {
+        if (Customers::isNotConnected()) {
+            return response()->json(['message' => __('Authentification requise.')], 403);
+        }
+
+        $prefix = $request->input('prefix');
+        $types = ['deliveries' => 1, 'invoices' => 2];
+
+        if (! array_key_exists($prefix, $types)) {
+            return response()->json(['message' => __('Type d\'adresse inconnu.')], 422);
+        }
+
+        $addressData = $request->input($prefix, []);
+
+        $validator = Validator::make($addressData, [
+            'name' => ['nullable', 'string', 'max:150'],
+            'address' => ['required', 'string', 'max:255'],
+            'address2' => ['nullable', 'string', 'max:255'],
+            'zipcode' => ['required', 'string', 'max:30'],
+            'city' => ['required', 'string', 'max:255'],
+        ], [
+            'address.required' => __('Merci de renseigner l\'adresse.'),
+            'zipcode.required' => __('Merci de renseigner le code postal.'),
+            'city.required' => __('Merci de renseigner la ville.'),
+        ]);
+
+        if ($validator->fails()) {
+            return response()->json([
+                'message' => __('Merci de vérifier les informations saisies.'),
+                'errors' => $validator->errors(),
+            ], 422);
+        }
+
+        $data = $validator->validated();
+        $customerId = Customers::getId();
+        $data['customer_id'] = $customerId;
+        $data['type'] = $types[$prefix];
+
+        if (empty($data['name'])) {
+            $data['name'] = Customers::getName($customerId);
+        }
+
+        $address = CustomerAddresses::store($data);
+        CustomerAddresses::setDefault($customerId, $address->id, $types[$prefix]);
+
+        $html = view('Shop.Customers.partials.address_item', [
+            'address' => $address->toArray(),
+            'prefix' => $prefix,
+            'with_name' => true,
+            'selected' => $address->id,
+        ])->render();
+
+        return response()->json([
+            'success' => true,
+            'html' => $html,
+            'message' => __('Adresse enregistrée.'),
+            'id' => $address->id,
+        ]);
+    }
+
     public function delete_address($id)
     {
-        $ret = CustomerAddresses::destroy($id);
+        $address = CustomerAddresses::get($id);
 
-        return redirect()->route('Shop.Customers.edit');
+        if (! $address || (int) $address->customer_id !== (int) Customers::getId()) {
+            abort(404);
+        }
+
+        $remaining = CustomerAddresses::getModel()
+            ->byCustomer($address->customer_id)
+            ->byType($address->type)
+            ->count();
+
+        if ($remaining <= 1) {
+            return redirect()->route('Shop.Customers.edit')
+                ->with('growl', [__('Vous devez conserver au moins une adresse par type.'), 'warning']);
+        }
+
+        CustomerAddresses::destroy($id);
+        CustomerAddresses::ensureDefault($address->customer_id, $address->type);
+
+        return redirect()->route('Shop.Customers.edit')
+            ->with('growl', [__('Adresse supprimée.'), 'success']);
     }
 }

app/Http/Controllers/Shop/InvoiceController.php

@@ -15,8 +15,14 @@ class InvoiceController extends Controller
 
     public function view($uuid)
     {
+        $invoice = Invoices::view($uuid);
+
+        if (! $invoice) {
+            abort(404);
+        }
+
         $data = [
-            'invoice' => Invoices::view($uuid),
+            'invoice' => $invoice,
         ];
 
         return view('Shop.Invoices.view', $data);
@@ -24,7 +30,9 @@ class InvoiceController extends Controller
 
     public function pdf($uuid)
     {
-        \Debugbar::disable();
+        if (app()->bound('debugbar')) {
+            app('debugbar')->disable();
+        }
 
         return InvoicePDF::getByUUID($uuid);
     }

app/Http/Controllers/Shop/OrderController.php

@@ -49,12 +49,22 @@ class OrderController extends Controller
     {
         if (ShopCart::count()) {
             $customer = Customers::getWithAddresses();
-            $deliveries = Deliveries::getByCustomer();
+            $customerId = $customer ? $customer->id : false;
+            $defaultSaleChannelId = SaleChannels::getDefaultID($customerId);
+            $deliveries = $defaultSaleChannelId
+                ? Deliveries::getBySaleChannels([$defaultSaleChannelId])
+                : Deliveries::getByCustomer($customerId);
+            $deliveries = $deliveries ? $deliveries->values() : collect();
+
+            $customerData = $customer ? $customer->toArray() : false;
+            if ($customerData && $defaultSaleChannelId) {
+                $customerData['default_sale_channel_id'] = $defaultSaleChannelId;
+            }
 
             $data = [
-                'customer' => $customer ? $customer->toArray() : false,
+                'customer' => $customerData,
                 'basket' => Baskets::getBasketTotal(),
-                'deliveries' => $deliveries ? $deliveries->toArray() : [],
+                'deliveries' => $deliveries->toArray(),
                 'delivery_types' => DeliveryTypes::getWithPrice(Baskets::getWeight()),
             ];
 

app/Http/Controllers/Shop/PayboxController.php

@@ -3,13 +3,19 @@
 namespace App\Http\Controllers\Shop;
 
 use App\Http\Controllers\Controller;
+use App\Repositories\Core\User\ShopCart;
+use App\Repositories\Shop\Paybox as PayboxGateway;
 use App\Repositories\Shop\Contents;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
+
 
 class PayboxController extends Controller
 {
     public function accepted()
     {
+        ShopCart::clear();
+
         return view('paybox.paybox', ['content' => Contents::getPayboxConfirmedContent()]);
     }
 
@@ -30,8 +36,20 @@ class PayboxController extends Controller
 
     public function process(Request $request)
     {
-        $data = $request->all();
+        $invoiceId = $request->input('order_number');
 
-        return view('paybox.send', $data);
+        if (! $invoiceId) {
+            Log::warning('Paybox callback missing order_number', ['payload' => $request->all()]);
+
+            return response('Missing order_number', 400);
+        }
+
+        $success = PayboxGateway::verifyPayment($invoiceId);
+
+        if (! $success) {
+            return response('KO', 400);
+        }
+
+        return response('OK');
     }
 }

app/Models/Shop/CustomerAddress.php

@@ -3,9 +3,11 @@
 namespace App\Models\Shop;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
 
 class CustomerAddress extends Model
 {
+    use SoftDeletes;
     protected $guarded = ['id'];
 
     protected $table = 'shop_customer_addresses';

app/Models/Shop/Invoice.php

@@ -39,7 +39,7 @@ class Invoice extends Model
 
     public function address(): BelongsTo
     {
-        return $this->belongsTo(CustomerAddress::class, 'invoice_address_id');
+        return $this->belongsTo(CustomerAddress::class, 'invoice_address_id')->withTrashed();
     }
 
     public function scopeByCustomer($query, $customerId)

app/Models/Shop/Order.php

@@ -29,7 +29,7 @@ class Order extends Model
 
     public function delivery_address(): BelongsTo
     {
-        return $this->belongsTo(CustomerAddress::class, 'delivery_address_id');
+        return $this->belongsTo(CustomerAddress::class, 'delivery_address_id')->withTrashed();
     }
 
     public function delivery(): BelongsTo

app/Repositories/Core/User/ShopCart.php

@@ -94,11 +94,106 @@ class ShopCart
         return self::get()->getContent();
     }
 
-    public static function get()
+    public static function migrateGuestCartToUser($userId = null)
     {
-        $userId = Auth::guard('customer')->id();
-        $sessionKey = 'cart_'.sha1(static::class . ($userId ?? 'guest'));
+        $userId = self::resolveUserId($userId);
 
-        return Cart::session($sessionKey);
+        if ($userId === null) {
+            return;
+        }
+
+        $guestSessionKey = self::sessionKey();
+        $guestItems = Cart::session($guestSessionKey)->getContent();
+
+        if ($guestItems->count() === 0) {
+            return;
+        }
+
+        $userSessionKey = self::sessionKey($userId);
+
+        foreach ($guestItems as $item) {
+            $existing = Cart::session($userSessionKey)->get($item->id);
+
+            if ($existing) {
+                Cart::session($userSessionKey)->update($item->id, [
+                    'quantity' => [
+                        'relative' => false,
+                        'value' => $existing->quantity + $item->quantity,
+                    ],
+                ]);
+
+                continue;
+            }
+
+            $itemData = [
+                'id' => $item->id,
+                'name' => $item->name,
+                'price' => $item->price,
+                'quantity' => $item->quantity,
+                'attributes' => self::extractAttributes($item),
+            ];
+
+            if (isset($item->associatedModel)) {
+                $itemData['associatedModel'] = $item->associatedModel;
+            }
+
+            $conditions = self::extractConditions($item);
+            if (! empty($conditions)) {
+                $itemData['conditions'] = $conditions;
+            }
+
+            Cart::session($userSessionKey)->add($itemData);
+        }
+
+        Cart::session($guestSessionKey)->clear();
+        Cart::session($userSessionKey);
+    }
+
+    protected static function extractAttributes($item)
+    {
+        if (! isset($item->attributes)) {
+            return [];
+        }
+
+        if (is_object($item->attributes) && method_exists($item->attributes, 'toArray')) {
+            return $item->attributes->toArray();
+        }
+
+        return (array) $item->attributes;
+    }
+
+    protected static function extractConditions($item)
+    {
+        if (! isset($item->conditions)) {
+            return [];
+        }
+
+        if (is_object($item->conditions) && method_exists($item->conditions, 'toArray')) {
+            return $item->conditions->toArray();
+        }
+
+        return (array) $item->conditions;
+    }
+
+    protected static function resolveUserId($userId = null)
+    {
+        return $userId ?? Auth::guard('customer')->id();
+    }
+
+    protected static function sessionKey($userId = null)
+    {
+        $key = $userId ?? 'guest';
+
+        return 'cart_'.sha1(static::class.$key);
+    }
+
+    protected static function session($userId = null)
+    {
+        return Cart::session(self::sessionKey($userId));
+    }
+
+    public static function get($userId = null)
+    {
+        return self::session(self::resolveUserId($userId));
     }
 }

app/Repositories/Shop/Articles.php

@@ -5,6 +5,7 @@ namespace App\Repositories\Shop;
 use App\Models\Shop\Article;
 use App\Repositories\Botanic\Species;
 use App\Repositories\Botanic\Varieties;
+use App\Repositories\Shop\SaleChannels;
 use App\Repositories\Core\Comments;
 use App\Traits\Model\Basic;
 use App\Traits\Repository\Imageable;
@@ -70,9 +71,14 @@ class Articles
 
     public static function getArticleToSell($id, $saleChannelId = false)
     {
+        $saleChannelId = $saleChannelId ?: SaleChannels::getDefaultID();
         $data = self::getArticle($id);
         $data['offers'] = self::getOffersGroupedByNature($id, $saleChannelId);
 
+        $currentSaleChannel = $saleChannelId ? SaleChannels::get($saleChannelId) : null;
+        $data['current_sale_channel'] = $currentSaleChannel ? $currentSaleChannel->toArray() : null;
+        $data['available_sale_channels'] = Offers::getSaleChannelsForArticle($id);
+
         return $data;
     }
 

app/Repositories/Shop/Baskets.php

@@ -100,12 +100,19 @@ class Baskets
         $offers = Offers::getWithPricesByIds(self::getIds(), $saleChannelId);
         foreach ($basket as $item) {
             $offer = $offers->where('id', $item->id)->first();
+            if (! $offer) {
+                continue;
+            }
+
+            $priceValue = Offers::getPrice($item->id, $item->quantity, $saleChannelId);
+            $unitPrice = $priceValue ? (float) $priceValue->price_taxed : (float) $item->price;
+
             $article_nature = strtolower($offer->article->article_nature->name);
             $data[$article_nature][] = [
                 'id' => (int) $item->id,
                 'name' => $item->name,
                 'quantity' => (int) $item->quantity,
-                'price' => $item->price,
+                'price' => $unitPrice,
                 'variation' => $offer->variation->name,
                 'image' => Articles::getPreviewSrc(ArticleImages::getFullImageByArticle($offer->article)),
                 'latin' => $offer->article->product->specie->latin ?? false,
@@ -115,6 +122,24 @@ class Baskets
         return $data ?? false;
     }
 
+    public static function refreshPrices($saleChannelId = false)
+    {
+        $saleChannelId = $saleChannelId ? $saleChannelId : SaleChannels::getDefaultID();
+        $basket = ShopCart::getContent();
+
+        foreach ($basket as $item) {
+            $priceValue = Offers::getPrice($item->id, $item->quantity, $saleChannelId);
+
+            if (! $priceValue) {
+                continue;
+            }
+
+            ShopCart::get()->update($item->id, [
+                'price' => $priceValue->price_taxed,
+            ]);
+        }
+    }
+
     public static function getBasketData($id, $quantity = 1)
     {
         $offer = Offers::get($id, ['article', 'variation']);

app/Repositories/Shop/CustomerAddresses.php

@@ -12,17 +12,35 @@ class CustomerAddresses
     public static function storeByCustomer($customer, $data)
     {
         $deliveries = $data['deliveries'] ?? false;
-        if ($deliveries && $deliveries['zipcode'] && $deliveries['city']) {
-            $deliveries['customer_id'] = $customer->id;
-            $deliveries['type'] = 1;
-            self::store($deliveries);
+        if ($deliveries) {
+            if (! empty($deliveries['address_id'])) {
+                self::setDefault($customer->id, (int) $deliveries['address_id'], 1);
+            }
+
+            if (! empty($deliveries['zipcode']) && ! empty($deliveries['city'])) {
+                $payload = $deliveries;
+                unset($payload['address_id']);
+                $payload['customer_id'] = $customer->id;
+                $payload['type'] = 1;
+                $newAddress = self::store($payload);
+                self::setDefault($customer->id, $newAddress->id, 1);
+            }
         }
 
         $invoices = $data['invoices'] ?? false;
-        if ($invoices && $invoices['zipcode'] && $invoices['city']) {
-            $invoices['customer_id'] = $customer->id;
-            $invoices['type'] = 2;
-            self::store($invoices);
+        if ($invoices) {
+            if (! empty($invoices['address_id'])) {
+                self::setDefault($customer->id, (int) $invoices['address_id'], 2);
+            }
+
+            if (! empty($invoices['zipcode']) && ! empty($invoices['city'])) {
+                $payload = $invoices;
+                unset($payload['address_id']);
+                $payload['customer_id'] = $customer->id;
+                $payload['type'] = 2;
+                $newAddress = self::store($payload);
+                self::setDefault($customer->id, $newAddress->id, 2);
+            }
         }
     }
 
@@ -70,14 +88,24 @@ class CustomerAddresses
 
     public static function getInvoiceAddress($customerId)
     {
-        $addresses = CustomerAddress::byCustomer($customerId)->byInvoicing()->get();
-        return count($addresses) ? $addresses->first() : self::getByCustomer($customerId);
+        $address = CustomerAddress::byCustomer($customerId)
+            ->byInvoicing()
+            ->orderByDesc('priority')
+            ->orderBy('id')
+            ->first();
+
+        return $address ?? self::getByCustomer($customerId);
     }
 
     public static function getDeliveryAddress($customerId)
     {
-        $addresses = CustomerAddress::byCustomer($customerId)->byDelivery()->get();
-        return count($addresses) ? $addresses->first() : self::getByCustomer($customerId);
+        $address = CustomerAddress::byCustomer($customerId)
+            ->byDelivery()
+            ->orderByDesc('priority')
+            ->orderBy('id')
+            ->first();
+
+        return $address ?? self::getByCustomer($customerId);
     }
 
     public static function getByCustomer($customerId = false)
@@ -92,6 +120,40 @@ class CustomerAddresses
         return ((int) $type === 1) ? '<i class="fa fa-fw fa-truck"></i>' : '<i class="fa fa-fw fa-file-invoice"></i>';
     }
 
+    public static function setDefault($customerId, $addressId, $type)
+    {
+        if (! $addressId) {
+            return;
+        }
+
+        $address = self::get($addressId);
+
+        if (! $address || (int) $address->customer_id !== (int) $customerId || (int) $address->type !== (int) $type) {
+            return;
+        }
+
+        self::getModel()->byCustomer($customerId)->byType($type)->update(['priority' => null]);
+
+        $address->priority = 1;
+        $address->save();
+    }
+
+    public static function ensureDefault($customerId, $type)
+    {
+        $hasDefault = self::getModel()->byCustomer($customerId)->byType($type)->where('priority', 1)->exists();
+
+        if ($hasDefault) {
+            return;
+        }
+
+        $address = self::getModel()->byCustomer($customerId)->byType($type)->orderBy('id')->first();
+
+        if ($address) {
+            $address->priority = 1;
+            $address->save();
+        }
+    }
+
     public static function toggleActive($id, $active)
     {
         return self::update(['active' => $active], $id);

app/Repositories/Shop/Customers.php

@@ -6,6 +6,7 @@ use App\Datatables\Shop\CustomerInvoicesDataTable;
 use App\Datatables\Shop\CustomerOrdersDataTable;
 use App\Models\Shop\Customer;
 use App\Traits\Model\Basic;
+use App\Repositories\Shop\CustomerAddresses;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Str;
 
@@ -30,16 +31,31 @@ class Customers
     public static function getSaleChannels($customerId = false)
     {
         $customer = $customerId ? self::get($customerId) : self::getAuth();
-        $saleChannels = $customer ? $customer->sale_channels : false;
+        $saleChannels = collect();
 
-        return $saleChannels ? $saleChannels : SaleChannels::getDefault();
+        if ($customer) {
+            $customer->loadMissing('sale_channels');
+            $saleChannels = $customer->sale_channels ?? collect();
+
+            if ($saleChannels instanceof \Illuminate\Support\Collection && $saleChannels->isNotEmpty()) {
+                return $saleChannels;
+            }
+        }
+
+        $default = SaleChannels::getDefault($customerId);
+
+        return $default ? collect([$default]) : collect();
     }
 
     public static function getSaleChannel($customerId = false)
     {
         $saleChannels = self::getSaleChannels($customerId);
 
-        return $saleChannels->first();
+        if ($saleChannels instanceof \Illuminate\Support\Collection) {
+            return $saleChannels->first();
+        }
+
+        return $saleChannels;
     }
 
     public static function getDeliveries()
@@ -57,12 +73,22 @@ class Customers
 
     public static function editProfile($id = false)
     {
-        return $id ? [
-            'customer' => self::get($id, ['addresses', 'deliveries'])->toArray(),
-            'deliveries' => Deliveries::getAllWithSaleChannel()->toArray(),
+        if (! $id) {
+            abort('403');
+        }
+
+        $customer = self::get($id, ['addresses', 'deliveries', 'sale_channels']);
+
+        $saleChannels = self::getSaleChannels($id);
+
+        return [
+            'customer' => $customer->toArray(),
+            'sale_channels' => $saleChannels->toArray(),
+            'deliveries' => Deliveries::getByCustomer($id)->toArray(),
+            'sale_channel_checks' => Shop::getSaleChannelAvailabilitySummary($saleChannels->pluck('id')->toArray()),
             'orders' => (new CustomerOrdersDataTable())->html(),
             'invoices' => (new CustomerInvoicesDataTable())->html(),
-        ] : abort('403');
+        ];
     }
 
     public static function getAddresses($id = false)
@@ -95,6 +121,16 @@ class Customers
         $data = $customer->toArray();
         $data['sale_channels'] = $customer->sale_channels->pluck('id')->toArray();
         $data['deliveries'] = Deliveries::getBySaleChannels($data['sale_channels'])->toArray();
+        $data['delivery_address_id'] = optional(CustomerAddresses::getDeliveryAddress($id))->id;
+        $data['invoice_address_id'] = optional(CustomerAddresses::getInvoiceAddress($id))->id;
+
+        if (! $data['delivery_address_id'] && ! empty($data['delivery_addresses'])) {
+            $data['delivery_address_id'] = $data['delivery_addresses'][0]['id'] ?? null;
+        }
+
+        if (! $data['invoice_address_id'] && ! empty($data['invoice_addresses'])) {
+            $data['invoice_address_id'] = $data['invoice_addresses'][0]['id'] ?? null;
+        }
 
         return $data;
     }
@@ -102,8 +138,8 @@ class Customers
     public static function storeFull($data)
     {
         $data2 = $data;
-        if ($data['sale_channels'] ?? false) {
-            $saleChannels = $data['sale_channels'] ?? false;
+        $saleChannels = array_key_exists('sale_channels', $data) ? $data['sale_channels'] : null;
+        if ($saleChannels !== null) {
             unset($data['sale_channels']);
         }
         if ($data['deliveries'] ?? false) {
@@ -113,7 +149,9 @@ class Customers
             unset($data['invoices']);
         }
         $customer = self::store($data);
-        $customer->sale_channels()->sync($saleChannels);
+        if ($saleChannels !== null) {
+            $customer->sale_channels()->sync($saleChannels);
+        }
         CustomerAddresses::storeByCustomer($customer, $data2);
 
         return $customer->id;

app/Repositories/Shop/Deliveries.php

@@ -21,12 +21,12 @@ class Deliveries
         $customer = $customerId ? Customers::get($customerId) : Customers::getAuth();
         $saleChannels = $customer ? $customer->sale_channels->pluck('id')->toArray() : [SaleChannels::getDefaultID()];
 
-        return $saleChannels ? self::getBySaleChannels($saleChannels) : false;
+        return $saleChannels ? self::getBySaleChannels($saleChannels) : collect();
     }
 
     public static function getBySaleChannels($saleChannels)
     {
-        return Delivery::bySaleChannels($saleChannels)->with('sale_channel')->get();
+        return Delivery::bySaleChannels($saleChannels)->active()->with('sale_channel')->get();
     }
 
     public static function getSaleChannelId($deliveryId)
@@ -41,7 +41,7 @@ class Deliveries
 
     public static function getAllWithSaleChannel()
     {
-        return Delivery::orderBy('name', 'asc')->active()->public()->with('sale_channel')->get();
+        return Delivery::orderBy('name', 'asc')->active()->with('sale_channel')->get();
     }
 
     public static function toggleActive($id, $active)

app/Repositories/Shop/DeliveryTypes.php

@@ -15,9 +15,15 @@ class DeliveryTypes
         $types = self::getAll();
 
         foreach ($types as $type) {
+            $price = self::getPrice($type->id, $weight);
+
+            if ($price === false) {
+                continue;
+            }
+
             $data[$type->id] = [
                 'name' => $type->name,
-                'price' => self::getPrice($type->id, $weight),
+                'price' => $price,
             ];
         }
 

app/Repositories/Shop/InvoicePDF.php

@@ -17,12 +17,15 @@ class InvoicePDF
     public static function get($id)
     {
         $invoice = Invoices::getFull($id);
+        $customFields = [];
+        if ($orderRef = optional($invoice->order)->ref) {
+            $customFields['order number'] = $orderRef;
+        }
+
         $customer = new Party([
-            'name' => $invoice->customer->name,
+            'name' => optional($invoice->customer)->name ?? __('Client inconnu'),
             'address' => self::makeAddress($invoice->address),
-            'custom_fields' => [
-                'order number' => $invoice->order->ref,
-            ],
+            'custom_fields' => $customFields,
         ]);
 
         $items = self::makeItems($invoice->order->detail);
@@ -48,7 +51,17 @@ class InvoicePDF
 
     public static function makeAddress($address)
     {
-        return $address->address.'<br>'.$address->zipcode.' '.$address->city;
+        if (! $address) {
+            return '';
+        }
+
+        $lines = array_filter([
+            $address->address ?? '',
+            $address->address2 ?? '',
+            trim(($address->zipcode ?? '').' '.($address->city ?? '')),
+        ]);
+
+        return implode('<br>', $lines);
     }
 
     public static function makeItems($details)

app/Repositories/Shop/Invoices.php

@@ -36,7 +36,13 @@ class Invoices
 
     public static function view($uuid)
     {
-        $data = self::getFullByUUID($uuid)->toArray();
+        $invoice = self::getFullByUUID($uuid);
+
+        if (! $invoice) {
+            return false;
+        }
+
+        $data = $invoice->toArray();
         $data['payment_type'] = InvoicePayments::getPaymentType($data['payment_type']);
         $data['status'] = self::getStatus($data['status']);
 

app/Repositories/Shop/Offers.php

@@ -3,6 +3,8 @@
 namespace App\Repositories\Shop;
 
 use App\Models\Shop\Offer;
+use App\Models\Shop\PriceListValue;
+use App\Models\Shop\SaleChannel;
 use App\Traits\Model\Basic;
 
 class Offers
@@ -166,4 +168,42 @@ class Offers
     {
         return Offer::query();
     }
+
+    public static function getSaleChannelsForArticle($articleId)
+    {
+        $channels = SaleChannel::query()
+            ->whereHas('price_lists', function ($query) use ($articleId) {
+                $query->whereHas('tariff.offers', function ($subQuery) use ($articleId) {
+                    $subQuery->byArticle($articleId);
+                })->whereHas('price_list_values');
+            })
+            ->orderBy('name')
+            ->get();
+
+        $offers = Offer::query()
+            ->byArticle($articleId)
+            ->with('article')
+            ->get();
+
+        return $channels->map(function ($channel) use ($offers) {
+            $priceValue = null;
+
+            foreach ($offers as $offer) {
+                $priceCandidate = self::getPrice($offer->id, 1, $channel->id);
+
+                if ($priceCandidate && (float) $priceCandidate->price_taxed > 0) {
+                    $priceValue = $priceCandidate;
+                    break;
+                }
+            }
+
+            return [
+                'id' => $channel->id,
+                'name' => $channel->name,
+                'code' => $channel->code,
+                'price_taxed' => $priceValue ? (float) $priceValue->price_taxed : null,
+                'quantity' => $priceValue ? (int) $priceValue->quantity : null,
+            ];
+        })->toArray();
+    }
 }

app/Repositories/Shop/Paybox.php

@@ -2,12 +2,15 @@
 
 namespace App\Repositories\Shop;
 
+use App\Models\Shop\Invoice;
 use App\Models\Shop\InvoicePayment;
+use App\Repositories\Core\DateTime;
 use Bnb\PayboxGateway\Requests\Paybox\AuthorizationWithCapture;
 use Bnb\PayboxGateway\Requests\PayboxDirect\Capture;
 use Bnb\PayboxGateway\Responses\Exceptions\InvalidSignature;
 use Bnb\PayboxGateway\Responses\Paybox\Verify;
 use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 
 class Paybox
@@ -23,17 +26,141 @@ class Paybox
 
     public static function verifyPayment($invoiceId)
     {
-        $invoice = Invoices::get($invoiceId);
-        $payboxVerify = App::make(Verify::class);
-        try {
-            $success = $payboxVerify->isSuccess($invoice->total_shipped);
-            if ($success) {
-                // process order here after making sure it was real payment
-            }
-            echo 'OK';
-        } catch (InvalidSignature $e) {
-            Log::alert('Invalid payment signature detected');
+        $invoice = Invoices::get($invoiceId, ['order']);
+
+        if (! $invoice) {
+            Log::warning('Paybox callback received for unknown invoice', [
+                'invoice_id' => $invoiceId,
+                'payload' => request()->all(),
+            ]);
+
+            return false;
         }
+
+        $payboxVerify = App::make(Verify::class);
+
+        try {
+            $isSuccessful = $payboxVerify->isSuccess($invoice->total_shipped);
+        } catch (InvalidSignature $e) {
+            Log::alert('Invalid payment signature detected', [
+                'invoice_id' => $invoiceId,
+                'payload' => request()->except('signature'),
+            ]);
+
+            return false;
+        }
+
+        if (! $isSuccessful) {
+            Log::warning('Paybox payment verification failed', [
+                'invoice_id' => $invoiceId,
+                'response_code' => $payboxVerify->getResponseCode(),
+                'payload' => request()->except('signature'),
+            ]);
+
+            return false;
+        }
+
+        return self::finalizeInvoicePayment($invoice);
+    }
+
+    protected static function finalizeInvoicePayment(Invoice $invoice)
+    {
+        $order = $invoice->order;
+
+        if (! $order) {
+            Log::error('Paybox payment cannot be finalized: missing related order', [
+                'invoice_id' => $invoice->id,
+            ]);
+
+            return false;
+        }
+
+        $request = request();
+        $referenceParts = array_filter([
+            $request->input('call_number'),
+            $request->input('transaction_number'),
+        ]);
+        $reference = $referenceParts ? implode('-', $referenceParts) : $request->input('authorization_number');
+        if (! $reference) {
+            $reference = 'paybox-'.$invoice->id;
+        }
+
+        $payload = $request->except('signature');
+        $existingPayment = InvoicePayment::where('invoice_id', $invoice->id)
+            ->where('reference', $reference)
+            ->first();
+        $shouldNotify = false;
+        $validatedTotal = InvoicePayment::where('invoice_id', $invoice->id)
+            ->validated()
+            ->sum('amount');
+
+        if (! $existingPayment && (float) $validatedTotal >= (float) $invoice->total_shipped) {
+            Log::info('Paybox payment ignored: invoice already fully settled', [
+                'invoice_id' => $invoice->id,
+                'order_id' => $order->id,
+                'reference' => $reference,
+            ]);
+
+            return true;
+        }
+
+        DB::transaction(function () use ($invoice, $order, $reference, $payload, $existingPayment, &$shouldNotify) {
+            $attributes = [
+                'payment_type' => 1,
+                'amount' => $invoice->total_shipped,
+                'date' => DateTime::getDate(),
+                'data' => json_encode($payload, JSON_UNESCAPED_UNICODE),
+                'validated' => 1,
+            ];
+
+            if ($existingPayment) {
+                $previousValidationState = (int) ($existingPayment->validated ?? 0);
+                $existingPayment->fill($attributes);
+
+                if ($existingPayment->isDirty()) {
+                    $existingPayment->save();
+                }
+
+                if ($previousValidationState !== 1 && (int) $existingPayment->validated === 1) {
+                    $shouldNotify = true;
+                }
+            } else {
+                InvoicePayment::create($attributes + [
+                    'invoice_id' => $invoice->id,
+                    'reference' => $reference,
+                ]);
+                $shouldNotify = true;
+            }
+
+            Invoices::checkPayments($invoice->id);
+
+            $paidStatus = Orders::getStatusByName('Préparation');
+            if ($paidStatus !== '' && (int) $order->status !== (int) $paidStatus) {
+                $order->status = $paidStatus;
+                $order->save();
+            }
+        });
+
+        if ($shouldNotify) {
+            try {
+                OrderMails::sendOrderConfirmed($order->id);
+            } catch (\Throwable $exception) {
+                Log::error('Unable to send order confirmation email after Paybox payment', [
+                    'order_id' => $order->id,
+                    'invoice_id' => $invoice->id,
+                    'exception' => $exception->getMessage(),
+                ]);
+            }
+        }
+
+        Log::info('Paybox payment finalized successfully', [
+            'invoice_id' => $invoice->id,
+            'order_id' => $order->id,
+            'reference' => $reference,
+            'notified' => $shouldNotify,
+        ]);
+
+        return true;
     }
 
     public static function getPreviousAuthorizedRequest($request)

app/Repositories/Shop/SaleChannels.php

@@ -3,21 +3,52 @@
 namespace App\Repositories\Shop;
 
 use App\Models\Shop\SaleChannel;
+use App\Repositories\Shop\Customers;
 use App\Traits\Model\Basic;
 
 class SaleChannels
 {
     use Basic;
 
-    public static function getDefaultID()
+    public static function getDefaultID($customerId = false)
     {
-        $default = self::getDefault();
+        $default = self::getDefault($customerId);
 
-        return $default ? self::getDefault()->id : false;
+        return $default ? $default->id : false;
     }
 
-    public static function getDefault()
+    public static function getDefault($customerId = false)
     {
+        $sessionChannelId = session('shop.default_sale_channel_id');
+        if ($sessionChannelId) {
+            $sessionChannel = SaleChannel::find($sessionChannelId);
+            if ($sessionChannel) {
+                return $sessionChannel;
+            }
+        }
+
+        $customer = $customerId ? Customers::get($customerId) : Customers::getAuth();
+
+        if ($customer) {
+            $customer->loadMissing('sale_channels');
+
+            if ($customer->default_sale_channel_id) {
+                $preferred = $customer->sale_channels->firstWhere('id', $customer->default_sale_channel_id);
+                if (! $preferred) {
+                    $preferred = SaleChannel::find($customer->default_sale_channel_id);
+                }
+                if ($preferred) {
+                    session(['shop.default_sale_channel_id' => $preferred->id]);
+                    return $preferred;
+                }
+            }
+
+            if ($customer->sale_channels->isNotEmpty()) {
+                session(['shop.default_sale_channel_id' => $customer->sale_channels->first()->id]);
+                return $customer->sale_channels->first();
+            }
+        }
+
         return self::getByCode('EXP');
     }
 

app/Repositories/Shop/Shop.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Repositories\Shop;
+
+use App\Repositories\Core\User\ShopCart;
+
+class Shop
+{
+    public static function getSaleChannelAvailabilitySummary(array $saleChannelIds): array
+    {
+        if (empty($saleChannelIds) || ShopCart::count() === 0) {
+            return [];
+        }
+
+        $cartItems = ShopCart::getContent();
+        $summary = [];
+
+        foreach ($saleChannelIds as $saleChannelId) {
+            $saleChannelId = (int) $saleChannelId;
+            $issues = [];
+            $issueCount = 0;
+
+            foreach ($cartItems as $item) {
+                $offerId = (int) $item->id;
+
+                if (! Offers::getPrice($offerId, 1, $saleChannelId)) {
+                    $offer = Offers::get($offerId, ['article']);
+                    $issues[] = $offer->article->name ?? $item->name;
+                    $issueCount++;
+
+                    if (count($issues) >= 3) {
+                        continue;
+                    }
+                }
+            }
+
+            if (! empty($issues)) {
+                $summary[$saleChannelId] = [
+                    'full_count' => $issueCount,
+                    'names' => array_slice($issues, 0, 3),
+                ];
+            }
+        }
+
+        return $summary;
+    }
+}

build/js/site.js

@@ -1,17 +0,0 @@
-// Prevent closing from click inside dropdown
-$(document).on('click', '.dropdown-menu', function (e) {
-	e.stopPropagation();
-});
-  
-// make it as accordion for smaller screens
-if ($(window).width() < 992) {
-	$('.dropdown-menu a').click(function(e) {
-		e.preventDefault();
-		if ($(this).next('.submenu').length) {
-			$(this).next('.submenu').toggle();
-		}
-		$('.dropdown').on('hide.bs.dropdown', function () {
-			$(this).find('.submenu').hide();
-		});
-	});
-}

database/migrations/shop/2025_02_14_120000_fix_shop_deliveries_userstamps.php

@@ -0,0 +1,47 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        if (! Schema::hasTable('shop_deliveries')) {
+            return;
+        }
+
+        $columns = ['created_by', 'updated_by', 'deleted_by'];
+        $columnsToDrop = [];
+
+        foreach ($columns as $column) {
+            if (Schema::hasColumn('shop_deliveries', $column)) {
+                $columnsToDrop[] = $column;
+            }
+        }
+
+        if ($columnsToDrop) {
+            Schema::table('shop_deliveries', function (Blueprint $table) use ($columnsToDrop) {
+                $table->dropColumn($columnsToDrop);
+            });
+        }
+
+        Schema::table('shop_deliveries', function (Blueprint $table) {
+            $table->unsignedBigInteger('created_by')->nullable()->after('event_date_end');
+            $table->unsignedBigInteger('updated_by')->nullable()->after('created_by');
+            $table->unsignedBigInteger('deleted_by')->nullable()->after('updated_by');
+        });
+    }
+
+    public function down(): void
+    {
+        if (! Schema::hasTable('shop_deliveries')) {
+            return;
+        }
+
+        Schema::table('shop_deliveries', function (Blueprint $table) {
+            $table->dropColumn(['created_by', 'updated_by', 'deleted_by']);
+        });
+    }
+};

database/migrations/shop/2025_03_06_000001_add_default_sale_channel_id_to_shop_customers_table.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up()
+    {
+        Schema::table('shop_customers', function (Blueprint $table) {
+            if (! Schema::hasColumn('shop_customers', 'default_sale_channel_id')) {
+                $table->unsignedInteger('default_sale_channel_id')->nullable()->after('settings');
+                $table->index('default_sale_channel_id', 'shop_customers_default_sale_channel_id_index');
+            }
+        });
+    }
+
+    public function down()
+    {
+        Schema::table('shop_customers', function (Blueprint $table) {
+            if (Schema::hasColumn('shop_customers', 'default_sale_channel_id')) {
+                $table->dropIndex('shop_customers_default_sale_channel_id_index');
+                $table->dropColumn('default_sale_channel_id');
+            }
+        });
+    }
+};

resources/lang/fr/shop.php

@@ -223,6 +223,9 @@ return [
         'successmod' => 'Le canal de vente a été correctement modifié',
         'successdel' => 'Le canal de vente a été correctement effacé',
         'confirmdelete' => 'Confirmez-vous la suppression du canal de vente ?',
+        'missing_offers' => '{1} Ce canal de vente n\'a pas d\'offre pour :count produit.|[2,*] Ce canal de vente n\'a pas d\'offre pour :count produits.',
+        'missing_offers_all' => 'Ce canal de vente n\'a aucune offre pour tous les produits de votre panier.',
+        'cannot_select_with_cart' => 'Vous ne pouvez pas sélectionner ce mode d\'achat tant que votre panier contient des produits non disponibles dans ce mode.',
     ],
     'shelves' => [
         'title' => 'Rayons',