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

Fix for Fuel and Ground Handling Costs (#1050)

Browse Source 
* Fix for Fuel and Ground Handling Costs

PR aims to fix issue #1048  and implements the feature request #1049 

If no fuel cost is defined for departure airport, settings / airport fuel price will be used.
If no ground handling cost is defined for airports, settings / airport ground handling cost will be used.

Ground handling prices of both departure and arrival airport will be used for calculations.

* Resolve conflict with latest dev

PR will still fail checks due to double ground handling fares and will work on it to have two records at transactions for dep/arr

* Remove Double GH Costs / Fix The Bug Only

Removed double GH costs for now, pr aims only fixing the current issue (general settings not being read for fuel and ground handling costs)

* Add departure and arrival airports to ground handling

* Style fix

* Fix tests

Co-authored-by: Nabeel S <nabeelio@users.noreply.github.com>
Co-authored-by: Nabeel Shahzad <nabeel@nabeel.sh>
This commit is contained in:
B.Fatih KOZ
2021-03-18 18:32:40 +03:00
committed by GitHub
parent 63eef59060
commit 1d83b85d8b
2 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/FinanceTest.php
View File

@@ -900,7 +900,7 @@ class FinanceTest extends TestCase
// $this->assertCount(9, $transactions['transactions']);
$this->assertEquals(3020, $transactions['credits']->getValue());
$this->assertEquals(2040, $transactions['debits']->getValue());
$this->assertEquals(2050.0, $transactions['debits']->getValue());
// Check that all the different transaction types are there
// test by the different groups that exist
@@ -910,7 +910,7 @@ class FinanceTest extends TestCase
'expense' => 1,
'subfleet' => 2,
'fare' => 3,
'ground_handling' => 1,
'ground_handling' => 2,
'pilot_pay' => 2, // debit on the airline, credit to the pilot
];
@@ -956,7 +956,7 @@ class FinanceTest extends TestCase
// $this->assertCount(9, $transactions['transactions']);
$this->assertEquals(3020, $transactions['credits']->getValue());
$this->assertEquals(2040, $transactions['debits']->getValue());
$this->assertEquals(2050.0, $transactions['debits']->getValue());
// Check that all the different transaction types are there
// test by the different groups that exist
@@ -966,7 +966,7 @@ class FinanceTest extends TestCase
'expense' => 1,
'subfleet' => 2,
'fare' => 3,
'ground_handling' => 1,
'ground_handling' => 2,
'pilot_pay' => 2, // debit on the airline, credit to the pilot
];
@@ -995,7 +995,7 @@ class FinanceTest extends TestCase
$transactions = $journalRepo->getAllForObject($pirep2);
$this->assertEquals(3020, $transactions['credits']->getValue());
$this->assertEquals(2140, $transactions['debits']->getValue());
$this->assertEquals(2150.0, $transactions['debits']->getValue());
// Check that all the different transaction types are there
// test by the different groups that exist
@@ -1005,7 +1005,7 @@ class FinanceTest extends TestCase
'expense' => 2,
'subfleet' => 2,
'fare' => 3,
'ground_handling' => 1,
'ground_handling' => 2,
'pilot_pay' => 2, // debit on the airline, credit to the pilot
];