Merge branch 'develop' into trunk
This commit is contained in:
commit
74edc5c785
1 changed files with 5 additions and 5 deletions
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue