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

Convert expense type to char, translations for ExpenseType

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Services/Finance/RecurringFinanceService.php
View File

@@ -60,7 +60,7 @@ class RecurringFinanceService extends Service
if ($expense->ref_model) {
$ref = explode('\\', $expense->ref_model);
$klass = end($ref);
$obj = $expense->getReference();
$obj = $expense->getReferencedObject();
}
if ($klass === 'Airport') {

4
app/Services/ImportExport/ExpenseExporter.php
View File

@@ -44,15 +44,13 @@ class ExpenseExporter extends ImportExport
$ret['airline'] = $expense->airline->icao;
}
$ret['type'] = ExpenseType::convertToCode($ret['type']);
// For the different expense types, instead of exporting
// the ID, export a specific column
if ($expense->ref_model === Expense::class) {
$ret['ref_model'] = '';
$ret['ref_model_id'] = '';
} else {
$obj = $expense->getReference();
$obj = $expense->getReferencedObject();
if(!$obj) { // bail out
return $ret;
}

1
app/Services/ImportExport/ExpenseImporter.php
View File

@@ -49,7 +49,6 @@ class ExpenseImporter extends ImportExport
# Figure out what this is referring to
$row = $this->getRefClassInfo($row);
$row['type'] = ExpenseType::getFromCode($row['type']);
if(!$row['active']) {
$row['active'] = true;
}