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

Calculate percentage properly instead of adding to the base value #925 (#942)

Browse Source 
* Calculate percentage properly instead of adding to the base value #925
This commit is contained in:
Nabeel S
2020-11-26 16:44:57 -05:00
committed by GitHub
parent 2ecf366670
commit 6b5cf38224
4 changed files with 33 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Services/FareService.php
+3 -3
View File
@@ -147,7 +147,7 @@ class FareService extends Service
{ {
if (filled($pivot->price)) { if (filled($pivot->price)) {
if (strpos($pivot->price, '%', -1) !== false) { if (strpos($pivot->price, '%', -1) !== false) {
$fare->price = Math::addPercent($fare->price, $pivot->price); $fare->price = Math::getPercent($fare->price, $pivot->price);
} else { } else {
$fare->price = $pivot->price; $fare->price = $pivot->price;
} }
@@ -155,7 +155,7 @@ class FareService extends Service
if (filled($pivot->cost)) { if (filled($pivot->cost)) {
if (strpos($pivot->cost, '%', -1) !== false) { if (strpos($pivot->cost, '%', -1) !== false) {
$fare->cost = Math::addPercent($fare->cost, $pivot->cost); $fare->cost = Math::getPercent($fare->cost, $pivot->cost);
} else { } else {
$fare->cost = $pivot->cost; $fare->cost = $pivot->cost;
} }
@@ -163,7 +163,7 @@ class FareService extends Service
if (filled($pivot->capacity)) { if (filled($pivot->capacity)) {
if (strpos($pivot->capacity, '%', -1) !== false) { if (strpos($pivot->capacity, '%', -1) !== false) {
$fare->capacity = floor(Math::addPercent($fare->capacity, $pivot->capacity)); $fare->capacity = floor(Math::getPercent($fare->capacity, $pivot->capacity));
} else { } else {
$fare->capacity = floor($pivot->capacity); $fare->capacity = floor($pivot->capacity);
} }
app/Support/Math.php
+7 -4
View File
@@ -27,18 +27,19 @@ class Math
return $override_rate; return $override_rate;
} }
return static::addPercent($base_rate, $override_rate); // It is a percent, so apply it
return static::getPercent($base_rate, $override_rate);
} }
/** /**
* Add/subtract a percentage to a number * Apply a percentage to a number
* *
* @param $number * @param $number
* @param $percent * @param $percent
* *
* @return float * @return float
*/ */
public static function addPercent($number, $percent): float public static function getPercent($number, $percent): float
{ {
if (!is_numeric($number)) { if (!is_numeric($number)) {
$number = (float) $number; $number = (float) $number;
@@ -48,6 +49,8 @@ class Math
$percent = (float) $percent; $percent = (float) $percent;
} }
return $number + ($number * ($percent / 100)); $val = $number * ($percent / 100);
return $val;
} }
} }
tests/FinanceTest.php
+13 -44
View File
@@ -165,37 +165,6 @@ class FinanceTest extends TestCase
return [$user, $pirep, $fares]; return [$user, $pirep, $fares];
} }
/*public function testFlightFaresNoOverride()
{
$flight = factory(Flight::class)->create();
$fare = factory(Fare::class)->create();
$this->fareSvc->setForFlight($flight, $fare);
$subfleet_fares = $this->fareSvc->get($flight);
$this->assertCount(1, $subfleet_fares);
$this->assertEquals($fare->price, $subfleet_fares->get(0)->price);
$this->assertEquals($fare->capacity, $subfleet_fares->get(0)->capacity);
//
// set an override now
//
$this->fareSvc->setForFlight($flight, $fare, [
'price' => 50, 'capacity' => 400,
]);
// look for them again
$subfleet_fares = $this->fareSvc->getForFlight($flight);
$this->assertCount(1, $subfleet_fares);
$this->assertEquals(50, $subfleet_fares[0]->price);
$this->assertEquals(400, $subfleet_fares[0]->capacity);
// delete
$this->fareSvc->delFareFromFlight($flight, $fare);
$this->assertCount(0, $this->fareSvc->getForFlight($flight));
}*/
/** /**
* Make sure that the API is returning the fares properly for a subfleet on a flight * Make sure that the API is returning the fares properly for a subfleet on a flight
* https://github.com/nabeelio/phpvms/issues/899 * https://github.com/nabeelio/phpvms/issues/899
@@ -355,13 +324,13 @@ class FinanceTest extends TestCase
$subfleet = factory(Subfleet::class)->create(); $subfleet = factory(Subfleet::class)->create();
$this->fleetSvc->addSubfleetToFlight($subfleet, $flight); $this->fleetSvc->addSubfleetToFlight($subfleet, $flight);
$percent_incr = '20%'; $percent_incr = '120%';
$percent_decr = '-20%'; $percent_decr = '80%';
$percent_200 = '200%'; $percent_200 = '200%';
$new_price = Math::addPercent($fare->price, $percent_incr); $new_price = Math::getPercent($fare->price, $percent_incr);
$new_cost = Math::addPercent($fare->cost, $percent_decr); $new_cost = Math::getPercent($fare->cost, $percent_decr);
$new_capacity = Math::addPercent($fare->capacity, $percent_200); $new_capacity = Math::getPercent($fare->capacity, $percent_200);
$this->fareSvc->setForFlight($flight, $fare, [ $this->fareSvc->setForFlight($flight, $fare, [
'price' => $percent_incr, 'price' => $percent_incr,
@@ -455,9 +424,9 @@ class FinanceTest extends TestCase
$percent_decr = '-20%'; $percent_decr = '-20%';
$percent_200 = '200%'; $percent_200 = '200%';
$new_price = Math::addPercent($fare->price, $percent_incr); $new_price = Math::getPercent($fare->price, $percent_incr);
$new_cost = Math::addPercent($fare->cost, $percent_decr); $new_cost = Math::getPercent($fare->cost, $percent_decr);
$new_capacity = Math::addPercent($fare->capacity, $percent_200); $new_capacity = Math::getPercent($fare->capacity, $percent_200);
$this->fareSvc->setForSubfleet($subfleet, $fare, [ $this->fareSvc->setForSubfleet($subfleet, $fare, [
'price' => $percent_incr, 'price' => $percent_incr,
@@ -499,7 +468,7 @@ class FinanceTest extends TestCase
'cost' => 250, 'cost' => 250,
]); ]);
$fare3_price = Math::addPercent($fare3->price, 300); $fare3_price = Math::getPercent($fare3->price, 300);
// Assign another one to the flight, that's not on the subfleet // Assign another one to the flight, that's not on the subfleet
// This one should NOT be returned in the list of fares // This one should NOT be returned in the list of fares
@@ -623,7 +592,7 @@ class FinanceTest extends TestCase
// Change to a percentage // Change to a percentage
$manual_pay_rate = '50%'; $manual_pay_rate = '50%';
$manual_pay_adjusted = Math::addPercent( $manual_pay_adjusted = Math::getPercent(
$rank->manual_base_pay_rate, $rank->manual_base_pay_rate,
$manual_pay_rate $manual_pay_rate
); );
@@ -931,7 +900,7 @@ class FinanceTest extends TestCase
// $this->assertCount(9, $transactions['transactions']); // $this->assertCount(9, $transactions['transactions']);
$this->assertEquals(3020, $transactions['credits']->getValue()); $this->assertEquals(3020, $transactions['credits']->getValue());
$this->assertEquals(2060, $transactions['debits']->getValue()); $this->assertEquals(2050, $transactions['debits']->getValue());
// Check that all the different transaction types are there // Check that all the different transaction types are there
// test by the different groups that exist // test by the different groups that exist
@@ -987,7 +956,7 @@ class FinanceTest extends TestCase
// $this->assertCount(9, $transactions['transactions']); // $this->assertCount(9, $transactions['transactions']);
$this->assertEquals(3020, $transactions['credits']->getValue()); $this->assertEquals(3020, $transactions['credits']->getValue());
$this->assertEquals(2060, $transactions['debits']->getValue()); $this->assertEquals(2050, $transactions['debits']->getValue());
// Check that all the different transaction types are there // Check that all the different transaction types are there
// test by the different groups that exist // test by the different groups that exist
@@ -1026,7 +995,7 @@ class FinanceTest extends TestCase
$transactions = $journalRepo->getAllForObject($pirep2); $transactions = $journalRepo->getAllForObject($pirep2);
$this->assertEquals(3020, $transactions['credits']->getValue()); $this->assertEquals(3020, $transactions['credits']->getValue());
$this->assertEquals(2160, $transactions['debits']->getValue()); $this->assertEquals(2150, $transactions['debits']->getValue());
// Check that all the different transaction types are there // Check that all the different transaction types are there
// test by the different groups that exist // test by the different groups that exist
tests/MathTest.php
+10 -10
View File
@@ -13,16 +13,16 @@ class MathTest extends TestCase
public function testAddPercent() public function testAddPercent()
{ {
$tests = [ $tests = [
['expected' => 112, 'fn' => Math::addPercent(100, 12)], ['expected' => 112, 'fn' => Math::getPercent(100, 112)],
['expected' => 112, 'fn' => Math::addPercent(100, '12')], ['expected' => 112, 'fn' => Math::getPercent(100, '112')],
['expected' => 112, 'fn' => Math::addPercent(100, '12%')], ['expected' => 112, 'fn' => Math::getPercent(100, '112%')],
['expected' => 112, 'fn' => Math::addPercent(100, '12 %')], ['expected' => 112, 'fn' => Math::getPercent(100, '112%')],
['expected' => 112, 'fn' => Math::addPercent('100 ', '12')], ['expected' => 112, 'fn' => Math::getPercent('100 ', '112')],
['expected' => 112.5, 'fn' => Math::addPercent('100', '12.5')], ['expected' => 112.5, 'fn' => Math::getPercent('100', '112.5')],
['expected' => 88, 'fn' => Math::addPercent('100', -12)], ['expected' => 88, 'fn' => Math::getPercent('100', 88)],
['expected' => 88, 'fn' => Math::addPercent('100', '-12')], ['expected' => 88, 'fn' => Math::getPercent('100', '88')],
['expected' => 88, 'fn' => Math::addPercent('100', '-12 %')], ['expected' => 88, 'fn' => Math::getPercent('100', '88 %')],
['expected' => 88, 'fn' => Math::addPercent('100', '-12%')], ['expected' => 88, 'fn' => Math::getPercent('100', '88%')],
]; ];
foreach ($tests as $test) { foreach ($tests as $test) {