Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

v5.6.25

Browse Source
This commit is contained in:
David Bomba 2023-08-03 08:24:30 +10:00
parent b7e1ffe12f
commit e519234fe0
5 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Models/Credit.php
View File

@ -57,11 +57,11 @@ use Laracasts\Presenter\PresentableTrait;
* @property string|null $private_notes * @property string|null $private_notes
* @property string|null $terms * @property string|null $terms
* @property string|null $tax_name1 * @property string|null $tax_name1
* @property string $tax_rate1 * @property float $tax_rate1
* @property string|null $tax_name2 * @property string|null $tax_name2
* @property string $tax_rate2 * @property float $tax_rate2
* @property string|null $tax_name3 * @property string|null $tax_name3
* @property string $tax_rate3 * @property float $tax_rate3
* @property string $total_taxes * @property string $total_taxes
* @property int $uses_inclusive_taxes * @property int $uses_inclusive_taxes
* @property string|null $custom_value1 * @property string|null $custom_value1
@ -90,7 +90,7 @@ use Laracasts\Presenter\PresentableTrait;
* @property string|null $reminder2_sent * @property string|null $reminder2_sent
* @property string|null $reminder3_sent * @property string|null $reminder3_sent
* @property string|null $reminder_last_sent * @property string|null $reminder_last_sent
* @property string $paid_to_date * @property float $paid_to_date
* @property int|null $subscription_id * @property int|null $subscription_id
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Activity> $activities * @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Activity> $activities
* @property-read int|null $activities_count * @property-read int|null $activities_count

2
app/Repositories/Migration/PaymentMigrationRepository.php
View File

@ -146,6 +146,8 @@ class PaymentMigrationRepository extends BaseRepository
} }
if (array_key_exists('credits', $data) && is_array($data['credits']) && count($data['credits']) > 0) { if (array_key_exists('credits', $data) && is_array($data['credits']) && count($data['credits']) > 0) {
/** @var float $credit_totals **/
$credit_totals = array_sum(array_column($data['credits'], 'amount')); $credit_totals = array_sum(array_column($data['credits'], 'amount'));
$credits = Credit::whereIn('id', array_column($data['credits'], 'credit_id'))->withTrashed()->get(); $credits = Credit::whereIn('id', array_column($data['credits'], 'credit_id'))->withTrashed()->get();

2
app/Repositories/PaymentRepository.php
View File

@ -188,7 +188,7 @@ class PaymentRepository extends BaseRepository
$paymentable->save(); $paymentable->save();
$credit = $credit->service()->markSent()->save(); $credit = $credit->service()->markSent()->save();
(new ApplyCreditPayment($credit, $payment, $paid_credit['amount'], $credit->company))->handle(); (new ApplyCreditPayment($credit, $payment, $paid_credit['amount']))->handle();
} }
} }
} }

2
app/Repositories/SubscriptionRepository.php
View File

@ -48,6 +48,7 @@ class SubscriptionRepository extends BaseRepository
DB::connection(config('database.default'))->beginTransaction(); DB::connection(config('database.default'))->beginTransaction();
$data = []; $data = [];
/** @var \App\Models\Client $client **/
$client = Client::factory()->create([ $client = Client::factory()->create([
'user_id' => $subscription->user_id, 'user_id' => $subscription->user_id,
'company_id' => $subscription->company_id, 'company_id' => $subscription->company_id,
@ -56,6 +57,7 @@ class SubscriptionRepository extends BaseRepository
'settings' => ClientSettings::defaults(), 'settings' => ClientSettings::defaults(),
]); ]);
/** @var \App\Models\ClientContact $contact **/
$contact = ClientContact::factory()->create([ $contact = ClientContact::factory()->create([
'user_id' => $subscription->user_id, 'user_id' => $subscription->user_id,
'company_id' => $subscription->company_id, 'company_id' => $subscription->company_id,

9
app/Repositories/TaskRepository.php
View File

@ -148,13 +148,16 @@ class TaskRepository extends BaseRepository
* Store tasks in bulk. * Store tasks in bulk.
* *
* @param array $task * @param array $task
* @return task|null * @return Task|null
*/ */
public function create($task): ?Task public function create($task): ?Task
{ {
/** @var \App\Models\User $user **/
$user = auth()->user();
return $this->save( return $this->save(
$task, $task,
TaskFactory::create(auth()->user()->company()->id, auth()->user()->id) TaskFactory::create($user->company()->id, $user->id)
); );
} }
@ -175,7 +178,7 @@ class TaskRepository extends BaseRepository
/** /**
* Sorts the task status order IF the old status has changed between requests * Sorts the task status order IF the old status has changed between requests
* *
* @param stdCLass $old_task The old task object * @param \stdCLass $old_task The old task object
* @param Task $new_task The new Task model * @param Task $new_task The new Task model
* @return void * @return void
*/ */