Convert expense type to char, translations for ExpenseType

This commit is contained in:
Nabeel Shahzad
2018-04-01 22:26:20 -05:00
parent 2a01a935c0
commit cfd0853d79
12 changed files with 78 additions and 65 deletions

View File

@@ -14,7 +14,7 @@ class CreateExpensesTable extends Migration
$table->string('name');
$table->unsignedInteger('amount');
$table->unsignedTinyInteger('type');
$table->char('type');
$table->boolean('charge_to_user')->nullable()->default(false);
$table->boolean('multiplier')->nullable()->default(0);
$table->boolean('active')->nullable()->default(true);

View File

@@ -192,35 +192,35 @@ aircraft:
expenses:
- name: Per-Flight (no muliplier)
amount: 100
type: 0
type: F
active: 1
ref_model: App\Models\Expense
- name: Per-Flight (multiplier)
amount: 100
type: 0
type: F
multiplier: 1
active: 1
ref_model: App\Models\Expense
- name: Per-Flight (multiplier, on airline)
airline_id: 1
amount: 200
type: 0
type: F
multiplier: 1
active: 1
ref_model: App\Models\Expense
- name: A daily fee
amount: 800
type: 1
type: D
active: 1
ref_model: App\Models\Expense
- name: A monthly fee
amount: 5000
type: 2
type: M
active: 1
ref_model: App\Models\Expense
- name: Catering
amount: 1000
type: 0
type: F
active: 1
ref_model: App\Models\Subfleet
ref_model_id: 1
@@ -228,7 +228,7 @@ expenses:
updated_at: now
- name: Catering Staff
amount: 1000
type: 1
type: D
active: 1
ref_model: App\Models\Subfleet
ref_model_id: 1
@@ -236,7 +236,7 @@ expenses:
updated_at: now
- name: Maintenance
amount: 1000
type: 1
type: D
active: 1
ref_model: App\Models\Aircraft
ref_model_id: 1
@@ -518,7 +518,7 @@ journal_transactions:
debit: null
currency: USD
memo: 'Pilot Payment @ 50'
tags: '"pilot_pay"'
tags: "pilot_pay"
ref_model: App\Models\Pirep
ref_model_id: pirepid_1
created_at: '2018-03-06 12:34:15'
@@ -532,7 +532,7 @@ journal_transactions:
debit: 10000
currency: USD
memo: 'Expense: Per-Flight (no muliplier)'
tags: '"expense"'
tags: "expense"
ref_model: App\Models\Pirep
ref_model_id: pirepid_1
created_at: '2018-03-06 12:34:15'
@@ -546,7 +546,7 @@ journal_transactions:
debit: 0
currency: USD
memo: 'Fares Y300; price: 200, cost: 0'
tags: '"fare"'
tags: "fare"
ref_model: App\Models\Pirep
ref_model_id: pirepid_1
created_at: '2018-03-06 12:34:15'
@@ -560,7 +560,7 @@ journal_transactions:
debit: 20000
currency: USD
memo: 'Expense: Per-Flight (multiplier, on airline)'
tags: '"expense"'
tags: "expense"
ref_model: App\Models\Pirep
ref_model_id: pirepid_1
created_at: '2018-03-06 12:34:15'
@@ -574,7 +574,7 @@ journal_transactions:
debit: 10000
currency: USD
memo: 'Expense: Per-Flight (multiplier)'
tags: '"expense"'
tags: "expense"
ref_model: App\Models\Pirep
ref_model_id: pirepid_1
created_at: '2018-03-06 12:34:15'
@@ -588,7 +588,7 @@ journal_transactions:
debit: 100000
currency: USD
memo: 'Subfleet Expense: Catering (747-43X RB211-524G)'
tags: '"subfleet"'
tags: "subfleet"
ref_model: App\Models\Pirep
ref_model_id: pirepid_1
created_at: '2018-03-06 12:34:15'
@@ -602,7 +602,7 @@ journal_transactions:
debit: 0
currency: USD
memo: 'Fares F10; price: 1000, cost: 0'
tags: '"fare"'
tags: "fare"
ref_model: App\Models\Pirep
ref_model_id: pirepid_1
created_at: '2018-03-06 12:34:15'
@@ -616,7 +616,7 @@ journal_transactions:
debit: 15000
currency: USD
memo: 'Pilot Payment @ 50'
tags: '"pilot_pay"'
tags: "pilot_pay"
ref_model: App\Models\Pirep
ref_model_id: pirepid_1
created_at: now
@@ -630,7 +630,7 @@ journal_transactions:
debit: 0
currency: USD
memo: 'Fares B10; price: 1100, cost: 0'
tags: '"fare"'
tags: "fare"
ref_model: App\Models\Pirep
ref_model_id: pirepid_1
created_at: now
@@ -644,7 +644,7 @@ journal_transactions:
debit: 75000
currency: USD
memo: 'Ground Handling'
tags: '"ground_handling"'
tags: "ground_handling"
ref_model: App\Models\Pirep
ref_model_id: pirepid_1
created_at: now
@@ -659,7 +659,7 @@ journal_transactions:
debit: 300000
currency: USD
memo: 'Subfleet 744-3X-RB211: Block Time Cost'
tags: '"subfleet"'
tags: "subfleet"
ref_model: App\Models\Pirep
ref_model_id: pirepid_1
created_at: now