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

fixes

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2022-04-22 02:32:53 +02:00
parent 94234218d6
commit e4672a42d7
5 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Shop/BasketController.php
View File

@@ -18,7 +18,7 @@ class BasketController extends Controller
$offer_id = $request->input('offer_id');
$quantity = $request->input('quantity');
$price = Offers::getPrice($offer_id, $quantity)->price_taxed;
return $quantity * $price;
return number_format($quantity * $price, 2);
}
public function addBasket(Request $request)

2
app/Repositories/Shop/Offers.php
View File

@@ -40,7 +40,7 @@ class Offers
{
$sale_channel_id = $sale_channel_id ? $sale_channel_id : SaleChannels::getDefaultID();
$offer = Offer::withPriceBySaleChannelByQuantity($sale_channel_id, $quantity)->find($id);
return $offer->price_lists->first()->price_list_values->first();
return number_format($offer->price_lists->first()->price_list_values->first(),2);
}
public static function getBasket()

6
resources/views/Shop/Baskets/basket.blade.php
View File

@@ -34,6 +34,7 @@
Tarif appliqué
</div>
<div class="col-6">
{{ $sale_channel['name'] ?? '' }}
</div>
</div>
<div class="row m-3">
@@ -61,6 +62,11 @@
<span id="basket-total-shipped"></span> €
</div>
</div>
<div class="row m-3">
<div class="col-12 text-center">
<a href="" class="btn btn-green-dark">COMMANDER</a>
</div>
</div>
@endcomponent
</div>
</div>

3
resources/views/Shop/Tags/partials/filter.blade.php
View File

@@ -27,10 +27,13 @@
</section>
</aside>
@include('load.layout.chevron')
@push('js')
<script>
$('#filters').click(function() {
$('#sidebar').toggleClass('d-none');
})
initChevron();
</script>
@endpush

12
resources/views/Shop/layout/partials/megamenu.blade.php
View File

@@ -16,7 +16,11 @@
</div>
<div class="col mb-4">
@for ($i = round(count($category['children']) / 3); $i < round(2 * count($category['children']) / 3); $i++)
<strong>{{ $category['children'][$i]['name'] }}</strong><br>
<strong>
<a class="green-dark" href="{{ route('Shop.Categories.show', ['id' => $category['children'][$i]['id']]) }}">
{{ $category['children'][$i]['name'] }}
</a>
</strong><br>
@foreach ($category['children'][$i]['children'] ?? [] as $leaf)
<a class="green-dark" href="{{ route('Shop.Categories.show', ['id' => $leaf['id']]) }}">
{{ $leaf['name'] }}
@@ -26,7 +30,11 @@
</div>
<div class="col mb-4">
@for ($i = round(2 * count($category['children']) / 3); $i < count($category['children']); $i++)
<strong>{{ $category['children'][$i]['name'] }}</strong><br>
<strong>
<a class="green-dark" href="{{ route('Shop.Categories.show', ['id' => $category['children'][$i]['id']]) }}">
{{ $category['children'][$i]['name'] }}
</a>
</strong><br>
@foreach ($category['children'][$i]['children'] ?? [] as $leaf)
<a class="green-dark" href="{{ route('Shop.Categories.show', ['id' => $leaf['id']]) }}">
{{ $leaf['name'] }}