Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Working on CSV import

Browse Source
This commit is contained in:
Hillel Coren 2017-07-07 15:12:57 +03:00
parent 6e89fcd0cb
commit 167d005373
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/Services/ImportService.php
View File

@ -534,7 +534,18 @@ class ImportService
// Lookup field translations // Lookup field translations
foreach ($columns as $key => $value) { foreach ($columns as $key => $value) {
unset($columns[$key]); unset($columns[$key]);
$columns[$value] = trans("texts.{$value}"); $label = $value;
// disambiguate some of the labels
if ($entityType == ENTITY_INVOICE) {
if ($label == 'name') {
$label = 'client_name';
} elseif ($label == 'notes') {
$label = 'product_notes';
} elseif ($label == 'terms') {
$label = 'invoice_terms';
}
}
$columns[$value] = trans("texts.{$label}");
} }
array_unshift($columns, ' '); array_unshift($columns, ' ');

3
resources/lang/en/texts.php
View File

@ -511,7 +511,7 @@ $LANG = array(
'partial_remaining' => ':partial of :balance', 'partial_remaining' => ':partial of :balance',
'more_fields' => 'More Fields', 'more_fields' => 'More Fields',
'less_fields' => 'Less Fields', 'less_fields' => 'Less Fields',
'client_name' => 'Client', 'client_name' => 'Client Name',
'pdf_settings' => 'PDF Settings', 'pdf_settings' => 'PDF Settings',
'product_settings' => 'Product Settings', 'product_settings' => 'Product Settings',
'auto_wrap' => 'Auto Line Wrap', 'auto_wrap' => 'Auto Line Wrap',
@ -2298,6 +2298,7 @@ $LANG = array(
'next_credit_number' => 'The next credit number is :number.', 'next_credit_number' => 'The next credit number is :number.',
'padding_help' => 'The number of zero\'s to pad the number.', 'padding_help' => 'The number of zero\'s to pad the number.',
'import_warning_invalid_date' => 'Warning: The date format appears to be invalid.', 'import_warning_invalid_date' => 'Warning: The date format appears to be invalid.',
'product_notes' => 'Product Notes',
); );