cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-19 04:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix transaction export

Browse Source
This commit is contained in:
omair saleh
2022-05-10 16:07:59 +08:00
parent 1e782e9e49
commit fb59937a8d
1 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Exports/Services/ExportsTransactions.php
+3 -18
View File
@@ -25,7 +25,7 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping
*/
public function query()
{
return Transaction::query();
return Transaction::whereIn([TransactionType::PAYMENT, TransactionType::BILL]);
}
/**
@@ -62,26 +62,11 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping
$booking = $transaction->owner;
$company = '';
if(!($booking instanceof Booking)){
$booking = $transaction->owner->owner;
if($booking instanceof Transaction){
$booking = $booking->owner;
}
if($booking instanceof Company){
$company = $booking;
$booking = null;
} else {
$company = $booking->company;
}
} else {
$company = $booking->company;
$booking = $booking->owner;
}
if((!($company instanceof Company) || !($booking instanceof Booking)) && $booking !== null ) dd($company, $booking);
$company = $booking->company;
return [
$company->reference,