fix: remove 404 about javascript file in admin console

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

app/Datatables/Admin/Shop/CustomerInvoicesDataTable.php

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

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

@@ -12,6 +12,15 @@ 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/CustomerController.php

@@ -2,11 +2,8 @@
 
 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;
 
@@ -47,50 +44,8 @@ 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]);
     }
 

app/Http/Controllers/Shop/InvoiceController.php

@@ -15,14 +15,8 @@ class InvoiceController extends Controller
 
     public function view($uuid)
     {
-        $invoice = Invoices::view($uuid);
-
-        if (! $invoice) {
-            abort(404);
-        }
-
         $data = [
-            'invoice' => $invoice,
+            'invoice' => Invoices::view($uuid),
         ];
 
         return view('Shop.Invoices.view', $data);

app/Http/Controllers/Shop/OrderController.php

@@ -49,22 +49,12 @@ class OrderController extends Controller
     {
         if (ShopCart::count()) {
             $customer = Customers::getWithAddresses();
-            $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;
-            }
+            $deliveries = Deliveries::getByCustomer();
 
             $data = [
-                'customer' => $customerData,
+                'customer' => $customer ? $customer->toArray() : false,
                 'basket' => Baskets::getBasketTotal(),
-                'deliveries' => $deliveries->toArray(),
+                'deliveries' => $deliveries ? $deliveries->toArray() : [],
                 'delivery_types' => DeliveryTypes::getWithPrice(Baskets::getWeight()),
             ];
 

app/Repositories/Shop/Articles.php

@@ -5,7 +5,6 @@ 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;
@@ -71,14 +70,9 @@ 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,19 +100,12 @@ 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' => $unitPrice,
+                'price' => $item->price,
                 'variation' => $offer->variation->name,
                 'image' => Articles::getPreviewSrc(ArticleImages::getFullImageByArticle($offer->article)),
                 'latin' => $offer->article->product->specie->latin ?? false,
@@ -122,24 +115,6 @@ 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/Customers.php

@@ -31,31 +31,16 @@ class Customers
     public static function getSaleChannels($customerId = false)
     {
         $customer = $customerId ? self::get($customerId) : self::getAuth();
-        $saleChannels = collect();
+        $saleChannels = $customer ? $customer->sale_channels : false;
 
-        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();
+        return $saleChannels ? $saleChannels : SaleChannels::getDefault();
     }
 
     public static function getSaleChannel($customerId = false)
     {
         $saleChannels = self::getSaleChannels($customerId);
 
-        if ($saleChannels instanceof \Illuminate\Support\Collection) {
-            return $saleChannels->first();
-        }
-
-        return $saleChannels;
+        return $saleChannels->first();
     }
 
     public static function getDeliveries()
@@ -73,22 +58,12 @@ class Customers
 
     public static function editProfile($id = false)
     {
-        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()),
+        return $id ? [
+            'customer' => self::get($id, ['addresses', 'deliveries'])->toArray(),
+            'deliveries' => Deliveries::getAllWithSaleChannel()->toArray(),
             'orders' => (new CustomerOrdersDataTable())->html(),
             'invoices' => (new CustomerInvoicesDataTable())->html(),
-        ];
+        ] : abort('403');
     }
 
     public static function getAddresses($id = false)

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) : collect();
+        return $saleChannels ? self::getBySaleChannels($saleChannels) : false;
     }
 
     public static function getBySaleChannels($saleChannels)
     {
-        return Delivery::bySaleChannels($saleChannels)->active()->with('sale_channel')->get();
+        return Delivery::bySaleChannels($saleChannels)->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()->with('sale_channel')->get();
+        return Delivery::orderBy('name', 'asc')->active()->public()->with('sale_channel')->get();
     }
 
     public static function toggleActive($id, $active)

app/Repositories/Shop/DeliveryTypes.php

@@ -15,15 +15,9 @@ 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' => $price,
+                'price' => self::getPrice($type->id, $weight),
             ];
         }
 

app/Repositories/Shop/Invoices.php

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

app/Repositories/Shop/Offers.php

@@ -3,8 +3,6 @@
 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
@@ -168,42 +166,4 @@ 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/SaleChannels.php

@@ -3,52 +3,21 @@
 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($customerId = false)
+    public static function getDefaultID()
     {
-        $default = self::getDefault($customerId);
+        $default = self::getDefault();
 
-        return $default ? $default->id : false;
+        return $default ? self::getDefault()->id : false;
     }
 
-    public static function getDefault($customerId = false)
+    public static function getDefault()
     {
-        $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

@@ -1,47 +0,0 @@
-<?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;
-    }
-}

database/migrations/shop/2025_02_14_120000_fix_shop_deliveries_userstamps.php

@@ -1,47 +0,0 @@
-<?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

@@ -1,28 +0,0 @@
-<?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,9 +223,6 @@ 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',

resources/views/Admin/Shop/CustomerInvoices/list.blade.php

@@ -4,28 +4,8 @@
         'model' => 'customer_invoices',
         'with_print' => false,
         'with_filters' => false,
-        'show_callback' => 'AdminCustomerInvoiceView(id);',
     ])
     <x-layout.modal title="Filtres" id="modal-customer_invoices-filters">
         @include('Admin.Shop.CustomerInvoices.partials.filters', ['model' => 'customer_invoices'])
     </x-layout.modal>
 </x-card>
-
-@include('load.layout.modal')
-
-@push('js')
-    <script>
-        (function() {
-            const customerInvoiceShowTemplate = "{{ route('Shop.Invoices.view', ['uuid' => '__UUID__']) }}";
-
-            window.AdminCustomerInvoiceView = function(id) {
-                if (!id) {
-                    return;
-                }
-
-                const url = customerInvoiceShowTemplate.replace('__UUID__', id);
-                openModal('Voir une facture', '#invoice-form', url, false, false, 'xl', true);
-            };
-        })();
-    </script>
-@endpush

resources/views/Admin/Shop/Deliveries/form.blade.php

@@ -15,7 +15,6 @@
                 <div class="row">
                     <div class="col-5">
                         {{ Form::label('active', __('Actif')) }}<br/>
-                        <input type="hidden" name="active" value="0">
                         @include("components.form.toggle", [
                             'name' => 'active',
                             'value' => $delivery['active'] ?? false,
@@ -25,7 +24,6 @@
                     </div>
                     <div class="col-3">
                         {{ Form::label('is_public', __('Type')) }}
-                        <input type="hidden" name="is_public" value="0">
                         @include('components.form.toggle', [
                             'name' => 'is_public',
                             'value' => $delivery['is_public'] ?? false,

resources/views/Shop/Articles/show.blade.php

@@ -48,37 +48,6 @@
 
         </div>
         <div class="col-lg-3 col-xs-12">
-            @if (config('app.debug') && ($article['current_sale_channel'] ?? false))
-                <div class="alert alert-info p-2 mb-3">
-                    <strong>Canal actif :</strong>
-                    {{ $article['current_sale_channel']['name'] ?? 'N/A' }}
-                    <span class="d-block small text-muted">
-                        ID {{ $article['current_sale_channel']['id'] ?? '–' }} · Code {{ $article['current_sale_channel']['code'] ?? '–' }}
-                    </span>
-                    @if (!empty($article['available_sale_channels']))
-                        <hr class="my-2">
-                        <strong class="d-block">Offres disponibles dans :</strong>
-                        <ul class="list-unstyled mb-0 small">
-                            @foreach ($article['available_sale_channels'] as $channel)
-                                <li class="d-flex justify-content-between align-items-start">
-                                    <span>
-                                        • {{ $channel['name'] }}
-                                        <span class="d-block text-muted" style="font-size: 0.85em; padding-left: 0.9em;">code {{ $channel['code'] }}</span>
-                                    </span>
-                                    @if (isset($channel['price_taxed']))
-                                        <span class="ml-2 text-nowrap text-right">
-                                            {{ number_format($channel['price_taxed'], 2, ',', ' ') }} € TTC
-                                            @if (! empty($channel['quantity']))
-                                                <span class="d-block text-muted" style="font-size: 0.85em;">Qté min. {{ $channel['quantity'] }}</span>
-                                            @endif
-                                        </span>
-                                    @endif
-                                </li>
-                            @endforeach
-                        </ul>
-                    @endif
-                </div>
-            @endif
             @include('Shop.Articles.partials.ArticleAddBasket')
         </div>
     </div>

resources/views/Shop/Baskets/basket.blade.php

@@ -58,7 +58,7 @@
                 updateBasket(offer_id, quantity, function() {
                     calculatePrice($row);
                     calculateTotal();
-                }, $row);
+                });
             });
 
             $('.basket-delete').click(function() {
@@ -70,20 +70,13 @@
             });
         }
 
-        function updateBasket(offer_id, quantity, callback, $row) {
+        function updateBasket(offer_id, quantity, callback) {
             var data = {
                 offer_id: offer_id,
                 quantity: quantity,
                 update: true
             };
-            $.post("{{ route('Shop.Basket.addBasket') }}", data, function(response) {
-                if ($row && response && response.added && typeof response.added.price !== 'undefined') {
-                    $row.find('.basket-price').text(fixNumber(response.added.price));
-                    $row.find('.basket-total-row').text(fixNumber(response.added.price * $row.find('.basket-quantity').val()));
-                }
-                callback(response);
-                refreshBasketTop();
-            });
+            $.post("{{ route('Shop.Basket.addBasket') }}", data, callback);
         }
 
         function calculatePrice($that) {

resources/views/Shop/Customers/partials/deliveries.blade.php

@@ -1,168 +1,25 @@
-@push('styles')
-    <style>
-        .sale-channel-wrapper {
-            border: none;
-            background-color: transparent;
-        }
-
-        .sale-channel-wrapper:not(.blocked) .card-body {
-            border: 1px solid #e5e7eb;
-            border-radius: .75rem;
-            background-color: #ffffff;
-            transition: border-color 0.2s ease, box-shadow 0.2s ease;
-        }
-
-        .sale-channel-wrapper:not(.blocked) .card-body:hover {
-            border-color: #3b82f6;
-            box-shadow: 0 0.35rem 0.8rem rgba(37, 99, 235, 0.12);
-        }
-
-        .sale-channel-wrapper.blocked .card-body {
-            border: 1px solid #d1d5db;
-            border-radius: .75rem;
-            background-color: #f3f4f6;
-        }
-
-        .sale-channel-wrapper .card-body {
-            padding: 1.25rem;
-        }
-
-        .sale-channel-toggle {
-            display: flex;
-            align-items: flex-start;
-            justify-content: center;
-            padding-top: 0.25rem;
-        }
-
-        .sale-channel-content strong {
-            font-size: 1.05rem;
-        }
-
-        .sale-channel-warning {
-            font-size: 0.85rem;
-        }
-
-        .sale-channel-wrapper .icheck-success > input:first-child + label::before,
-        .sale-channel-wrapper .icheck-primary > input:first-child + label::before,
-        .sale-channel-wrapper .icheck-danger > input:first-child + label::before {
-            opacity: 1;
-            border-width: 2px;
-            border-color: #9ca3af;
-        }
-
-        .sale-channel-wrapper.blocked .icheck-success > input:first-child + label::before,
-        .sale-channel-wrapper.blocked .icheck-primary > input:first-child + label::before,
-        .sale-channel-wrapper.blocked .icheck-danger > input:first-child + label::before {
-            border-color: #cbd5f5;
-            background-color: #f8fafc;
-        }
-
-        .sale-channel-wrapper .icheck-success > input:first-child + label,
-        .sale-channel-wrapper .icheck-primary > input:first-child + label,
-        .sale-channel-wrapper .icheck-danger > input:first-child + label {
-            opacity: 1;
-        }
-
-        .sale-channel-wrapper [class*="icheck-"] > input:first-child:disabled + label {
-            opacity: 1;
-        }
-    </style>
-@endpush
-
-@php
-    $saleChannelsCollection = collect($sale_channels);
-    $firstSaleChannel = $saleChannelsCollection->first();
-    $selectedSaleChannelId = $customer['default_sale_channel_id'] ?? ($firstSaleChannel['id'] ?? null);
-    $cartCount = app('App\\Repositories\\Core\\User\\ShopCart')::count();
-@endphp
-
-@if ($cartCount > 0)
-    <div class="alert alert-warning">
-        <strong>Note :</strong> en changeant votre mode d'achat, les articles de votre panier seront transférés sur la liste de prix correspondant au nouveau canal de vente sélectionné.
-    </div>
-@endif
-
-@foreach ($saleChannelsCollection as $saleChannel)
-    @php
-        $check = $sale_channel_checks[$saleChannel['id']] ?? null;
-        $isBlocked = $check && $saleChannel['id'] !== $selectedSaleChannelId;
-    @endphp
-    <div class="card sale-channel-wrapper mb-3 @if($isBlocked) blocked @endif">
-        <div class="card-body py-3">
-            <div class="row align-items-start">
-                <div class="col-1 sale-channel-toggle">
-
+@foreach ($deliveries as $delivery)
+    <div class="row">
+        <div class="col-1 text-right pt-1">
             @include('components.form.radios.icheck', [
-                'name' => 'sale_channel_id',
-                'id_name' => 'sale_channel_id_' . $saleChannel['id'],
-                'val' => $saleChannel['id'],
-                'value' => $selectedSaleChannelId,
-                'class' => 'sale-channel',
-                'disabled' => $isBlocked,
+                'name' => 'delivery_id',
+                'id_name' => 'delivery_id_' . $delivery['id'],
+                'value' => $delivery['id'],
+                'checked' => $customer['sale_delivery_id'] ?? false,
+                'class' => 'delivery',
             ])
-                </div>
-                <div class="col-11 sale-channel-content @if($isBlocked) text-muted @endif">
-                    <strong>{{ $saleChannel['name'] }}</strong><br />
-                    <p class="mb-2">{!! $saleChannel['description'] ?? '' !!}</p>
-                    @if ($check)
-                        <div class="text-danger small mb-0 sale-channel-warning">
-                            @php $missingCount = $check['full_count'] ?? count($check['names']); @endphp
-                            @if ($cartCount > 0 && $missingCount >= $cartCount)
-                                {{ __('shop.sale_channels.missing_offers_all') }}
-                            @else
-                                {{ trans_choice('shop.sale_channels.missing_offers', $missingCount, ['count' => $missingCount]) }}
-                                <br>
-                                @if ($missingCount > 3)
-                                    <span class="d-block">{{ implode(', ', array_slice($check['names'], 0, 3)) }}, …</span>
-                                @else
-                                    <span class="d-block">{{ implode(', ', $check['names']) }}</span>
-                                @endif
-                            @endif
-                            <div class="d-flex align-items-start mt-1">
-                                <span class="mr-1">⚠️</span>
-                                <span>{{ __('shop.sale_channels.cannot_select_with_cart') }}</span>
-                            </div>
-                        </div>
-                    @endif
-                </div>
-            </div>
+        </div>
+        <div class="col-11 pt-3">
+            <strong>{{ $delivery['name'] }} - {{ $delivery['sale_channel']['name'] }}</strong><br />
+            <p>{{ $delivery['description'] }}</p>
         </div>
     </div>
 @endforeach
 
 @push('js')
     <script>
-        const $saleChannels = $('.sale-channel');
-        const updateUrl = '{{ route('Shop.Customers.storeProfileAjax') }}';
-        const token = '{{ csrf_token() }}';
-        const customerId = {{ $customer['id'] ?? 'null' }};
-        let currentSaleChannelId = '{{ $selectedSaleChannelId }}';
-
-        $saleChannels.off().change(function() {
-            if (!customerId) {
-                return;
-            }
-
-            const selectedSaleChannel = $(this).val();
-
-            $.post(updateUrl, {
-                _token: token,
-                id: customerId,
-                default_sale_channel_id: selectedSaleChannel,
-            }).done(function() {
-                currentSaleChannelId = selectedSaleChannel;
-                window.location.reload();
-            }).fail(function(xhr) {
-                const message = xhr.responseJSON && xhr.responseJSON.message
-                    ? xhr.responseJSON.message
-                    : "{{ __('Une erreur est survenue lors de l\'enregistrement du canal de vente préféré.') }}";
-
-                alert(message);
-
-                if (currentSaleChannelId) {
-                    $saleChannels.filter('[value="' + currentSaleChannelId + '"]').prop('checked', true);
-                }
-            });
+        $('.delivery').off().change(function() {
+            console.log($(this).val());
         });
     </script>
 @endpush

resources/views/Shop/Customers/partials/sale.blade.php

@@ -1,69 +1,35 @@
-@php
-    $saleChannels = $sale_channels ?? [];
-@endphp
-
-@if (count($saleChannels) > 1)
-    <nav>
-        <div class="nav nav-tabs pl-2">
-            <a href="#deliveriesTab" data-toggle="tab" class="nav-item nav-link active" role="tab" aria-selected="true">
-                MON MODE D'ACHAT
-            </a>
-            <a href="#ordersTab" data-toggle="tab" class="nav-item nav-link" role="tab" aria-selected="false">
-                SUIVI DE COMMANDES
-            </a>
-            <a href="#invoicesTab" data-toggle="tab" class="nav-item nav-link" role="tab" aria-selected="false">
-                FACTURES
-            </a>
-        </div>
-    </nav>
-
-    <div class="tab-content">
-        <div class="tab-pane fade show active pt-0 pb-0" id="deliveriesTab">
-            <x-card classBody="bg-light">
-                @include('Shop.Customers.partials.deliveries')
-            </x-card>
-        </div>
-        <div class="tab-pane fade show pt-0 pb-0" id="ordersTab">
-            <x-card classBody="bg-light">
-                @include('Shop.Orders.partials.list', [
-                    'dataTable' => $orders,
-                ])
-            </x-card>
-        </div>
-        <div class="tab-pane fade show pt-0 pb-0" id="invoicesTab">
-            <x-card classBody="bg-light">
-                @include('Shop.Invoices.partials.list', [
-                    'dataTable' => $invoices,
-                ])
-            </x-card>
-        </div>
+<nav>
+    <div class="nav nav-tabs pl-2">
+        <a href="#deliveriesTab" data-toggle="tab" class="nav-item nav-link active" role="tab" aria-selected="true">
+            MON MODE D'ACHAT
+        </a>
+        <a href="#ordersTab" data-toggle="tab" class="nav-item nav-link" role="tab" aria-selected="false">
+            SUIVI DE COMMANDES
+        </a>
+        <a href="#invoicesTab" data-toggle="tab" class="nav-item nav-link" role="tab" aria-selected="false">
+            FACTURES
+        </a>
     </div>
-@else
-    <nav>
-        <div class="nav nav-tabs pl-2">
-            <a href="#ordersTab" data-toggle="tab" class="nav-item nav-link active" role="tab" aria-selected="true">
-                SUIVI DE COMMANDES
-            </a>
-            <a href="#invoicesTab" data-toggle="tab" class="nav-item nav-link" role="tab" aria-selected="false">
-                FACTURES
-            </a>
-        </div>
-    </nav>
+</nav>
 
-    <div class="tab-content">
-        <div class="tab-pane fade show active pt-0 pb-0" id="ordersTab">
-            <x-card classBody="bg-light">
-                @include('Shop.Orders.partials.list', [
-                    'dataTable' => $orders,
-                ])
-            </x-card>
-        </div>
-        <div class="tab-pane fade show pt-0 pb-0" id="invoicesTab">
-            <x-card classBody="bg-light">
-                @include('Shop.Invoices.partials.list', [
-                    'dataTable' => $invoices,
-                ])
-            </x-card>
-        </div>
+<div class="tab-content">
+    <div class="tab-pane fade show active pt-0 pb-0" id="deliveriesTab">
+        <x-card classBody="bg-light">
+            @include('Shop.Customers.partials.deliveries')
+        </x-card>
     </div>
-@endif
+    <div class="tab-pane fade show pt-0 pb-0" id="ordersTab">
+        <x-card classBody="bg-light">
+            @include('Shop.Orders.partials.list', [
+                'dataTable' => $orders,
+            ])
+        </x-card>
+    </div>
+    <div class="tab-pane fade show pt-0 pb-0" id="invoicesTab">
+        <x-card classBody="bg-light">
+            @include('Shop.Invoices.partials.list', [
+                'dataTable' => $invoices,
+            ])
+        </x-card>
+    </div>
+</div>

resources/views/Shop/Orders/partials/addresses.blade.php

@@ -1,51 +1,13 @@
-@php
-    $addresses = collect($addresses ?? []);
-    $preselectedAddressId = old($name);
-
-    if ($preselectedAddressId === null && is_string($name) && str_contains($name, '[')) {
-        $dotName = preg_replace('/\[(.*?)\]/', '.$1', $name);
-        $dotName = trim($dotName, '.');
-        $preselectedAddressId = $dotName ? old($dotName) : null;
-    }
-
-    if (($preselectedAddressId === null || $preselectedAddressId === '') && $addresses->isNotEmpty()) {
-        $defaultAddress = $addresses->firstWhere('priority', 1);
-
-        if (! $defaultAddress) {
-            $defaultAddress = $addresses
-                ->filter(function ($address) {
-                    return (int) ($address['priority'] ?? 0) > 0;
-                })
-                ->sortByDesc(function ($address) {
-                    return (int) ($address['priority'] ?? 0);
-                })
-                ->first();
-        }
-
-        if (! $defaultAddress) {
-            $defaultAddress = $addresses->firstWhere('is_default', true)
-                ?? $addresses->firstWhere('default', true);
-        }
-
-        if (! $defaultAddress) {
-            $defaultAddress = $addresses->first();
-        }
-
-        $preselectedAddressId = $defaultAddress['id'] ?? null;
-    }
-
-    $addresses = $addresses->all();
-@endphp
-
 @if ($addresses)
-    @foreach ($addresses as $address)
+    @foreach ($addresses ?? [] as $address)
         <div class="row mb-3">
             <div class="col-1">
                 @include('components.form.radios.icheck', [
                     'name' => $name,
                     'val' => $address['id'],
                     'id' => $prefix . '_address_' . $address['id'],
-                    'value' => $preselectedAddressId,
+                    'value' =>
+                        old($name) ?? $address['priority'] || count($addresses) === 1 ? $address['id'] : false,
                 ])
             </div>
             <div class="col-11">

resources/views/Shop/Orders/partials/deliveries.blade.php

@@ -1,20 +1,10 @@
-@php
-    $defaultSaleChannelId = $customer['default_sale_channel_id'] ?? null;
-    $preselectedDeliveryId = old('delivery_id');
-
-    if (! $preselectedDeliveryId && $defaultSaleChannelId) {
-        $match = collect($deliveries)->firstWhere('sale_channel_id', $defaultSaleChannelId);
-        $preselectedDeliveryId = $match['id'] ?? null;
-    }
-@endphp
-
 @foreach ($deliveries as $delivery)
     <div class="row">
         <div class="col-1">
             @include('components.form.radios.icheck', [
                 'name' => 'delivery_id',
                 'val' => $delivery['id'],
-                'value' => $preselectedDeliveryId,
+                'value' => (int) old('delivery_id') === $delivery['id'] ? $delivery['id'] : null,
                 'id' => 'delivery_' . $delivery['id'],
                 'class' => 'delivery_mode' . ($delivery['at_house'] ? ' at_house' : ''),
             ])
@@ -39,29 +29,16 @@ ci-contre
 @push('js')
     <script>
         function handleDeliveries() {
-            var $deliveryInputs = $('#delivery_mode input.delivery_mode');
-
-            $deliveryInputs.change(function() {
-                var $currentDelivery = $(this);
-                var deliveryTypeId = $('input[name=delivery_type_id]:checked').val();
-
-                if ($currentDelivery.hasClass('at_house')) {
+            $('#delivery_mode input.delivery_mode').change(function() {
+                if ($(this).hasClass('at_house')) {
                     $('#delivery_addresses').closest('.card').removeClass('d-none');
+                    var deliveryTypeId = $('input[name=delivery_type_id]:checked').val()
                 } else {
                     $('#delivery_addresses').closest('.card').addClass('d-none');
                 }
-
-                var deliveryId = $currentDelivery.val();
+                var deliveryId = $(this).val();
                 refreshBasketTotal(deliveryId, deliveryTypeId);
             });
-
-            var $preselected = $deliveryInputs.filter(':checked').first();
-
-            if ($preselected.length) {
-                $preselected.trigger('change');
-            } else {
-                $('#delivery_addresses').closest('.card').addClass('d-none');
-            }
         }
 
         handleDeliveries();

resources/views/Shop/Orders/partials/shipping.blade.php

@@ -7,18 +7,7 @@
                 </th>
             </tr>
         </thead>
-        @php
-            $deliveryTypes = collect($delivery_types);
-            $preselectedDeliveryTypeId = old('delivery_type_id');
-
-            if ($preselectedDeliveryTypeId === null || $preselectedDeliveryTypeId === '') {
-                $preselectedDeliveryTypeId = $deliveryTypes->keys()->first();
-            }
-
-            $deliveryTypes = $deliveryTypes->all();
-        @endphp
-
-        @foreach ($deliveryTypes as $delivery_type_id => $delivery_type)
+        @foreach ($delivery_types as $delivery_type_id => $delivery_type)
             <tr>
                 <td>
                     @include('components.form.radios.icheck', [
@@ -26,7 +15,6 @@
                         'val' => $delivery_type_id,
                         'id' => 'delivery_type_' . $delivery_type_id,
                         'class' => 'delivery_type',
-                        'value' => $preselectedDeliveryTypeId,
                     ])
                 </td>
                 <td>
@@ -43,19 +31,11 @@
 @push('js')
     <script>
         function handleDeliveryTypes() {
-            var $deliveryTypeInputs = $('input.delivery_type');
-
-            $deliveryTypeInputs.change(function() {
+            $('input.delivery_type').change(function() {
                 var deliveryTypeId = $(this).val();
                 var deliveryId = $('input[name=delivery_id]:checked').val()
                 refreshBasketTotal(deliveryId, deliveryTypeId);
             });
-
-            var $preselected = $deliveryTypeInputs.filter(':checked').first();
-
-            if ($preselected.length) {
-                $preselected.trigger('change');
-            }
         }
         handleDeliveryTypes();
     </script>

resources/views/Shop/layout/layout.blade.php

@@ -17,7 +17,6 @@
     <link rel="shortcut icon" type="image/x-icon" href="{{ asset('img/favicon.ico') }}">
     <link rel="stylesheet" href="/css/site.min.css?{{ date('Ymd') }}" type="text/css" media="all">
 
-    @stack('styles')
     @stack('css')
 
 </head>

resources/views/load/form/editor/tinymce.blade.php

@@ -38,8 +38,7 @@
                             /<(p|a|div|span|strike|strong|i|u)[^>]*?>(\s|&nbsp;|<br\/>|\r|\n)*?<\/(p|a|div|span|strike|strong|i|u)>/gi,
                             ''); // Empty tags
                     },
-                    skin: "oxide",
-                    content_css: 'oxide',
+                    skin: "boilerplate",
                     language: '{{ App::getLocale() }}',
                     file_picker_callback: function(callback, value, meta) {
                         var x = window.innerWidth || document.documentElement.clientWidth || document.getElementsByTagName(

routes/Admin/Shop/CustomerInvoices.php

@@ -3,4 +3,5 @@
 Route::prefix('CustomerInvoices')->name('CustomerInvoices.')->group(function () {
     Route::get('', 'CustomerInvoiceController@index')->name('index');
     Route::delete('destroy/{id?}', 'CustomerInvoiceController@destroy')->name('destroy');
+    Route::get('view/{id?}', 'CustomerInvoiceController@view')->name('view');
 });