From 81b03e40b1a4a8691279803c7d52f1d9f984743c Mon Sep 17 00:00:00 2001 From: omair saleh Date: Thu, 28 Apr 2022 11:19:22 +0800 Subject: [PATCH] update transaction export --- .../Exports/Services/ExportsTransactions.php | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php index 7fac8611..02232268 100644 --- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php @@ -8,6 +8,7 @@ use App\Classes\ValueObjects\Constants\TransactionType; use App\Models\Booking; use App\Models\Company; use App\Models\Transaction; +use App\Models\Wallet; use Maatwebsite\Excel\Concerns\Exportable; use Maatwebsite\Excel\Concerns\FromQuery; use Maatwebsite\Excel\Concerns\WithHeadingRow; @@ -59,11 +60,20 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping 6 => 'EXPIRED' ]; - $booking = $transaction->type === 1 ? $transaction->owner : $transaction->owner->owner; + $booking = null; + + if($transaction->owner_type === Booking::class){ + $booking = $transaction->owner; + } + + if($transaction->owner_type === Transaction::class){ + $booking = $transaction->owner->owner; + } + return [ - ($booking instanceof Booking) ? $booking->company->reference : '', - ($booking instanceof Booking) ? $booking->marking : '', + $booking ? $booking->company->reference : '', + $booking ? $booking->marking : '', $transaction->bill_no, $transaction->owner_id, $transaction->owner_type,