diff --git a/app/Datatables/Shop/CustomerOrdersDataTable.php b/app/Datatables/Shop/CustomerOrdersDataTable.php index b1b9c36e..c4c928ec 100644 --- a/app/Datatables/Shop/CustomerOrdersDataTable.php +++ b/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'; diff --git a/app/Menu/Shop.php b/app/Menu/Shop.php index 85dbca07..a55b69a5 100644 --- a/app/Menu/Shop.php +++ b/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); diff --git a/resources/views/Admin/Shop/Dashboard/_partials/counter.blade.php b/resources/views/Admin/Shop/Dashboard/_partials/counter.blade.php index a61150a8..76729d5b 100644 --- a/resources/views/Admin/Shop/Dashboard/_partials/counter.blade.php +++ b/resources/views/Admin/Shop/Dashboard/_partials/counter.blade.php @@ -1,12 +1,4 @@ -
- Visiteurs en ligne -
40
-
-
- dans les 30 dernières minutes -
-
Paniers Actifs
40
diff --git a/resources/views/Admin/Shop/Variations/form.blade.php b/resources/views/Admin/Shop/Variations/form.blade.php index 0335ace1..a36b4b6a 100644 --- a/resources/views/Admin/Shop/Variations/form.blade.php +++ b/resources/views/Admin/Shop/Variations/form.blade.php @@ -15,6 +15,10 @@
+
+ {{ Form::label('weight', 'Poids') }} + @include('components.form.input', ['name' => 'weight', 'value' => $variation['weight'] ?? false, 'required' => true]) +
diff --git a/resources/views/Shop/Articles/partials/article.blade.php b/resources/views/Shop/Articles/partials/article.blade.php index cceae201..45f0c294 100644 --- a/resources/views/Shop/Articles/partials/article.blade.php +++ b/resources/views/Shop/Articles/partials/article.blade.php @@ -1,5 +1,5 @@ - - diff --git a/resources/views/components/form/inputs/number.blade.php b/resources/views/components/form/inputs/number.blade.php index 729eeab4..ff6fea5d 100644 --- a/resources/views/components/form/inputs/number.blade.php +++ b/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 ?? '' !!} >