diff --git a/package-lock.json b/package-lock.json index 572ab94..73a6148 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "srcs", + "name": "support-web", "lockfileVersion": 3, "requires": true, "packages": { diff --git a/resources/views/bo/pages/documents/invoice.blade.php b/resources/views/bo/pages/documents/invoice.blade.php index dc9e960..400527e 100644 --- a/resources/views/bo/pages/documents/invoice.blade.php +++ b/resources/views/bo/pages/documents/invoice.blade.php @@ -61,21 +61,23 @@
- + - + - +
{{ Str::upper($lastname) }} {{ $firstname }}{{ Str::upper($lastname) }} {{ $firstname }} +
{{ Str::singular(__('models.classes.companies')) }}{{ $company->name }}{{ $company->name }}
{{ __('Entité à facturer') }}{{ $companyInvoiced->name }}{{ $companyInvoiced->name }}
-
- {{ trans('Logo LDC') }} + + {{ trans('Logo LDC') }} {{ __('SERVICE WEB MARKETING GROUPE') }} @@ -103,116 +105,120 @@
-
+ {{ __('Prestation WEB') }}
@php - $tasks = collect($tasks); - $columns = 2 + ( $show_days ? 1 : 0); - $page = 1; - $perPage = 8; - $lastPage = App\Lib\Helpers\CollectionHelper::paginateManually($tasks, $perPage)->lastPage(); + $tasks = collect($tasks); + $columns = 2 + ($show_days ? 1 : 0); + $page = 1; + $perPage = 8; + $lastPage = App\Lib\Helpers\CollectionHelper::paginateManually($tasks, $perPage)->lastPage(); @endphp - @while($lastPage >= $page) - @php $taskList = App\Lib\Helpers\CollectionHelper::paginateManually($tasks, $perPage, $page); @endphp + @while ($lastPage >= $page) + @php $taskList = App\Lib\Helpers\CollectionHelper::paginateManually($tasks, $perPage, $page); @endphp - @if($page !== 1) - - - - -
 
- @endif - - - @if($page === 1) - - - @if($show_days) - - @endif - - - - - + @if ($page !== 1) +
{{ __('Tâches') }}{{ __('Jours') }}{{ __('Montant') }}
+ + + +
 
@endif - @foreach($taskList as $task) - - - @if($task['package'] ?? 0) - {{ __('Forfait : :package', [ - 'package' => $packages[$task['package']]->name ?? __('non existant') - ]) }} -
- @endif - {{ $task['desc'] }} - - @if($show_days) - {{ number_format($task['days'], 2, ',', '') }} - @endif - {{ number_format($task['amount'], 2, ',', '') }} - - @endforeach - @for ($i = $perPage - $taskList->count(); $i > 0; $i--) - - @for ($k = $columns; $k > 0; $k--) -   - @endfor - - @endfor - - @php $page++; @endphp - @if($taskList->currentPage() < $taskList->lastPage()) - - @endif - @endwhile - - +
+ @if ($page === 1) - - @if($show_days) - + + @if ($show_days) + @endif - + -
{{ __('Total') }}{{ __(':total Jours', [ - 'total' => number_format($total_days, 2, ',', '') - ]) }}{{ __('Tâches') }}{{ __('Jours') }}{{ __(':total €', [ - 'total' => number_format($total, 2, ',', '') - ]) }}{{ __('Montant') }}
- @if($comment) -
-
- {{ __('Commentaire') }} -
- - - + + -
- {{-- Impossible d\'appliquer ck-content ici --}} - {!! clean($comment) !!} -
@endif + @foreach ($taskList as $task) + + + @if ($task['package'] ?? 0) + {{ __('Forfait : :package', [ + 'package' => $packages[$task['package']]->name ?? __('non existant'), + ]) }} +
+ @endif + {!! nl2br($task['desc']) !!} + + @if ($show_days) + {{ number_format($task['days'], 2, ',', '') }} + @endif + {{ number_format($task['amount'], 2, ',', '') }} + + @endforeach + @for ($i = $perPage - $taskList->count(); $i > 0; $i--) + + @for ($k = $columns; $k > 0; $k--) +   + @endfor + + @endfor + + + @php $page++; @endphp + @if ($taskList->currentPage() < $taskList->lastPage()) + + @endif + @endwhile + + + + + @if ($show_days) + + @endif + + +
{{ __('Total') }} + {{ __(':total Jours', [ + 'total' => number_format($total_days, 2, ',', ''), + ]) }} + + {{ __(':total €', [ + 'total' => number_format($total, 2, ',', ''), + ]) }} +
+ @if ($comment) +
+
+ {{ __('Commentaire') }} +
+ + + + +
+ {{-- Impossible d\'appliquer ck-content ici --}} + {!! clean($comment) !!} +
+ @endif
- - +
- - - diff --git a/resources/views/bo/pages/invoices/show.blade.php b/resources/views/bo/pages/invoices/show.blade.php index cf45866..2288e51 100644 --- a/resources/views/bo/pages/invoices/show.blade.php +++ b/resources/views/bo/pages/invoices/show.blade.php @@ -5,118 +5,114 @@ @section('breadcrumb', request()->route()->getName()) @section('content') -
-
- - - - @include('breadcrumbs.breadcrumb-body', ['brParam' => $invoiceModel]) -
-
-
- - +
+
+ + + @include('breadcrumbs.breadcrumb-body', ['brParam' => $invoiceModel]) +
+
+
+ + + +
-
-
- {{ __("LDC Web Service") }}
+ 		+ {{ __('LDC Web Service') }}
 + + {{ __('page') }} {PAGENO}
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{ Str::ucfirst(__('validation.attributes.ref')) }}{{ $invoiceModel->ref }}
{{ Str::ucfirst(__('validation.attributes.firstname')) }}{{ $invoiceModel->firstname }}
{{ Str::ucfirst(__('validation.attributes.lastname')) }}{{ $invoiceModel->lastname }}
{{ Str::ucfirst(__('validation.attributes.object')) }}{{ $invoiceModel->object }}
{{ Str::ucfirst(__('validation.attributes.tasks')) }} - - - - - - - - - @foreach ($invoiceModel->tasks as $task) - - - - - - - @endforeach - -
{{ __('Commentaire') }}{{ __('Type') }}{{ __('Jours') }}{{ __('Montant') }}
{{ $task['desc'] }}{{ $task['type'] }}{{ $task['days'] }}{{ $task['amount'] }}
-
{{ Str::ucfirst(__('validation.attributes.total')) }}{{ $invoiceModel->total }}
{{ Str::ucfirst(__('validation.attributes.total_days')) }}{{ $invoiceModel->total_days }}
{{ Str::ucfirst(__('validation.attributes.comment')) }}{{ $invoiceModel->comment }}
{{ Str::ucfirst(__('validation.attributes.show_days')) }}{{ ($invoiceModel->show_days) ? "oui" : "non" }}
{{ Str::ucfirst(__('validation.attributes.signed_date')) }}{{ $invoiceModel->signed_date }}
{{ Str::ucfirst(__('validation.attributes.sent_client_date')) }}{{ $invoiceModel->sent_client_date }}
{{ Str::ucfirst(__('validation.attributes.sent_accounting_date')) }}{{ $invoiceModel->sent_accounting_date }}
{{ Str::ucfirst(__('validation.attributes.sites')) }}{{ $invoiceModel->site->name }}
{{ Str::ucfirst(__('validation.attributes.company_id')) }}{{ $invoiceModel->company->name }}
{{ Str::ucfirst(__('validation.attributes.invoiced_to_id')) }}{{ $invoiceModel->companyInvoiced->name }}
{{ Str::ucfirst(__('validation.attributes.created_at')) }}{{ $invoiceModel->created_at }}
{{ Str::ucfirst(__('validation.attributes.updated_at')) }}{{ $invoiceModel->updated_at }}
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{ Str::ucfirst(__('validation.attributes.ref')) }}{{ $invoiceModel->ref }}
{{ Str::ucfirst(__('validation.attributes.firstname')) }}{{ $invoiceModel->firstname }}
{{ Str::ucfirst(__('validation.attributes.lastname')) }}{{ $invoiceModel->lastname }}
{{ Str::ucfirst(__('validation.attributes.object')) }}{{ $invoiceModel->object }}
{{ Str::ucfirst(__('validation.attributes.tasks')) }} + + + + + + + + + @foreach ($invoiceModel->tasks as $task) + + + + + + + @endforeach + +
{{ __('Commentaire') }}{{ __('Type') }}{{ __('Jours') }}{{ __('Montant') }}
{!! nl2br($task['desc']) !!}{{ $task['type'] }}{{ $task['days'] }}{{ $task['amount'] }}
+
{{ Str::ucfirst(__('validation.attributes.total')) }}{{ $invoiceModel->total }}
{{ Str::ucfirst(__('validation.attributes.total_days')) }}{{ $invoiceModel->total_days }}
{{ Str::ucfirst(__('validation.attributes.comment')) }}{!! clean($invoiceModel->comment) !!}
{{ Str::ucfirst(__('validation.attributes.show_days')) }}{{ $invoiceModel->show_days ? 'oui' : 'non' }}
{{ Str::ucfirst(__('validation.attributes.signed_date')) }}{{ $invoiceModel->signed_date }}
{{ Str::ucfirst(__('validation.attributes.sent_client_date')) }}{{ $invoiceModel->sent_client_date }}
{{ Str::ucfirst(__('validation.attributes.sent_accounting_date')) }}{{ $invoiceModel->sent_accounting_date }}
{{ Str::ucfirst(__('validation.attributes.sites')) }}{{ $invoiceModel->site->name }}
{{ Str::ucfirst(__('validation.attributes.company_id')) }}{{ $invoiceModel->company->name }}
{{ Str::ucfirst(__('validation.attributes.invoiced_to_id')) }}{{ $invoiceModel->companyInvoiced->name }}
{{ Str::ucfirst(__('validation.attributes.created_at')) }}{{ $invoiceModel->created_at }}
{{ Str::ucfirst(__('validation.attributes.updated_at')) }}{{ $invoiceModel->updated_at }}
@endsection