fix recalculation on basket, fix quick add on basket

app/Datatables/Shop/CustomerOrdersDataTable.php

@@ -9,6 +9,7 @@ use App\Models\Shop\Order;
 use App\Repositories\Shop\InvoicePayments;
 use App\Repositories\Shop\Orders;
 
+
 class CustomerOrdersDataTable extends DataTable
 {
     public $model_name = 'orders';

app/Menu/Shop.php

@@ -15,11 +15,7 @@ class Shop
         $menu->addTo('shop', 'Articles', [
             'route' => 'Admin.Shop.Articles.index',
         ])->activeIfRoute(['Admin.Shop.Articles.*'])->order(1);
-        
+                
-        $menu->addTo('shop', 'Déclinaisons', [
-            'route' => 'Admin.Shop.Variations.index',
-        ])->activeIfRoute(['Admin.Shop.Variations.*'])->order(2);
-        
         $menu->addTo('shop', 'Tarifs', [
             'route' => 'Admin.Shop.Tariffs.index',
         ])->activeIfRoute(['Admin.Shop.Tariffs.*'])->order(3);
@@ -44,6 +40,10 @@ class Shop
             'route' => 'Admin.Shop.ArticleNatures.index',
         ])->activeIfRoute(['Admin.Shop.ArticleNatures.*'])->order(9);
 
+        $menu->addTo('shop', 'Déclinaisons', [
+            'route' => 'Admin.Shop.Variations.index',
+        ])->activeIfRoute(['Admin.Shop.Variations.*'])->order(10);
+
         $menu->addTo('shop', 'Packages', [
             'route' => 'Admin.Shop.Packages.index',
         ])->activeIfRoute(['Admin.Shop.Packages.*'])->order(12);

resources/views/Admin/Shop/Dashboard/_partials/counter.blade.php

@@ -1,12 +1,4 @@
 <x-card title="Aperçu de l'activité">
-	<div class="counter">
-		<span class="index">Visiteurs en ligne</span>
-		<div class="value float-right">40</div>
-	</div>
-	<div>
-		<span class="text-muted">dans les 30 dernières minutes</span>
-	</div>
-
 	<div class="counter">
 		<span class="index">Paniers Actifs</span>
 		<div class="value float-right">40</div>

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

@@ -15,6 +15,10 @@
 			</div>
 		</div>
 	</div>
+	<div class="col-1">
+		{{ Form::label('weight', 'Poids') }}
+		@include('components.form.input', ['name' => 'weight', 'value' => $variation['weight'] ?? false, 'required' => true])
+	</div>
 </div>
 
 <div class="row mb-3">

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

@@ -1,5 +1,5 @@
-<a href="{{ route('Shop.Articles.show', ['id' => $article['id'] ?? false ]) }}" class="green-dark">
+<div class="card">
-	<div class="card">
+	<a href="{{ route('Shop.Articles.show', ['id' => $article['id'] ?? false ]) }}" class="green-dark">
 		<div class="content">
 			<div class="content-overlay"></div>
 			<img class="content-image card-img-top" src="{{ App\Repositories\Shop\Articles::getPreviewSrc($article['image'] ?? false) }}" alt="{{ $product_name }}">
@@ -8,7 +8,9 @@
 				<p class="content-text">{!! $article['description'] !!}</p>
 			</div>
 		</div>
-		<div class="card-body p-2 pb-1">
+	</a>
+	<div class="card-body p-2 pb-1">
+		<a href="{{ route('Shop.Articles.show', ['id' => $article['id'] ?? false ]) }}" class="green-dark">
 			<div class="row card-title">
 				<div class="col-12 green">
 					<div class="text-truncate mb-0" style="font-size: 1.3em;">{{ $article['parent_name'] }}</div>
@@ -16,9 +18,9 @@
 				</div>
 			</div>
 			@include('Shop.Articles.partials.article_' . $product_type)
-			<button type="button" class="btn btn-link bg-green text-white w-100 basket" data-id="{{ $article['offers'][0]['id'] ?? false }}">
+		</a>
-				Ajout rapide
+		<button type="button" class="btn btn-link bg-green text-white w-100 basket" data-id="{{ $article['offers'][0]['id'] ?? false }}">
-			</button>
+			Ajout rapide
-		</div>
+		</button>
 	</div>
-</a>
+</div>

resources/views/components/form/inputs/number.blade.php

@@ -14,4 +14,5 @@
 @if ($mask ?? false) data-inputmask="'mask': '{{ $mask }}'" @endif
 @if ($pattern ?? false) pattern="{{ $pattern }}" @endif
 @if ($placeholder ?? false) placeholder="{{ $placeholder }}" @endif
+@if ($data_id ?? false) data-id="{{ $data_id }}" @endif
 {!! $meta ?? '' !!} >