new: doc: added `AGENTS.md` and small addition of a french paragraph

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

Dockerfile

@@ -43,7 +43,6 @@ COPY . /app
 WORKDIR /app
 
 RUN mkdir -p /app/bootstrap/cache \
-    /app/storage/media-library/temp \
     /app/storage/framework/cache \
     /app/storage/framework/views \
     /app/storage/framework/sessions \
@@ -85,6 +84,8 @@ RUN apk add --no-cache xz
 # bring PHP app with vendor
 COPY --from=phpdeps /app /app
 
+# ensure required runtime dirs exist (empty is fine)
+RUN mkdir -p storage/framework/{cache,views,sessions} bootstrap/cache
 # create artifact (use tar + xz so we don't depend on GNU tar -J)
 RUN mkdir -p /out \
  && tar -C /app -cf /out/app.tar \

app/Http/Controllers/Admin/Botanic/SpecieController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Admin\Botanic;
 
 use App\Datatables\Botanic\SpeciesDataTable;
+use App\Repositories\Botanic\Genres;
 use App\Repositories\Botanic\Species;
 use Illuminate\Http\Request;
 
@@ -20,7 +21,7 @@ class SpecieController extends Controller
 
     public function create()
     {
-        $data = Species::init();
+        $data = Genres::init();
 
         return view('Admin.Botanic.Species.create', $data);
     }
@@ -35,7 +36,7 @@ class SpecieController extends Controller
 
     public function edit($id)
     {
-        $data = Species::init();
+        $data = Genres::init();
         $data['specie'] = Species::getFull($id);
 
         return view('Admin.Botanic.Species.edit', $data);

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

@@ -71,10 +71,7 @@ class PriceListValueController extends Controller
 
     public function addPrice($index)
     {
-        $data = [
+        $data['index'] = $index;
-            'index' => $index,
-            'taxes' => Taxes::getOptions(),
-        ];
 
         return view('Admin.Shop.PriceListValues.partials.row_price', $data);
     }

app/Http/Requests/Admin/Shop/StoreArticlePost.php

@@ -3,7 +3,6 @@
 namespace App\Http\Requests\Admin\Shop;
 
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Rule;
 
 class StoreArticlePost extends FormRequest
 {
@@ -14,13 +13,8 @@ class StoreArticlePost extends FormRequest
 
     public function rules()
     {
-        $articleId = $this->input('id');
-
         return [
-            'ref' => [
+            'ref' => 'required|unique:shop_articles',
-                'required',
-                Rule::unique('shop_articles', 'ref')->ignore($articleId)->whereNull('deleted_at'),
-            ],
             'product_type' => 'required',
             'product_id' => 'required',
             'article_nature_id' => 'required',

app/Providers/AppServiceProvider.php

@@ -11,6 +11,9 @@ class AppServiceProvider extends ServiceProvider
 {
     public function boot()
     {
+        if (config('app.env') === 'production') {
+            \URL::forceScheme('https');
+        }
         Schema::defaultStringLength(191);
         View::composer('Shop.layout.layout', LayoutComposer::class);
     }

app/Repositories/Botanic/Varieties.php

@@ -65,9 +65,6 @@ class Varieties
     {
         $images = $data['images'] ?? false;
         $tags = $data['tags'] ?? false;
-        if (! array_key_exists('plus', $data) || $data['plus'] === null) {
-            $data['plus'] = '';
-        }
         unset($data['images']);
         unset($data['tags']);
         $variety = self::store($data);

app/Repositories/Core/Medias.php

@@ -2,8 +2,6 @@
 
 namespace App\Repositories\Core;
 
-use Spatie\MediaLibrary\MediaCollections\Models\Media as MediaModel;
-
 class Medias
 {
     public static function getImage($model, $conversion = 'normal', $collection = 'images')
@@ -81,9 +79,13 @@ class Medias
 
     public static function getImageSrc($image)
     {
-        $media = self::resolveMedia($image);
+        if (! $image) {
+            return null;
+        }
+        $id = $image['id'];
+        $filename = self::getFilename($image);
 
-        return $media ? $media->getUrl() : null;
+        return "/storage/{$id}/{$filename}";
     }
 
     public static function getThumbSrc($image)
@@ -108,12 +110,6 @@ class Medias
 
     public static function getSrcByType($image, $type)
     {
-        $media = self::resolveMedia($image);
-
-        if ($media) {
-            return $type ? $media->getUrl($type) : $media->getUrl();
-        }
-
         return $image ? '/storage/'.$image['id'].'/conversions/'.self::getFilename($image, $type) : false;
     }
 
@@ -128,48 +124,4 @@ class Medias
     {
         return str_replace(['#', '/', '\\', ' '], '-', $name);
     }
-
-    protected static function resolveMedia($image): ?MediaModel
-    {
-        if ($image instanceof MediaModel) {
-            return $image;
-        }
-
-        if (is_null($image)) {
-            return null;
-        }
-
-        if (is_array($image)) {
-            return self::hydrateMedia($image);
-        }
-
-        if (is_object($image)) {
-            if ($image instanceof \ArrayAccess) {
-                return self::hydrateMedia((array) $image);
-            }
-
-            $array = method_exists($image, 'toArray') ? $image->toArray() : (array) $image;
-
-            return self::hydrateMedia($array);
-        }
-
-        $id = data_get($image, 'id');
-
-        return $id ? MediaModel::query()->withoutGlobalScopes()->find($id) : null;
-    }
-
-    protected static function hydrateMedia(array $attributes): ?MediaModel
-    {
-        $id = data_get($attributes, 'id');
-
-        if (! $id) {
-            return null;
-        }
-
-        $media = new MediaModel();
-        $media->forceFill($attributes);
-        $media->exists = true;
-
-        return $media;
-    }
 }

app/Repositories/Shop/ArticleTags.php

@@ -27,34 +27,21 @@ class ArticleTags
 
         switch ($article->product_type) {
             case 'App\Models\Botanic\Variety':
-                $variety = $article->product;
+                $data += $article->product->tags->toArray();
-                if ($variety && $variety->tags) {
+                if ($article->product->specie ?? false) {
-                    $data = array_merge($data, $variety->tags->toArray());
+                    $data += $article->product->specie->tags->toArray();
-                }
-                if ($variety && $variety->specie && $variety->specie->tags) {
-                    $data = array_merge($data, $variety->specie->tags->toArray());
                 }
                 break;
             case 'App\Models\Botanic\Specie':
-                $specie = $article->product;
+                $data += $article->product->tags->toArray();
-                if ($specie && $specie->tags) {
-                    $data = array_merge($data, $specie->tags->toArray());
-                }
                 break;
             case 'App\Models\Shop\Merchandise':
-                $merchandise = $article->product;
+                $data += $article->product->tags->toArray();
-                if ($merchandise && $merchandise->tags) {
+                $data += $article->product->producer->tags->toArray();
-                    $data = array_merge($data, $merchandise->tags->toArray());
-                }
-                if ($merchandise && $merchandise->producer && $merchandise->producer->tags) {
-                    $data = array_merge($data, $merchandise->producer->tags->toArray());
-                }
                 break;
             default:
         }
-        if ($article->tags) {
+        $data += $article->tags->toArray();
-            $data = array_merge($data, $article->tags->toArray());
-        }
 
         foreach ($data as $tag) {
             if (! isset($tags[$tag['group']][$tag['name']])) {

app/Repositories/Shop/Articles.php

@@ -19,7 +19,7 @@ class Articles
 
     public static function autocomplete($str)
     {
-        $data = Article::byAutocomplete($str)->visible()->orderBy('name')->limit(20)->pluck('name', 'id');
+        $data = Article::byAutocomplete($str)->orderBy('name')->limit(20)->pluck('name', 'id');
         $export = [];
         foreach ($data as $key => $name) {
             $export[] = ['value' => $key, 'text' => $name];
@@ -135,11 +135,8 @@ class Articles
                 $data['specie'] = $article->product ? $article->product->description : '';
                 break;
             case 'App\Models\Shop\Merchandise':
-                $merchandise = $article->product;
+                $data['merchandise'] = $article->product ? $article->product->description : '';
-                $data['merchandise'] = $merchandise ? ($merchandise->description ?? '') : '';
+                $data['producer'] = $article->product->producer->description;
-                if ($merchandise && $merchandise->producer) {
-                    $data['producer'] = $merchandise->producer->description ?? '';
-                }
                 break;
             default:
         }

app/Repositories/Shop/Offers.php

@@ -3,7 +3,6 @@
 namespace App\Repositories\Shop;
 
 use App\Models\Shop\Offer;
-use App\Models\Shop\PriceList;
 use App\Models\Shop\PriceListValue;
 use App\Models\Shop\SaleChannel;
 use App\Traits\Model\Basic;
@@ -186,44 +185,20 @@ class Offers
             ->with([
                 'article',
                 'tariff:id,status_id',
-                'variation',
             ])
             ->get();
 
         return $channels->map(function ($channel) use ($offers) {
             $priceValue = null;
             $candidateOffer = null;
-            $allOffersForChannel = [];
 
             foreach ($offers as $offer) {
                 $priceCandidate = self::getPrice($offer->id, 1, $channel->id);
 
                 if ($priceCandidate && (float) $priceCandidate->price_taxed > 0) {
-                    // Get price list name
+                    $priceValue = $priceCandidate;
-                    $priceListName = null;
+                    $candidateOffer = $offer;
-                    if ($priceCandidate) {
+                    break;
-                        $priceListModel = PriceList::find($priceCandidate->price_list_id);
-                        $priceListName = $priceListModel ? $priceListModel->name : null;
-                    }
-
-                    // Collect all offers with their details
-                    $allOffersForChannel[] = [
-                        'id' => $offer->id,
-                        'variation_name' => $offer->variation ? $offer->variation->name : null,
-                        'stock_current' => (int) $offer->stock_current,
-                        'status_id' => (int) $offer->status_id,
-                        'is_active' => (int) $offer->status_id === 1,
-                        'tariff_id' => $offer->tariff_id ? (int) $offer->tariff_id : null,
-                        'price_taxed' => (float) $priceCandidate->price_taxed,
-                        'quantity' => (int) $priceCandidate->quantity,
-                        'price_list_name' => $priceListName,
-                    ];
-
-                    // Keep first valid offer as the main candidate
-                    if (!$candidateOffer) {
-                        $priceValue = $priceCandidate;
-                        $candidateOffer = $offer;
-                    }
                 }
             }
 
@@ -234,7 +209,6 @@ class Offers
             $offerHasStock = $candidateOffer && $candidateOffer->stock_current !== null
                 ? (float) $candidateOffer->stock_current > 0
                 : null;
-            $offerTariffId = $candidateOffer && $candidateOffer->tariff_id ? (int) $candidateOffer->tariff_id : null;
 
             return [
                 'id' => $channel->id,
@@ -247,8 +221,6 @@ class Offers
                 'offer_stock_current' => $offerStock,
                 'offer_has_stock' => $offerHasStock,
                 'tariff_status_id' => $offerTariffStatus,
-                'tariff_id' => $offerTariffId,
-                'all_offers' => $allOffersForChannel,
             ];
         })->toArray();
     }

app/Repositories/Shop/PriceListValues.php

@@ -46,34 +46,12 @@ class PriceListValues
     {
         foreach ($values as $value) {
             $value['price_list_id'] = $price_list_id;
-            if (self::hasPrice($value)) {
+            if ($value['price']) {
                 self::store($value);
             }
         }
     }
 
-    public static function purgeRemovedValues($price_list_id, array $ids)
-    {
-        if (! count($ids)) {
-            return;
-        }
-
-        PriceListValue::byPriceList($price_list_id)
-            ->whereIn('id', $ids)
-            ->delete();
-    }
-
-    protected static function hasPrice($value): bool
-    {
-        if (! array_key_exists('price', $value)) {
-            return false;
-        }
-
-        $price = $value['price'];
-
-        return $price !== null && $price !== '';
-    }
-
     public static function getModel()
     {
         return PriceListValue::query();

app/Repositories/Shop/PriceLists.php

@@ -17,7 +17,7 @@ class PriceLists
             'taxes' => Taxes::getOptions(),
             'price_list' => [
                 'tariff_id' => $tariffId,
-                'price_list_values' => [],
+                'price_list_values' => array_fill(0, 3, ''),
             ],
         ];
     }
@@ -50,8 +50,9 @@ class PriceLists
     public static function edit($id)
     {
         $price_list = self::getFull($id)->toArray();
-        if (count($price_list['price_list_values']) === 0) {
+        $n = count($price_list['price_list_values']);
-            $price_list['price_list_values'][] = [];
+        if ($n <= 3) {
+            $price_list['price_list_values'] += array_fill($n, 3 - $n, '');
         }
 
         return $price_list;
@@ -70,14 +71,9 @@ class PriceLists
     public static function store($data)
     {
         $id = $data['id'] ?? false;
-        $price_list_values = $data['price_list_values'] ?? [];
+        $price_list_values = $data['price_list_values'] ?? false;
-        $deleted_values = array_map('intval', array_filter($data['deleted_price_list_value_ids'] ?? [], function ($value) {
-            return $value !== null && $value !== '';
-        }));
         unset($data['price_list_values']);
-        unset($data['deleted_price_list_value_ids']);
         $price_list = $id ? self::update($data) : self::create($data);
-        PriceListValues::purgeRemovedValues($price_list->id, $deleted_values);
         PriceListValues::storePrices($price_list->id, $price_list_values);
 
         return $price_list;

app/Repositories/Shop/SaleChannels.php

@@ -49,7 +49,7 @@ class SaleChannels
             }
         }
 
-        return self::getByCode('POSTE');
+        return self::getByCode('EXP');
     }
 
     public static function getByCode($code)

app/Repositories/Shop/Searches.php

@@ -8,14 +8,8 @@ class Searches
 {
     public static function search($options)
     {
-        // Get article IDs from Scout search
-        $searchResults = Article::search($options['search_name'])->get()->pluck('id');
-
-        // Filter to only include visible articles
-        $visibleArticleIds = Article::whereIn('id', $searchResults)->visible()->pluck('id');
-
         return collect(Articles::getArticlesToSell([
-            'ids' => $visibleArticleIds,
+            'ids' => Article::search($options['search_name'])->get()->pluck('id'),
         ]))->sortBy('searchOrder')->toArray();
     }
 

config/gravatar.php

@@ -1,35 +1,23 @@
 <?php
 
 return [
-    // Default configuration group for Gravatar
+    // --- The default avatar size
-    'default' => [
+    'size' => 80,
-        // --- The default avatar size
-        'size' => 80,
 
-        // --- The default avatar to display if we have no results
+    // --- The default avatar to display if we have no results
-        // (bool)   false
+    // (bool)   false
-        // (string) 404
+    // (string) 404
-        // (string) mm: (mystery-man) a simple, cartoon-style silhouetted outline of a person (does not vary by email hash).
+    // (string) mm: (mystery-man) a simple, cartoon-style silhouetted outline of a person (does not vary by email hash).
-        // (string) identicon: a geometric pattern based on an email hash.
+    // (string) identicon: a geometric pattern based on an email hash.
-        // (string) monsterid: a generated 'monster' with different colors, faces, etc.
+    // (string) monsterid: a generated 'monster' with different colors, faces, etc.
-        // (string) wavatar: generated faces with differing features and backgrounds.
+    // (string) wavatar: generated faces with differing features and backgrounds.
-        // (string) retro: awesome generated, 8-bit arcade-style pixelated faces.
+    // (string) retro: awesome generated, 8-bit arcade-style pixelated faces.
-        'fallback' => 'identicon',
+    'default' => 'identicon',
 
-        // --- Whether to use HTTPS protocol
+    // --- Set the type of avatars we allow to show
-        'secure' => false,
+    // - g: suitable for display on all websites with any audience type.
-
+    // - pg: may contain rude gestures, provocatively dressed individuals, the lesser swear words, or mild violence.
-        // --- Set the type of avatars we allow to show
+    // - r: may contain such things as harsh profanity, intense violence, nudity, or hard drug use.
-        // - g: suitable for display on all websites with any audience type.
+    // - x: may contain hardcore sexual imagery or extremely disturbing violence.
-        // - pg: may contain rude gestures, provocatively dressed individuals, the lesser swear words, or mild violence.
+    'maxRating' => 'g',
-        // - r: may contain such things as harsh profanity, intense violence, nudity, or hard drug use.
-        // - x: may contain hardcore sexual imagery or extremely disturbing violence.
-        'maximumRating' => 'g',
-
-        // --- Force default image to always display
-        'forceDefault' => false,
-
-        // --- Optional file extension appended to URL
-        'forceExtension' => 'jpg',
-    ]
 ];

config/media-library.php

@@ -126,7 +126,7 @@ return [
      * The path where to store temporary files while performing image conversions.
      * If set to null, storage_path('media-library/temp') will be used.
      */
-    'temporary_directory_path' => env('MEDIA_LIBRARY_TEMP_PATH', storage_path('media-library/temp')),
+    'temporary_directory_path' => null,
 
     /*
      * The engine that should perform the image conversions.

database/migrations/shop/2025_10_15_120000_update_shop_articles_ref_unique_index.php

@@ -1,30 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::table('shop_articles', function (Blueprint $table) {
-            $table->dropUnique('ref');
-            $table->unique(['ref', 'deleted_at'], 'shop_articles_ref_deleted_at_unique');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::table('shop_articles', function (Blueprint $table) {
-            $table->dropUnique('shop_articles_ref_deleted_at_unique');
-            $table->unique('ref');
-        });
-    }
-};

resources/views/Admin/Shop/PriceListValues/partials/row_price.blade.php

@@ -15,9 +15,4 @@
     <td>
         @include('components.form.inputs.money', ['name' => 'price_list_values[' . $index . '][price_taxed]', 'value' => $price_list_value['price_taxed'] ?? null, 'required' => true, 'class' => 'price_taxed'])
     </td>
-    <td class="text-center align-middle">
-        <button type="button" class="btn btn-outline-danger btn-xs remove-price" title="{{ __('Supprimer') }}">
-            <i class="fa fa-trash"></i>
-        </button>
-    </td>
 </tr>

resources/views/Admin/Shop/PriceLists/modal.blade.php

@@ -30,18 +30,12 @@
 					<th>Unit. HT</th>
 					<th>TVA</th>
 					<th>Unit. TTC</th>
-					<th class="text-center" style="width: 60px;">Actions</th>
 				</tr>
 			</thead>
 			<tbody>
-				@php($priceListValues = $price_list['price_list_values'] ?? [])
+				@foreach ($price_list['price_list_values'] as $price_list_value)
-				@php($nextIndex = count($priceListValues))
+					@include('Admin.Shop.PriceListValues.partials.row_price', ['index' => $loop->index])
-
-				@foreach ($priceListValues as $index => $price_list_value)
-					@include('Admin.Shop.PriceListValues.partials.row_price', ['index' => $index, 'price_list_value' => $price_list_value])
 				@endforeach
-
-				@include('Admin.Shop.PriceListValues.partials.row_price', ['index' => $nextIndex, 'price_list_value' => []])
 			</tbody>
 			<tfoot>
 				<tr>
@@ -55,28 +49,19 @@
 			</tfoot>
 		</table>
 	@endcomponent
-	<div id="deleted-price-list-values"></div>
+	
 </form>
 
 
 <script>
-	var priceRowIndex = 0;
-	var lastRemovedIndex = null;
-
 	function handleAddPrice() {
 		$('#add_price').click( function () {
-			addEmptyPriceRow();
+			var index = $('#prices-table tbody tr').length;
-		})
+			$.get("{{ route('Admin.Shop.PriceListValues.addPrice') }}/" + index, function(data) {
-	}
+				$("#prices-table").append(data);
-
+			})
-	function addEmptyPriceRow() {
-		var index = nextPriceRowIndex();
-		$.get("{{ route('Admin.Shop.PriceListValues.addPrice') }}/" + index, function(data) {
-			$("#prices-table tbody").append(data);
 			handlePrices();
-			handleRemovePrice();
+		})
-			lastRemovedIndex = null;
-		});
 	}
 
 	function handle_prices() {
@@ -116,82 +101,9 @@
 		handle_prices_taxed();
 	}
 
-	function handleRemovePrice() {
-		$('#prices-table').off('click', '.remove-price').on('click', '.remove-price', function() {
-			var $row = $(this).closest('tr');
-			var idx = extractRowIndex($row);
-			var id = $row.find('input[name$="[id]"]').val();
-			if (id) {
-				registerDeletedPrice(id);
-			}
-			$row.remove();
-			lastRemovedIndex = idx;
-			ensureAtLeastOneRow();
-		});
-	}
-
-	function registerDeletedPrice(id) {
-		var $container = $('#deleted-price-list-values');
-		if ($container.find('input[value="' + id + '"]').length === 0) {
-			$container.append('<input type="hidden" name="deleted_price_list_value_ids[]" value="' + id + '">');
-		}
-	}
-
-	function ensureAtLeastOneRow() {
-		if ($('#prices-table tbody tr').length === 0) {
-			if (lastRemovedIndex !== null) {
-				$.get("{{ route('Admin.Shop.PriceListValues.addPrice') }}/" + lastRemovedIndex, function(data) {
-					$("#prices-table tbody").append(data);
-					handlePrices();
-					handleRemovePrice();
-				});
-			} else {
-				addEmptyPriceRow();
-			}
-		}
-	}
-
-	function computeStartingIndex() {
-		var maxIndex = -1;
-		$('#prices-table tbody tr').each(function() {
-			var $idInput = $(this).find('input[name$="[id]"]');
-			var name = $idInput.attr('name');
-			if (name) {
-				var matches = name.match(/price_list_values\[(\d+)\]\[id\]/);
-				if (matches && matches[1]) {
-					var idx = parseInt(matches[1], 10);
-					if (!isNaN(idx) && idx > maxIndex) {
-						maxIndex = idx;
-					}
-				}
-			}
-		});
-
-		return maxIndex + 1;
-	}
-
-	function nextPriceRowIndex() {
-		return priceRowIndex++;
-	}
-
-	function extractRowIndex($row) {
-		var $idInput = $row.find('input[name$="[id]"]');
-		var name = $idInput.attr('name');
-		if (!name) {
-			return priceRowIndex;
-		}
-
-		var matches = name.match(/price_list_values\[(\d+)\]\[id\]/);
-
-		return matches && matches[1] ? parseInt(matches[1], 10) : priceRowIndex;
-	}
-
 	$(function() {
-		priceRowIndex = computeStartingIndex();
 		handleAddPrice();
 		handlePrices();
-		handleRemovePrice();
-		ensureAtLeastOneRow();
 	});
 
 </script>

resources/views/Shop/Articles/partials/ArticleAddBasket.blade.php

@@ -1,59 +1,37 @@
-@php
+@if ($article['offers']['semences'] ?? false)
-    // Check if article is not visible OR has no offers at all
+    @include('Shop.Articles.partials.addBasket', [
-    $hasNoOffers = empty($article['offers']['semences'] ?? false)
+        'data' => $article['offers']['semences'],
-                && empty($article['offers']['plants'] ?? false)
+        'title' => 'Semences',
-                && empty($article['offers']['legumes'] ?? false)
+        'model' => 'semences',
-                && empty($article['offers']['marchandise'] ?? false);
+        'bgClass' => 'bg-green-light',
-    $shouldShowComingSoon = !($article['visible'] ?? true) || $hasNoOffers;
+    ])
-@endphp
+@endif
 
-@if ($shouldShowComingSoon)
+@if ($article['offers']['plants'] ?? false)
-    {{-- Display "Coming Soon" box when article is not visible or has no offers --}}
+    @include('Shop.Articles.partials.addBasket', [
-    <div class="card border-info">
+        'data' => $article['offers']['plants'],
-        <div class="card-body text-center p-4">
+        'title' => 'Plants',
-            <h4 class="text-info mb-3">
+        'model' => 'plants',
-                <i class="fas fa-clock"></i>
+        'bgClass' => 'bg-green-light',
-            </h4>
+    ])
-            <h5 class="card-title mb-0">Bientôt disponible</h5>
+@endif
-        </div>
-    </div>
-@else
-    {{-- Display normal offers for visible articles with available offers --}}
-    @if ($article['offers']['semences'] ?? false)
-        @include('Shop.Articles.partials.addBasket', [
-            'data' => $article['offers']['semences'],
-            'title' => 'Semences',
-            'model' => 'semences',
-            'bgClass' => 'bg-green-light',
-        ])
-    @endif
 
-    @if ($article['offers']['plants'] ?? false)
+@if ($article['offers']['legumes'] ?? false)
-        @include('Shop.Articles.partials.addBasket', [
+    @include('Shop.Articles.partials.addBasket', [
-            'data' => $article['offers']['plants'],
+        'data' => $article['offers']['legumes'],
-            'title' => 'Plants',
+        'title' => 'Légumes',
-            'model' => 'plants',
+        'model' => 'legumes',
-            'bgClass' => 'bg-green-light',
+        'bgClass' => 'bg-green-light',
-        ])
+    ])
-    @endif
+@endif
 
-    @if ($article['offers']['legumes'] ?? false)
+@if ($article['offers']['marchandise'] ?? false)
-        @include('Shop.Articles.partials.addBasket', [
+    @include('Shop.Articles.partials.addBasket', [
-            'data' => $article['offers']['legumes'],
+        'data' => $article['offers']['marchandise'],
-            'title' => 'Légumes',
+        'title' => 'Marchandises',
-            'model' => 'legumes',
+        'model' => 'marchandise',
-            'bgClass' => 'bg-green-light',
+        'bgClass' => 'bg-green-light',
-        ])
+    ])
-    @endif
-
-    @if ($article['offers']['marchandise'] ?? false)
-        @include('Shop.Articles.partials.addBasket', [
-            'data' => $article['offers']['marchandise'],
-            'title' => 'Marchandises',
-            'model' => 'marchandise',
-            'bgClass' => 'bg-green-light',
-        ])
-    @endif
 @endif
 
 @include('load.basket')

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

@@ -48,8 +48,8 @@
 
         </div>
         <div class="col-lg-3 col-xs-12">
-            @if (auth('web')->check() && !empty($article['available_sale_channels']))
+            @if (config('app.debug') && !empty($article['available_sale_channels']))
-                <div id="article-admin-offers" class="alert alert-info p-2 mb-3">
+                <div class="alert alert-info p-2 mb-3">
                     <strong class="d-block">Offres :</strong>
                     <ul class="list-unstyled mb-0 small">
                         @php
@@ -82,61 +82,16 @@
                                         </span>
                                     </span>
                                     @if ($priceTaxed !== null)
-                                        @php
+                                        <span class="ml-2 text-nowrap text-right {{ $nameClass }}">
-                                            $tariffId = $channel['tariff_id'] ?? null;
+                                            {{ number_format($priceTaxed, 2, ',', ' ') }} € TTC
-                                        @endphp
+                                            @if (! empty($quantity))
-                                        @if ($tariffId)
+                                                <span class="d-block text-muted" style="font-size: 0.85em;">Qté min. {{ $quantity }}</span>
-                                            <a href="{{ route('Admin.Shop.Tariffs.edit', $tariffId) }}" target="_blank" rel="noopener" class="ml-2 text-nowrap text-right {{ $nameClass }} text-decoration-none text-reset d-inline-block admin-link-group admin-price-link">
+                                            @endif
-                                                {{ number_format($priceTaxed, 2, ',', ' ') }} € TTC
+                                        </span>
-                                                @if (! empty($quantity))
-                                                    <span class="d-block text-muted" style="font-size: 0.85em;">Qté min. {{ $quantity }}</span>
-                                                @endif
-                                            </a>
-                                        @else
-                                            <span class="ml-2 text-nowrap text-right {{ $nameClass }}">
-                                                {{ number_format($priceTaxed, 2, ',', ' ') }} € TTC
-                                                @if (! empty($quantity))
-                                                    <span class="d-block text-muted" style="font-size: 0.85em;">Qté min. {{ $quantity }}</span>
-                                                @endif
-                                            </span>
-                                        @endif
                                     @else
                                         <span class="ml-2 text-muted">–</span>
                                     @endif
                                 </div>
-                                @if (!empty($channel['all_offers']))
-                                    <ul class="list-unstyled mb-0 mt-1" style="padding-left: 0.75em;">
-                                        @foreach ($channel['all_offers'] as $offer)
-                                            @php
-                                                $isSelectedOffer = $offer['id'] === $channel['offer_id'];
-                                                $offerClass = $offer['is_active'] ? 'text-dark' : 'text-muted';
-                                                $stockClass = $offer['stock_current'] > 0 ? 'text-success' : 'text-danger';
-                                            @endphp
-                                            <li class="small {{ $offerClass }}" style="font-size: 0.85em;">
-                                                <a href="{{ route('Admin.Shop.Offers.edit', $offer['id']) }}" target="_blank" rel="noopener" class="text-decoration-none {{ $offerClass }} admin-link-group admin-offer-link">
-                                                    <div class="d-flex justify-content-between align-items-start">
-                                                        <div>
-                                                            <span style="opacity: 0.5;">{{ $isSelectedOffer ? '▸' : '○' }}</span>
-                                                            @if ($offer['variation_name'])
-                                                                {{ $offer['variation_name'] }}
-                                                            @endif
-                                                            - Stock: <strong class="{{ $stockClass }}">{{ $offer['stock_current'] }}</strong>
-                                                            @if (!$offer['is_active'])
-                                                                <span class="text-muted">(inactive)</span>
-                                                            @endif
-                                                        </div>
-                                                        <div class="text-right text-nowrap ml-2">
-                                                            {{ number_format($offer['price_taxed'], 2, ',', ' ') }} €
-                                                            @if ($offer['quantity'] > 1)
-                                                                <span class="text-muted">(min {{ $offer['quantity'] }})</span>
-                                                            @endif
-                                                        </div>
-                                                    </div>
-                                                </a>
-                                            </li>
-                                        @endforeach
-                                    </ul>
-                                @endif
                             </li>
                         @endforeach
                     </ul>
@@ -148,67 +103,3 @@
 @endsection
 
 @include('load.layout.modal')
-
-@if (auth('web')->check() && !empty($article['available_sale_channels']))
-    @push('styles')
-        <style>
-            #article-admin-offers .admin-link-group {
-                transition: background-color 0.15s ease;
-                border-radius: 3px;
-            }
-
-            #article-admin-offers .admin-price-link {
-                display: inline-block;
-                padding: 2px 4px;
-                margin: -2px -4px;
-            }
-
-            #article-admin-offers .admin-offer-link {
-                display: block;
-                padding: 2px 4px;
-                margin: -2px -4px;
-            }
-
-            #article-admin-offers .admin-link-group:hover,
-            #article-admin-offers .admin-link-group:focus,
-            #article-admin-offers .admin-link-group.linked-hover {
-                background-color: rgba(0, 123, 255, 0.1);
-                text-decoration: none;
-            }
-        </style>
-    @endpush
-
-    @push('scripts')
-        <script>
-            document.addEventListener('DOMContentLoaded', function() {
-                const container = document.getElementById('article-admin-offers');
-                if (!container) {
-                    return;
-                }
-
-                const links = Array.from(container.querySelectorAll('a.admin-link-group[href]'));
-                const grouped = new Map();
-
-                links.forEach((link) => {
-                    const href = link.getAttribute('href');
-                    if (!grouped.has(href)) {
-                        grouped.set(href, []);
-                    }
-                    grouped.get(href).push(link);
-                });
-
-                grouped.forEach((group) => {
-                    group.forEach((link) => {
-                        const addHighlight = () => group.forEach((item) => item.classList.add('linked-hover'));
-                        const removeHighlight = () => group.forEach((item) => item.classList.remove('linked-hover'));
-
-                        link.addEventListener('mouseenter', addHighlight);
-                        link.addEventListener('mouseleave', removeHighlight);
-                        link.addEventListener('focus', addHighlight);
-                        link.addEventListener('blur', removeHighlight);
-                    });
-                });
-            });
-        </script>
-    @endpush
-@endif

resources/views/load/form/save.blade.php

@@ -9,16 +9,14 @@
                 var selector = (typeof(sel) == 'undefined') ? '.save' : sel;
                 $(selector).off().click(function(e) {
                     if (typeof initValidator === 'function') {
+                        console.log('click');
                         e.preventDefault();
                         if ($(form).valid()) {
                             $(this).prop("disabled", true);
                             $(this).html($(this).data('loading-text'));
                             $(form).submit();
                         } else {
-                            const $firstInvalid = $(form).find(':invalid, .error').first();
+                            console.log('erreur');
-                            if ($firstInvalid.length) {
-                                $firstInvalid.focus();
-                            }
                         }
                     } else {
                         $(form).submit();

resources/views/load/layout/modal.blade.php

@@ -75,12 +75,12 @@
 				if (typeof(tinyMCE) != 'undefined') {
 					tinyMCE.triggerSave();
 				}
-				getModalForm(form_id).trigger('submit');
+				$('form ' + form_id).submit();
 				status = 1;
 			}
 
 			function handlePostModal(form_id, url_save, callback) {
-				getModalForm(form_id).off('submit').on('submit', function(e) {
+				$('form ' + form_id).submit(function(e) {
 					e.preventDefault();
 					var formData = new FormData(this);
 					$.ajax({
@@ -98,15 +98,6 @@
 					});
 				});
 			}
-
-			function getModalForm(form_id) {
-				var $form = $(form_id);
-				if (! $form.length) {
-					$form = $('form' + form_id);
-				}
-
-				return $form;
-			}
 		</script>
 	@endpush