mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
v5.6.25
This commit is contained in:
parent
b7e1ffe12f
commit
e519234fe0
@ -57,11 +57,11 @@ use Laracasts\Presenter\PresentableTrait;
|
||||
* @property string|null $private_notes
|
||||
* @property string|null $terms
|
||||
* @property string|null $tax_name1
|
||||
* @property string $tax_rate1
|
||||
* @property float $tax_rate1
|
||||
* @property string|null $tax_name2
|
||||
* @property string $tax_rate2
|
||||
* @property float $tax_rate2
|
||||
* @property string|null $tax_name3
|
||||
* @property string $tax_rate3
|
||||
* @property float $tax_rate3
|
||||
* @property string $total_taxes
|
||||
* @property int $uses_inclusive_taxes
|
||||
* @property string|null $custom_value1
|
||||
@ -90,7 +90,7 @@ use Laracasts\Presenter\PresentableTrait;
|
||||
* @property string|null $reminder2_sent
|
||||
* @property string|null $reminder3_sent
|
||||
* @property string|null $reminder_last_sent
|
||||
* @property string $paid_to_date
|
||||
* @property float $paid_to_date
|
||||
* @property int|null $subscription_id
|
||||
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\Activity> $activities
|
||||
* @property-read int|null $activities_count
|
||||
|
@ -146,6 +146,8 @@ class PaymentMigrationRepository extends BaseRepository
|
||||
}
|
||||
|
||||
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'));
|
||||
|
||||
$credits = Credit::whereIn('id', array_column($data['credits'], 'credit_id'))->withTrashed()->get();
|
||||
|
@ -188,7 +188,7 @@ class PaymentRepository extends BaseRepository
|
||||
$paymentable->save();
|
||||
|
||||
$credit = $credit->service()->markSent()->save();
|
||||
(new ApplyCreditPayment($credit, $payment, $paid_credit['amount'], $credit->company))->handle();
|
||||
(new ApplyCreditPayment($credit, $payment, $paid_credit['amount']))->handle();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -48,6 +48,7 @@ class SubscriptionRepository extends BaseRepository
|
||||
DB::connection(config('database.default'))->beginTransaction();
|
||||
$data = [];
|
||||
|
||||
/** @var \App\Models\Client $client **/
|
||||
$client = Client::factory()->create([
|
||||
'user_id' => $subscription->user_id,
|
||||
'company_id' => $subscription->company_id,
|
||||
@ -56,6 +57,7 @@ class SubscriptionRepository extends BaseRepository
|
||||
'settings' => ClientSettings::defaults(),
|
||||
]);
|
||||
|
||||
/** @var \App\Models\ClientContact $contact **/
|
||||
$contact = ClientContact::factory()->create([
|
||||
'user_id' => $subscription->user_id,
|
||||
'company_id' => $subscription->company_id,
|
||||
|
@ -148,13 +148,16 @@ class TaskRepository extends BaseRepository
|
||||
* Store tasks in bulk.
|
||||
*
|
||||
* @param array $task
|
||||
* @return task|null
|
||||
* @return Task|null
|
||||
*/
|
||||
public function create($task): ?Task
|
||||
{
|
||||
/** @var \App\Models\User $user **/
|
||||
$user = auth()->user();
|
||||
|
||||
return $this->save(
|
||||
$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
|
||||
*
|
||||
* @param stdCLass $old_task The old task object
|
||||
* @param \stdCLass $old_task The old task object
|
||||
* @param Task $new_task The new Task model
|
||||
* @return void
|
||||
*/
|
||||
|
Loading…
x
Reference in New Issue
Block a user