Merge branch 'trunk'

This commit is contained in:
Noah Lancien 2024-11-26 09:18:29 +01:00
commit 2b94d780b6

View file

@ -83,15 +83,15 @@ class Invoice extends Model
Carbon::now()->isoFormat('YYYY-MM'),
Str::padLeft((Invoice::whereYear('created_at', Carbon::now()->isoFormat('YYYY'))
->whereMonth('created_at', Carbon::now()->isoFormat('MM'))
->count() + 1) ?: 1, 4, '0'),
->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);