diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php index fdba0de..d789555 100644 --- a/app/Models/Invoice.php +++ b/app/Models/Invoice.php @@ -86,12 +86,12 @@ class Invoice extends Model ->count() + 1) ?: 1, 4, '0'), Str::substr(Str::upper(Str::slug(Auth::user()->name)), 0, 1) ); - $model->total_days = collect($model->tasks) + $model->total_days = collect([$model->tasks]) /** @var null|float $previous */ ->reduce(function ($previous, array $task) { return \floatval($task['days']) + \floatval($previous); }); - $model->total = collect($model->tasks) + $model->total = collect([$model->tasks]) /** @var null|float $previous */ ->reduce(function ($previous, array $task) { return \floatval($task['amount']) + \floatval($previous); @@ -99,12 +99,12 @@ class Invoice extends Model $model->status = InvoiceStatusEnum::opened; }); static::updating(function (self $model) { - $model->total_days = collect($model->tasks) + $model->total_days = collect([$model->tasks]) /** @var null|float $previous */ ->reduce(function ($previous, array $task) { return \floatval($task['days']) + \floatval($previous); }); - $model->total = collect($model->tasks) + $model->total = collect([$model->tasks]) /** @var null|float $previous */ ->reduce(function ($previous, array $task) { return \floatval($task['amount']) + \floatval($previous); diff --git a/resources/assets/documents/invoice/logo_ldc.png b/resources/assets/documents/invoice/logo_ldc.png new file mode 100644 index 0000000..81d3282 Binary files /dev/null and b/resources/assets/documents/invoice/logo_ldc.png differ diff --git a/resources/assets/documents/invoice/separator.png b/resources/assets/documents/invoice/separator.png new file mode 100644 index 0000000..bfcb9f0 Binary files /dev/null and b/resources/assets/documents/invoice/separator.png differ diff --git a/resources/views/bo/pages/documents/invoice.blade.php b/resources/views/bo/pages/documents/invoice.blade.php index 2d0845e..36203cf 100644 --- a/resources/views/bo/pages/documents/invoice.blade.php +++ b/resources/views/bo/pages/documents/invoice.blade.php @@ -61,31 +61,46 @@
- + - - + +
{{ Str::upper($lastname) }} {{ $firstname }} + + {{ trans('Logo LDC') }} + + {{ Str::upper($lastname) }} {{ $firstname }}
{{ Str::singular(__('models.classes.companies')) }}{{ $company->name }} + {{ Str::singular(__('models.classes.companies')) }} + + {{ $company->name }} +
{{ __('Entité à facturer') }} {{ $companyInvoiced->name }}
- +
- - + + +
- {{ trans('Logo LDC') }} + + {{ __('LDC Digital Groupe') }} - {{ __('SERVICE WEB MARKETING GROUPE') }} + + {{ __('ESTIMATION / DEVIS') }} +
+ {{ __('Société / LDC Services') }}
-
- +
+ separateur de contenu +
+
@@ -103,13 +118,6 @@
{{ __('Objet :') }} {{ $object }}{{ Carbon\Carbon::parse($updated_at)->isoFormat('DD/MM/YYYY') }}
- - - - -
- {{ __('Prestation WEB') }} -
@php $tasks = collect($tasks); @@ -213,7 +221,7 @@
- {{ __('LDC Web Service') }}
+ {{ __('LDC Digital Groupe') }}