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

update payments and vat mentions

Browse Source
This commit is contained in:
ludo
2023-12-21 23:04:42 +01:00
parent 585d42264f
commit 7c8546e450
13 changed files with 86 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
resources/views/Admin/Shop/Orders/create.blade.php
View File

@@ -1,28 +1,31 @@
@extends('layout.index', [
'title' => __('article_families.title'),
'subtitle' => __('article_families.create.title'),
'breadcrumb' => [__('article_families.title'), __('article_families.create.title')]
'title' => __('article_families.title'),
'subtitle' => __('article_families.create.title'),
'breadcrumb' => [__('article_families.title'), __('article_families.create.title')],
])
@include('boilerplate::load.fileinput')
@section('content')
{{ Form::open([
'route' => 'Admin.Shop.ArticleFamilies.store',
'id' => 'article-family-form',
'autocomplete' => 'off',
'files' => true,
]) }}
{{ Form::open(['route' => 'Admin.Shop.ArticleFamilies.store', 'id' => 'article-family-form', 'autocomplete' => 'off', 'files' => true]) }}
<div class="row">
<div class="col-sm-12 mbl">
<a href="{{ route("Admin.Shop.Articles.index") }}" class="btn btn-default">
{{ __('article_families.list.title') }}
</a>
<div class="row">
<div class="col-sm-12 mbl">
<a href="{{ route('Admin.Shop.Articles.index') }}" class="btn btn-default">
{{ __('article_families.list.title') }}
</a>
<span class="btn-group pull-right">
@include('components.form.buttons.button-save')
</span>
</div>
</div>
@include('Admin.Shop.ArticleFamilies.form')
</form>
<span class="btn-group pull-right">
<x-save />
</span>
</div>
</div>
@include('Admin.Shop.ArticleFamilies.form')
</form>
@endsection

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

@@ -13,7 +13,7 @@
<h5>
<a href="{{ route('Admin.Shop.Invoices.edit', ['id' => $order['invoice']['id']]) }}"
class="btn btn-success">
<i class="fa fa-file-invoice"></i>
<i class="fa fa-fw fa-file-invoice"></i>
</a>
Commande : {{ $order['ref'] }}
<span class="small">
@@ -29,11 +29,10 @@
<div class="row mb-3">
<div class="col-6">
<h5>
{{ $order['customer']['first_name'] }} {{ $order['customer']['last_name'] }}
@if ($order['customer']['company'])
<br>
{{ $order['customer']['company'] }}
Société : {{ $order['customer']['company'] }}<br />
@endif
{{ $order['customer']['first_name'] }} {{ $order['customer']['last_name'] }}
</h5>
<h6>
@@ -49,6 +48,13 @@
</x-card>
@endif
@if ($order['comment'])
<x-card title="Commentaire" class="mt-3">
{{ $order['comment'] }}
</x-card>
@endif
</div>
<div class="col-6">
<div class="row mb-3">
@@ -103,6 +109,7 @@
</div>
</x-card>
@endif
</div>
</div>
<div class="row mb-3">

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

@@ -1,11 +1,12 @@
<x-card title="Détail de la {{ $detail_type }}">
<x-card title="Détail de la {{ $detail_type }}" classBody="p-0">
<table class="table table-bordered table-hover w-100 ">
<thead class="thead-light">
<th>Nom</th>
<th>Quantité</th>
<th>PU HT</th>
<th>Total HT</th>
<th>TVA</th>
<th>PU TTC</th>
<th>Montant TVA</th>
<th>Total TTC</th>
</thead>
<tbody>
@@ -14,8 +15,9 @@
<td>{{ $detail['name'] }}</td>
<td class="text-right">{{ $detail['quantity'] }}</td>
<td class="text-right">{{ $detail['price'] }}</td>
<td class="text-right">{{ $detail['tax'] }}</td>
<td class="text-right">{{ $detail['price_taxed'] }}</td>
<td class="text-right">{{ $detail['total'] }}</td>
<td class="text-right">{{ $detail['vat'] }}</td>
<td class="text-right">{{ $detail['total_tax'] }}</td>
<td class="text-right">{{ $detail['total_taxed'] }}</td>
</tr>
@endforeach
@@ -25,8 +27,11 @@
<td style="font-size: 1.2em; font-weight: bold;">Total</td>
<td></td>
<td></td>
<td style="font-size: 1.2em; font-weight: bold;" class="text-right">
{{ $order['total'] }}
</td>
<td></td>
<td></td>
<td class="text-right">{{ $order['taxes'] }}</td>
<td style="font-size: 1.2em; font-weight: bold;" class="text-right">
{{ $order['total_taxed'] }}
</td>
@@ -38,6 +43,7 @@
<td></td>
<td></td>
<td></td>
<td></td>
<td style="font-size: 1.1em; font-weight: bold;" class="text-right">
{{ $order['shipping'] }}
</td>
@@ -46,8 +52,9 @@
<td style="font-size: 1.4em; font-weight: bold;">Total à payer</td>
<td></td>
<td></td>
<td class="text-right">{{ $order['taxes'] }}</td>
<td class="text-right">{{ $order['total'] }}</td>
<td></td>
<td class="text-right">{{ $order['taxes'] }}</td>
<td style="font-size: 1.4em; font-weight: bold;" class="text-right">
{{ $order['total_shipped'] }}
</td>