Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-01 22:54:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for deleted payments leaking on invoices

Browse Source
This commit is contained in:
David Bomba 2023-07-27 17:49:22 +10:00
parent 44bf2d851e
commit d29a91e508
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Export/CSV/BaseExport.php
View File

@ -650,20 +650,20 @@ class BaseExport
} }
if($column == 'amount') if($column == 'amount')
return $entity->payments()->exists() ? $entity->payments()->sum('paymentables.amount') : ctrans('texts.unpaid'); return $entity->payments()->exists() ? $entity->payments()->withoutTrashed()->sum('paymentables.amount') : ctrans('texts.unpaid');
if($column == 'refunded') { if($column == 'refunded') {
return $entity->payments()->exists() ? $entity->payments()->sum('paymentables.refunded') : 0; return $entity->payments()->exists() ? $entity->payments()->withoutTrashed()->sum('paymentables.refunded') : '';
} }
if($column == 'applied') { if($column == 'applied') {
$refunded = $entity->payments()->sum('paymentables.refunded'); $refunded = $entity->payments()->withoutTrashed()->sum('paymentables.refunded');
$amount = $entity->payments()->sum('paymentables.amount'); $amount = $entity->payments()->withoutTrashed()->sum('paymentables.amount');
return $entity->payments()->exists() ? ($amount - $refunded) : 0; return $entity->payments()->withoutTrashed()->exists() ? ($amount - $refunded) : '';
} }
$payment = $entity->payments()->first(); $payment = $entity->payments()->withoutTrashed()->first();
if(!$payment) if(!$payment)
return ''; return '';