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

change ref_class to ref_model

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-04-01 14:32:01 -05:00
parent 0bed38c78b
commit 793b3e7134
31 changed files with 211 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/AwardsTest.php
View File

@@ -30,8 +30,8 @@ class AwardsTest extends TestCase
{
// Create one award that's given out with one flight
$award = factory(App\Models\Award::class)->create([
'ref_class' => App\Awards\PilotFlightAwards::class,
'ref_class_params' => 1,
'ref_model' => App\Awards\PilotFlightAwards::class,
'ref_model_params' => 1,
]);
$user = factory(App\Models\User::class)->create([

6
tests/FinanceTest.php
View File

@@ -101,8 +101,8 @@ class FinanceTest extends TestCase
# Add a subfleet expense
factory(App\Models\Expense::class)->create([
'ref_class' => \App\Models\Subfleet::class,
'ref_class_id' => $subfleet['subfleet']->id,
'ref_model' => \App\Models\Subfleet::class,
'ref_model_id' => $subfleet['subfleet']->id,
'amount' => 200
]);
@@ -605,7 +605,7 @@ class FinanceTest extends TestCase
factory(App\Models\Expense::class)->create([
'airline_id' => null,
'ref_class' => \App\Models\Subfleet::class,
'ref_model' => \App\Models\Subfleet::class,
]);
$expenses = $this->expenseRepo->getAllForType(

8
tests/ImporterTest.php
View File

@@ -386,12 +386,12 @@ class ImporterTest extends TestCase
$catering = $expenses->where('name', 'Catering Staff')->first();
$this->assertEquals(1000, $catering->amount);
$this->assertEquals(\App\Models\Enums\ExpenseType::DAILY, $catering->type);
$this->assertEquals(\App\Models\Subfleet::class, $catering->ref_class);
$this->assertEquals($subfleet->id, $catering->ref_class_id);
$this->assertEquals(\App\Models\Subfleet::class, $catering->ref_model);
$this->assertEquals($subfleet->id, $catering->ref_model_id);
$mnt = $expenses->where('name', 'Maintenance')->first();
$this->assertEquals(\App\Models\Aircraft::class, $mnt->ref_class);
$this->assertEquals($aircraft->id, $mnt->ref_class_id);
$this->assertEquals(\App\Models\Aircraft::class, $mnt->ref_model);
$this->assertEquals($aircraft->id, $mnt->ref_model_id);
}
/**

2
tests/data/expenses.csv
View File

@@ -1,4 +1,4 @@
airline,name,amount,type,charge_to_user,multiplier,active,ref_class,ref_class_id
airline,name,amount,type,charge_to_user,multiplier,active,ref_model,ref_model_id
,"Per-Flight (no muliplier)",100,F,0,0,1,,
,"Per-Flight (multiplier)",100,F,0,1,1,,
VMS,"Per-Flight (multiplier, on airline)",200,F,0,1,1,,
1 airline name amount type charge_to_user multiplier active ref_class ref_model ref_class_id ref_model_id
2 Per-Flight (no muliplier) 100 F 0 0 1
3 Per-Flight (multiplier) 100 F 0 1 1
4 VMS Per-Flight (multiplier, on airline) 200 F 0 1 1

2
tests/data/expenses_empty_rows.csv
View File

@@ -1,4 +1,4 @@
airline,name,amount,type,charge_to_user,multiplier,active,ref_class,ref_class_id
airline,name,amount,type,charge_to_user,multiplier,active,ref_model,ref_model_id
,"Per-Flight (no muliplier)",100,F,0,0,1,,
,"Per-Flight (multiplier)",100,F,0,1,1,,
VMS,"Per-Flight (multiplier, on airline)",200,F,0,1,1,,
1 airline name amount type charge_to_user multiplier active ref_class ref_model ref_class_id ref_model_id
2 Per-Flight (no muliplier) 100 F 0 0 1
3 Per-Flight (multiplier) 100 F 0 1 1
4 VMS Per-Flight (multiplier, on airline) 200 F 0 1 1