omair/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/uldvstar/exchange-2.0.git synced 2026-08-19 04:24:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'export-booking-transaction' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development

Browse Source
This commit is contained in:
edmondlang
2022-05-01 12:22:01 +08:00
parent 1d640e5d03 6e1d31159b
commit bdf2613c5b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Exports/Services/ExportsBookingTransactions.php
+6 -6
View File
@@ -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
];
}
}