jev/opensem
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix recalculation on basket, fix quick add on basket

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2023-03-21 22:41:48 +01:00
parent 23e6ca35ca
commit efb3fe9670
6 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Datatables/Shop/CustomerOrdersDataTable.php
View File

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

8
app/Menu/Shop.php
View File

@@ -16,10 +16,6 @@ class Shop
'route' => 'Admin.Shop.Articles.index', 'route' => 'Admin.Shop.Articles.index',
])->activeIfRoute(['Admin.Shop.Articles.*'])->order(1); ])->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', [ $menu->addTo('shop', 'Tarifs', [
'route' => 'Admin.Shop.Tariffs.index', 'route' => 'Admin.Shop.Tariffs.index',
])->activeIfRoute(['Admin.Shop.Tariffs.*'])->order(3); ])->activeIfRoute(['Admin.Shop.Tariffs.*'])->order(3);
@@ -44,6 +40,10 @@ class Shop
'route' => 'Admin.Shop.ArticleNatures.index', 'route' => 'Admin.Shop.ArticleNatures.index',
])->activeIfRoute(['Admin.Shop.ArticleNatures.*'])->order(9); ])->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', [ $menu->addTo('shop', 'Packages', [
'route' => 'Admin.Shop.Packages.index', 'route' => 'Admin.Shop.Packages.index',
])->activeIfRoute(['Admin.Shop.Packages.*'])->order(12); ])->activeIfRoute(['Admin.Shop.Packages.*'])->order(12);

8
resources/views/Admin/Shop/Dashboard/_partials/counter.blade.php
View File

@@ -1,12 +1,4 @@
<x-card title="Aperçu de l'activité"> <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"> <div class="counter">
<span class="index">Paniers Actifs</span> <span class="index">Paniers Actifs</span>
<div class="value float-right">40</div> <div class="value float-right">40</div>

4
resources/views/Admin/Shop/Variations/form.blade.php
View File

@@ -15,6 +15,10 @@
</div> </div>
</div> </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>
<div class="row mb-3"> <div class="row mb-3">

6
resources/views/Shop/Articles/partials/article.blade.php
View File

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

1
resources/views/components/form/inputs/number.blade.php
View File

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