From d29a91e50887bfcd2a3944c8eceeb5a8df2c954c Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 27 Jul 2023 17:49:22 +1000 Subject: [PATCH] Fixes for deleted payments leaking on invoices --- app/Export/CSV/BaseExport.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Export/CSV/BaseExport.php b/app/Export/CSV/BaseExport.php index 483872efaeee..4650b990f7d4 100644 --- a/app/Export/CSV/BaseExport.php +++ b/app/Export/CSV/BaseExport.php @@ -650,20 +650,20 @@ class BaseExport } 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') { - return $entity->payments()->exists() ? $entity->payments()->sum('paymentables.refunded') : 0; + return $entity->payments()->exists() ? $entity->payments()->withoutTrashed()->sum('paymentables.refunded') : ''; } if($column == 'applied') { - $refunded = $entity->payments()->sum('paymentables.refunded'); - $amount = $entity->payments()->sum('paymentables.amount'); + $refunded = $entity->payments()->withoutTrashed()->sum('paymentables.refunded'); + $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) return '';