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

fix orders datatables on profile, fix deliveries for profile (public & active)

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2023-08-29 22:15:37 +02:00
parent 7addea00a2
commit 496274b4f4
10 changed files with 60 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@
@section('content')
@if ($basket)
<div class="row">
<div class="col-8">
<div class="col-lg-8 col-md-12">
<div class="row mb-3">
<div class="col-4">
<h1>Panier</h1>
@@ -27,7 +27,7 @@
</div>
@endforeach
</div>
<div class="col-4">
<div class="col-lg-4 col-md-12">
<x-card class='shadow'>
@include('Shop.Baskets.partials.basketTotal')
<div class="row m-3">
@@ -108,7 +108,7 @@
}
function calculateTotalShipped() {
var total_shipped = parseFloat($('#basket-total').html()) + 5;
var total_shipped = parseFloat($('#basket-total').html());
$('#basket-total-shipped').html(fixNumber(total_shipped));
}

4
resources/views/Shop/Baskets/partials/basketTotal.blade.php
View File

@@ -16,6 +16,7 @@
<span id="basket-total">{{ $basket['total'] ?? 0 }}</span> €
</div>
</div>
<!--
<div class="row mb-3">
<div class="col-6">
LIVRAISON
@@ -25,11 +26,12 @@
</div>
</div>
<hr>
-->
<div class="row mb-3 font-weight-bold" style="font-size: 1.6em;">
<div class="col-6">
TOTAL TTC
</div>
<div class="col-6 text-right">
<span id="basket-total-shipped">{{ App\Repositories\Core\User\ShopCart::fixDecimal(($basket['total'] ?? 0) + 5) }}</span> €
<span id="basket-total-shipped">{{ App\Repositories\Core\User\ShopCart::fixDecimal(($basket['total'] ?? 0)) }}</span> €
</div>
</div>

4
resources/views/Shop/Customers/partials/addresses.blade.php
View File

@@ -5,10 +5,10 @@
</div>
<div class="col-11">
{{ $address['address'] }}<br/>
@if ($address['address2'])
@if ($address['address2'])
{{ $address['address2'] }}<br/>
@endif
{{ $address['zipcode'] }} {{ $address['city'] }}
{{ $address['zipcode'] }} {{ $address['city'] }}
</div>
</div>
@endforeach

2
resources/views/Shop/Orders/order.blade.php
View File

@@ -11,7 +11,7 @@
<button class="btn btn-secondary" id="register">Créez mon compte</button>
</p>
<x-layout.collapse id="identification" title="Déjà client" class="d-none identification rounded-lg">
<x-layout.collapse id="identification" title="Déjà client" class="identification rounded-lg" uncollapsed=true>
@include('Shop.auth.partials.login')
</x-layout.collapse>