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

Fix on invoices, add delivery reference, wip on dashboard concurrency requests designed on template

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2023-02-17 00:05:03 +01:00
parent 878ec7a8f2
commit 8e571de523
26 changed files with 555 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
resources/views/Admin/Shop/Orders/edit.blade.php
View File

@@ -1,6 +1,6 @@
@extends('layout.index', [
'title' => __('shop.orders.title'),
'subtitle' => __('shop.orders.list'),
'subtitle' => __('shop.orders.edit'),
'breadcrumb' => ['Commandes']
])
@@ -8,17 +8,27 @@
{{ Form::open(['route' => 'Admin.Shop.Orders.store', 'id' => 'order-form', 'autocomplete' => 'off']) }}
<input type="hidden" name="id" value="{{ $order['id'] ?? null }}">
<x-card>
<div class="row">
<div class="col-6">
<h4>{{ $order['delivery']['name'] }} </h4>
</div>
<div class="col-6 text-right">
@include('components.form.buttons.button-save')
</div>
</div>
<div class="row mb-3">
<div class="col-6">
<h3>{{ $order['customer']['last_name'] }} {{ $order['customer']['first_name'] }}</h3>
<h4>{{ $order['delivery']['name'] }} </h4>
<div class="row">
<div class="col-12">
<h6>
@if ($order['address'])
{{ $order['address']['address'] }}<br/>
@isset ($order['address']['address2']) {{ $order['address']['address2'] }}<br/> @endisset
{{ $order['address']['zipcode'] }} {{ $order['address']['city'] }}<br/>
@endif
</h6>
</div>
</div>
</div>
@@ -29,28 +39,35 @@
du {{ Carbon\Carbon::parse($order['created_at'])->isoFormat('LLLL') }}
</div>
<div class="col-6">
<label>Canal de vente</label><br/>
@include('components.form.select', [
'name' => 'sale_channel_id',
'list' => $sale_channels ?? [],
'value' => $order['sale_channel_id'],
'class' => 'select2',
])
</div>
</div>
<div class="row mb-3">
<div class="col-6">
<label>Statut</label><br/>
@include('components.form.select', [
'label' => 'Statut',
'name' => 'status',
'list' => $statuses ?? [],
'value' => $order['status'],
'class' => 'select2',
])
</div>
<div class="col-6">
<label>Règlement</label><br/>
</div>
<div class="row mb-3">
<div class="col-4">
@include('components.form.select', [
'label' => 'Canal de vente',
'name' => 'sale_channel_id',
'list' => $sale_channels ?? [],
'value' => $order['sale_channel_id'],
'class' => 'select2',
])
</div>
<div class="col-4">
@include('components.form.input', [
'label' => 'Référence colis',
'name' => 'delivery_ref',
'value' => $order['deivery_ref'],
])
</div>
<div class="col-4">
@include('components.form.select', [
'label' => 'Règlement',
'name' => 'payment_type',
'list' => $payment_types ?? [],
'value' => $order['payment_type'],
@@ -62,7 +79,7 @@
</div>
<div class="row mb-3">
<div class="col-12">
@include('Admin.Shop.Orders.partials.detail')
@include('Admin.Shop.Orders.partials.detail', ['detail_type' => 'commande'])
</div>
</div>
</x-card>

18
resources/views/Admin/Shop/Orders/partials/detail.blade.php
View File

@@ -1,18 +1,22 @@
<x-card title="Détail de la commande">
<x-card title="Détail de la {{ $detail_type }}" classBody="mt-3">
<div class="row">
<div class="col-12">
<table class="table table-bordered table-hover w-100 ">
<table class="table table-bordered table-hover w-100 ">
<thead class="thead-light">
<th>Nom</th>
<th>Quantité</th>
<th>Prix unitaire</th>
<th>Total</th>
<th>PU HT</th>
<th>TVA</th>
<th>PU TTC</th>
<th>Total TTC</th>
</thead>
<tbody>
@foreach ($order['detail'] as $detail)
<tr>
<td>{{ $detail['name'] }}</td>
<td align="right">{{ $detail['quantity'] }}</td>
<td align="right">{{ $detail['price'] }}</td>
<td align="right">{{ $detail['tax'] }}</td>
<td align="right">{{ $detail['price_taxed'] }}</td>
<td align="right">{{ $detail['total_taxed'] }}</td>
</tr>
@@ -23,6 +27,8 @@
<td style="font-size: 1.2em; font-weight: bold;">Total</td>
<td></td>
<td></td>
<td align="right"></td>
<td align="right"></td>
<td align="right" style="font-size: 1.2em; font-weight: bold;">{{ $order['total_taxed'] }}</td>
</tr>
@if ($order['shipping'] ?? false)
@@ -30,12 +36,16 @@
<td style="font-size: 1.1em; font-weight: 500;">Livraison</td>
<td align="right"></td>
<td align="right"></td>
<td align="right"></td>
<td align="right"></td>
<td align="right" style="font-size: 1.1em; font-weight: bold;">{{ $order['shipping'] }}</td>
</tr>
<tr>
<td style="font-size: 1.4em; font-weight: bold;">Total à payer</td>
<td align="right"></td>
<td align="right"></td>
<td align="right">{{ $order['taxes'] }}</td>
<td align="right"></td>
<td align="right" style="font-size: 1.4em; font-weight: bold;">{{ $order['total_shipped'] }}</td>
</tr>
@endif