Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-07 10:44:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Nutcache import #1588

Browse Source
This commit is contained in:
Hillel Coren 2017-07-27 13:43:41 +03:00
parent ae20490dc8
commit 4bf495542f
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2388,6 +2388,7 @@ $LANG = array(
'currency_myanmar_kyat' => 'Myanmar Kyat', 'currency_myanmar_kyat' => 'Myanmar Kyat',
'currency_peruvian_sol' => 'Peruvian Sol', 'currency_peruvian_sol' => 'Peruvian Sol',
'use_english_version' => 'Make sure to use the English version of the files.<br/>We use the column headers to match the fields.',
); );

19
resources/views/accounts/import_export.blade.php
View File

@ -45,9 +45,14 @@
trans('texts.settings') => 'settings', trans('texts.settings') => 'settings',
]) !!} ]) !!}
</div> </div>
<div id="inovicePlaneImport" style="display:none"><center>
{!! trans('texts.invoiceplane_import', ['link' => link_to(INVOICEPLANE_IMPORT, 'turbo124/Plane2Ninja', ['target' => '_blank'])]) !!} <div id="notInovicePlaneImport">
</center></div> {!! Former::plaintext(' ')->help(trans('texts.use_english_version')) !!}
</div>
<div id="inovicePlaneImport" style="display:none">
{!! Former::plaintext(' ')->help(trans('texts.invoiceplane_import', ['link' => link_to(INVOICEPLANE_IMPORT, 'turbo124/Plane2Ninja', ['target' => '_blank'])])) !!}
</div>
<br/> <br/>
{!! Former::actions( Button::info(trans('texts.upload'))->withAttributes(['id' => 'uploadButton'])->submit()->large()->appendIcon(Icon::create('open'))) !!} {!! Former::actions( Button::info(trans('texts.upload'))->withAttributes(['id' => 'uploadButton'])->submit()->large()->appendIcon(Icon::create('open'))) !!}
@ -163,12 +168,18 @@
$('.JSON-file').show(); $('.JSON-file').show();
} }
@endif @endif
if (val === '{{ IMPORT_INVOICEPLANE }}') { if (val === '{{ IMPORT_JSON }}') {
$('#uploadButton').show();
$('#inovicePlaneImport').hide();
$('#notInovicePlaneImport').hide();
} else if (val === '{{ IMPORT_INVOICEPLANE }}') {
$('#uploadButton').hide(); $('#uploadButton').hide();
$('#inovicePlaneImport').show(); $('#inovicePlaneImport').show();
$('#notInovicePlaneImport').hide();
} else { } else {
$('#uploadButton').show(); $('#uploadButton').show();
$('#inovicePlaneImport').hide(); $('#inovicePlaneImport').hide();
$('#notInovicePlaneImport').show();
} }
@endforeach @endforeach
} }