From 6e1d31159ba88ff2b1bdac198f1013f9ed86772e Mon Sep 17 00:00:00 2001 From: edmondlang Date: Sun, 1 May 2022 12:21:31 +0800 Subject: [PATCH] update export booking transaction add in supplier name --- .../Exports/Services/ExportsBookingTransactions.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Classes/Modules/Exports/Services/ExportsBookingTransactions.php b/app/Classes/Modules/Exports/Services/ExportsBookingTransactions.php index 7da82a31..aed106ea 100644 --- a/app/Classes/Modules/Exports/Services/ExportsBookingTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsBookingTransactions.php @@ -2,6 +2,7 @@ namespace App\Classes\Modules\Exports\Services; +use App\Models\Company; use App\Models\Transaction; use Maatwebsite\Excel\Concerns\Exportable; use Maatwebsite\Excel\Concerns\FromQuery; @@ -29,7 +30,8 @@ class ExportsBookingTransactions implements FromQuery, WithHeadings, WithHeading 'Ref No', 'Creted Date', 'Amount', - 'Rate' + 'Rate', + 'Supplier' ]; } @@ -54,11 +56,8 @@ class ExportsBookingTransactions implements FromQuery, WithHeadings, WithHeading */ public function map($transaction): array { - if ($transaction->owner->owner == null){ - $refNo = $transaction->owner->marking; - } else { - $refNo = $transaction->owner->owner->marking; - } + $supplierName = Company::where('id', $transaction->issuer)->get()->first()->name; + $refNo = $transaction->owner->owner == null ? $transaction->owner->marking : $transaction->owner->owner->marking; $createdAt = $transaction->created_at->format('d-m-Y'); $amount = $transaction->amount; @@ -69,6 +68,7 @@ class ExportsBookingTransactions implements FromQuery, WithHeadings, WithHeading $createdAt, $amount, $rate, + $supplierName ]; } } \ No newline at end of file