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

Add pilot pay to journals; cleanup payment code #130

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-03-02 13:12:39 -06:00
parent 284db21a3a
commit 9f89447070
10 changed files with 262 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Database/migrations/2017_06_21_165410_create_ranks_table.php
View File

@@ -36,6 +36,8 @@ class CreateRanksTable extends Migration
'id' => 1,
'name' => 'New Pilot',
'hours' => 0,
'acars_base_pay_rate' => 50,
'manual_base_pay_rate' => 25,
]
];

249
app/Database/seeds/sample.yml
View File

@@ -333,8 +333,9 @@ pireps:
dpt_airport_id: KAUS
arr_airport_id: KJFK
flight_time: 180 # 6 hours
state: 2
state: 2 # accepted
status: 0
source: 1
route: KAUS SID TNV J87 IAH J2 LCH J22 MEI J239 ATL J52 AJFEB J14 BYJAC Q60 JAXSN J14 COLIN J61 HUBBS J55 SIE STAR KJFK
notes: just a pilot report
created_at: NOW
@@ -350,7 +351,7 @@ pireps:
state: 1
route: PLMMR2 SPA Q22 BEARI FAK PHLBO3
notes: just a pilot report
source: 1
source: 1 # pending
source_name: sample
created_at: NOW
updated_at: NOW
@@ -362,7 +363,8 @@ pireps:
dpt_airport_id: KJFK
arr_airport_id: KAUS
flight_time: 180 # 6 hours
state: 1
state: 1 # pending
source: 0 # manual
route: PLMMR2 SPA Q22 BEARI FAK PHLBO3
notes: just a pilot report
created_at: NOW
@@ -429,117 +431,150 @@ pirep_comments:
updated_at: now
journals:
- id: '1'
- id: 1
ledger_id: null
balance: '7965000'
balance: 7950000
currency: USD
morphed_type: App\Models\Airline
morphed_id: '1'
created_at: '2018-03-02 03:31:59'
updated_at: '2018-03-02 03:31:59'
morphed_id: 1
created_at: '2018-03-02 19:10:10'
updated_at: '2018-03-02 19:10:10'
- id: 2
ledger_id: null
balance: 15000
currency: USD
morphed_type: App\Models\User
morphed_id: 1
created_at: '2018-03-02 19:10:10'
updated_at: '2018-03-02 19:10:10'
journal_transactions:
- id: d2875dd2-e329-4d75-9883-120ef88f343a
transaction_group: fares
journal_id: '1'
credit: '6000000'
debit: '0'
currency: USD
memo: 'Fares Y300; price:200, cost: 0'
ref_class: App\Models\Pirep
ref_class_id: pirepid_1
created_at: '2018-03-02 03:31:59'
updated_at: '2018-03-02 03:31:59'
post_date: '2018-03-02 03:31:59'
deleted_at: null
- id: 3912bedb-138e-47f4-9a1f-bcd29c3c00ad
transaction_group: fares
journal_id: '1'
credit: '1100000'
debit: '0'
currency: USD
memo: 'Fares B10; price:1100, cost: 0'
ref_class: App\Models\Pirep
ref_class_id: pirepid_1
created_at: '2018-03-02 03:31:59'
updated_at: '2018-03-02 03:31:59'
post_date: '2018-03-02 03:31:59'
deleted_at: null
- id:: 55bbc2b8-646e-4d07-88d4-54c11c721f35
transaction_group: fares
journal_id: '1'
credit: '1000000'
debit: '0'
currency: USD
memo: 'Fares F10; price:1000, cost: 0'
ref_class: App\Models\Pirep
ref_class_id: pirepid_1
created_at: '2018-03-02 03:31:59'
updated_at: '2018-03-02 03:31:59'
post_date: '2018-03-02 03:31:59'
deleted_at: null
- id:: d9a353ea-5e40-4c7c-b976-305b89957185
transaction_group: expenses
journal_id: '1'
credit: null
debit: '10000'
currency: USD
memo: 'Expense: Per-Flight (no muliplier)'
ref_class: App\Models\Pirep
ref_class_id: pirepid_1
created_at: '2018-03-02 03:31:59'
updated_at: '2018-03-02 03:31:59'
post_date: '2018-03-02 03:31:59'
deleted_at: null
- id:: 9d1f321a-7fdb-402b-af90-ebf6cd5717a3
transaction_group: expenses
journal_id: '1'
credit: null
debit: '10000'
currency: USD
memo: 'Expense: Per-Flight (multiplier)'
ref_class: App\Models\Pirep
ref_class_id: pirepid_1
created_at: '2018-03-02 03:31:59'
updated_at: '2018-03-02 03:31:59'
post_date: '2018-03-02 03:31:59'
deleted_at: null
- id:: 7583cd5f-e75d-472d-b913-af724dc30f30
transaction_group: expenses
journal_id: '1'
credit: null
debit: '20000'
currency: USD
memo: 'Expense: Per-Flight (multiplier, on airline)'
ref_class: App\Models\Pirep
ref_class_id: pirepid_1
created_at: '2018-03-02 03:31:59'
updated_at: '2018-03-02 03:31:59'
post_date: '2018-03-02 03:31:59'
deleted_at: null
- id:: 9cf2fe46-124c-40a1-8cb8-1d1940c18704
transaction_group: expenses
journal_id: '1'
credit: null
debit: '20000'
currency: USD
memo: 'Expense: Per-Flight (multiplier, on airline)'
ref_class: App\Models\Pirep
ref_class_id: pirepid_1
created_at: '2018-03-02 03:31:59'
updated_at: '2018-03-02 03:31:59'
post_date: '2018-03-02 03:31:59'
deleted_at: null
- id:: 200af4e2-50fd-43f9-bcf3-93cc29800679
- id: 4c708dff-653a-41ab-8df8-9b2cd11430a1
transaction_group: ground_handling
journal_id: '1'
journal_id: 1
credit: null
debit: '75000'
debit: 75000
currency: USD
memo: 'Ground handling'
ref_class: App\Models\Pirep
ref_class_id: pirepid_1
created_at: '2018-03-02 03:31:59'
updated_at: '2018-03-02 03:31:59'
post_date: '2018-03-02 03:31:59'
ref_class_id: 0
created_at: '2018-03-02 19:10:10'
updated_at: '2018-03-02 19:10:10'
post_date: '2018-03-02 19:10:10'
deleted_at: null
- id: 6c4d3882-01cd-4f71-8b6c-6c7d97a338da
transaction_group: expenses
journal_id: 1
credit: null
debit: 20000
currency: USD
memo: 'Expense: Per-Flight (multiplier, on airline)'
ref_class: App\Models\Pirep
ref_class_id: 0
created_at: '2018-03-02 19:10:10'
updated_at: '2018-03-02 19:10:10'
post_date: '2018-03-02 19:10:10'
deleted_at: null
- id: 830a5479-8c32-47e5-90c3-5a85e46e93a7
transaction_group: expenses
journal_id: 1
credit: null
debit: 10000
currency: USD
memo: 'Expense: Per-Flight (multiplier)'
ref_class: App\Models\Pirep
ref_class_id: 0
created_at: '2018-03-02 19:10:10'
updated_at: '2018-03-02 19:10:10'
post_date: '2018-03-02 19:10:10'
deleted_at: null
- id: 8fb9adcc-c4aa-4ef2-aebd-9e9834c260f8
transaction_group: expenses
journal_id: 1
credit: null
debit: 20000
currency: USD
memo: 'Expense: Per-Flight (multiplier, on airline)'
ref_class: App\Models\Pirep
ref_class_id: 0
created_at: '2018-03-02 19:10:10'
updated_at: '2018-03-02 19:10:10'
post_date: '2018-03-02 19:10:10'
deleted_at: null
- id: 93ffaa27-4fb3-4a03-99e3-316d80ffdade
transaction_group: expenses
journal_id: 1
credit: null
debit: 10000
currency: USD
memo: 'Expense: Per-Flight (no muliplier)'
ref_class: App\Models\Pirep
ref_class_id: 0
created_at: '2018-03-02 19:10:10'
updated_at: '2018-03-02 19:10:10'
post_date: '2018-03-02 19:10:10'
deleted_at: null
- id: b1d694ee-a390-4640-a370-b512677c3d8a
transaction_group: pilot_pay
journal_id: 1
credit: null
debit: 15000
currency: USD
memo: 'Pilot Payment @ 50'
ref_class: App\Models\Pirep
ref_class_id: 0
created_at: '2018-03-02 19:10:10'
updated_at: '2018-03-02 19:10:10'
post_date: '2018-03-02 19:10:10'
deleted_at: null
- id: b4d873b1-0548-404d-ace0-5503fa68f01c
transaction_group: pilot_pay
journal_id: 2
credit: 15000
debit: null
currency: USD
memo: 'Pilot Payment @ 50'
ref_class: App\Models\Pirep
ref_class_id: 0
created_at: '2018-03-02 19:10:10'
updated_at: '2018-03-02 19:10:10'
post_date: '2018-03-02 19:10:10'
deleted_at: null
- id: b91bf014-6e60-44a5-8551-71e080ae38d5
transaction_group: fares
journal_id: 1
credit: 1100000
debit: 0
currency: USD
memo: 'Fares B10; price:1100, cost: 0'
ref_class: App\Models\Pirep
ref_class_id: 0
created_at: '2018-03-02 19:10:10'
updated_at: '2018-03-02 19:10:10'
post_date: '2018-03-02 19:10:10'
deleted_at: null
- id: e0c39035-13ec-4cfa-9f0e-d1dea9fd6087
transaction_group: fares
journal_id: 1
credit: 1000000
debit: 0
currency: USD
memo: 'Fares F10; price:1000, cost: 0'
ref_class: App\Models\Pirep
ref_class_id: 0
created_at: '2018-03-02 19:10:10'
updated_at: '2018-03-02 19:10:10'
post_date: '2018-03-02 19:10:10'
deleted_at: null
- id: f524150c-0843-4ba6-ad95-a288b61af2ff
transaction_group: fares
journal_id: 1
credit: 6000000
debit: 0
currency: USD
memo: 'Fares Y300; price:200, cost: 0'
ref_class: App\Models\Pirep
ref_class_id: 0
created_at: '2018-03-02 19:10:10'
updated_at: '2018-03-02 19:10:10'
post_date: '2018-03-02 19:10:10'
deleted_at: null