From da22d17b7a203017adb8c06f2fb8c7ad2d5fa3e2 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 10 May 2022 14:47:34 +0800 Subject: [PATCH] fix transaction export --- .../Exports/Services/ExportsTransactions.php | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php index 81b97eb8..64a98a5a 100644 --- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php @@ -61,15 +61,24 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping ]; - $booking = $transaction->owner->owner; - if(!($transaction->owner instanceof Booking)){ - if(!($transaction->owner->owner instanceof Booking)){ - dump($transaction->owner); + $booking = $transaction->owner; + $company = $booking->owner; + + if(!($booking instanceof Booking)){ + $booking = $transaction->owner->owner; + + + if($booking instanceof Company){ + $company = $booking; + $booking = null; + } else { + $company = $booking->owner; } } + return [ - $booking ? $booking->company->reference : '', + $company->reference, $booking ? $booking->marking : '', $transaction->bill_no, $transaction->owner_id,