FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for duplicated/wrong expenses being applied #915 (#1173)

Browse Source 
* Fix for duplicated/wrong expenses being applied #915

* Style fixes
This commit is contained in:
Nabeel S
2021-05-06 12:42:56 -04:00
committed by GitHub
parent d2272e32a6
commit 6e6ba85080
3 changed files with 128 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
app/Services/Finance/PirepFinanceService.php
View File

@@ -304,20 +304,29 @@ class PirepFinanceService extends Service
}
// Form the memo, with some specific ones depending on the group
if ($expense->ref_model === Subfleet::class
&& $expense->ref_model_id === $pirep->aircraft->subfleet->id
) {
$memo = "Subfleet Expense: {$expense->name} ({$pirep->aircraft->subfleet->name})";
$transaction_group = "Subfleet: {$expense->name} ({$pirep->aircraft->subfleet->name})";
} elseif ($expense->ref_model === Aircraft::class
&& $expense->ref_model_id === $pirep->aircraft->id
) {
$memo = "Aircraft Expense: {$expense->name} ({$pirep->aircraft->name})";
$transaction_group = "Aircraft: {$expense->name} "
."({$pirep->aircraft->name}-{$pirep->aircraft->registration})";
if ($expense->ref_model === Subfleet::class) {
if ((int) ($expense->ref_model_id) === $pirep->aircraft->subfleet->id) {
$memo = "Subfleet Expense: $expense->name ({$pirep->aircraft->subfleet->name}) dd";
$transaction_group = "Subfleet: $expense->name ({$pirep->aircraft->subfleet->name})";
} else { // Skip any subfleets that weren't used for this flight
return;
}
} elseif ($expense->ref_model === Aircraft::class) {
if ((int) ($expense->ref_model_id) === $pirep->aircraft->id) {
$memo = "Aircraft Expense: $expense->name ({$pirep->aircraft->name})";
$transaction_group = "Aircraft: $expense->name "
."({$pirep->aircraft->name}-{$pirep->aircraft->registration})";
} else { // Skip any aircraft expenses that weren't used for this flight
return;
}
} else {
$memo = "Expense: {$expense->name}";
$transaction_group = "Expense: {$expense->name}";
// Skip any expenses that aren't for the airline this flight was for
if ($expense->airline_id && $expense->airline_id !== $pirep->airline_id) {
return;
}
$memo = "Expense: $expense->name";
$transaction_group = "Expense: $expense->name";
}
$debit = Money::createFromAmount($expense->amount);
@@ -360,8 +369,8 @@ class PirepFinanceService extends Service
$expenses->map(function (Expense $expense, $i) use ($pirep) {
Log::info('Finance: PIREP: '.$pirep->id.', airport expense:', $expense->toArray());
$memo = "Airport Expense: {$expense->name} ({$expense->ref_model_id})";
$transaction_group = "Airport: {$expense->ref_model_id}";
$memo = "Airport Expense: $expense->name ($expense->ref_model_id)";
$transaction_group = "Airport: $expense->ref_model_id";
$debit = Money::createFromAmount($expense->amount);