tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes for credit creation after downgrading a subscription service

Browse source
This commit is contained in:
David Bomba 2023-01-10 14:32:53 +11:00
parent 490c026a08
commit 5d459aaa2f
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Repositories/PaymentRepository.php
View file

@ -83,9 +83,8 @@ class PaymentRepository extends BaseRepository {
if ($data['amount'] == '') {
$data['amount'] = array_sum(array_column($data['invoices'], 'amount'));
}
$client->service()->updatePaidToDate($data['amount'])->save();
// $client->paid_to_date += $data['amount'];
$client->save();
}

4
app/Services/Credit/ApplyPayment.php
View file

@ -105,8 +105,8 @@ class ApplyPayment
private function addPaymentToLedger()
{
$this->payment->amount += $this->amount_applied;
$this->payment->applied += $this->amount_applied;
// $this->payment->amount += $this->amount_applied;
// $this->payment->applied += $this->amount_applied;
$this->payment->status_id = Payment::STATUS_COMPLETED;
$this->payment->currency_id = $this->credit->client->getSetting('currency_id');
$this->payment->save();

2
app/Services/Subscription/SubscriptionService.php
View file

@ -416,7 +416,7 @@ else
foreach($invoice->line_items as $item)
{
if($item->product_key != ctrans('texts.refund'))
if($item->product_key != ctrans('texts.refund') && ($item->type_id == "1" || $item->type_id == "2"))
{
$item->cost = ($item->cost*$ratio*$multiplier);