From 4bf495542f8e1a0bf3f8f9dba4986dab104ae926 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Thu, 27 Jul 2017 13:43:41 +0300
Subject: [PATCH] Nutcache import #1588

---
 resources/lang/en/texts.php                   |  1 +
 .../views/accounts/import_export.blade.php    | 19 +++++++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index f1042d9844..ca224373f2 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -2388,6 +2388,7 @@ $LANG = array(
     'currency_myanmar_kyat' => 'Myanmar Kyat',
     '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.',
 
 );
 
diff --git a/resources/views/accounts/import_export.blade.php b/resources/views/accounts/import_export.blade.php
index 2dc9e233e0..dbb640045d 100644
--- a/resources/views/accounts/import_export.blade.php
+++ b/resources/views/accounts/import_export.blade.php
@@ -45,9 +45,14 @@
                         trans('texts.settings') => 'settings',
                     ]) !!}
         </div>
-        <div id="inovicePlaneImport" style="display:none"><center>
-                {!! trans('texts.invoiceplane_import', ['link' => link_to(INVOICEPLANE_IMPORT, 'turbo124/Plane2Ninja', ['target' => '_blank'])]) !!}
-        </center></div>
+
+        <div id="notInovicePlaneImport">
+            {!! 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/>
 
         {!! Former::actions( Button::info(trans('texts.upload'))->withAttributes(['id' => 'uploadButton'])->submit()->large()->appendIcon(Icon::create('open'))) !!}
@@ -163,12 +168,18 @@
                 $('.JSON-file').show();
             }
         @endif
-        if (val === '{{ IMPORT_INVOICEPLANE }}') {
+        if (val === '{{ IMPORT_JSON }}') {
+            $('#uploadButton').show();
+            $('#inovicePlaneImport').hide();
+            $('#notInovicePlaneImport').hide();
+        } else if (val === '{{ IMPORT_INVOICEPLANE }}') {
             $('#uploadButton').hide();
             $('#inovicePlaneImport').show();
+            $('#notInovicePlaneImport').hide();
         } else {
             $('#uploadButton').show();
             $('#inovicePlaneImport').hide();
+            $('#notInovicePlaneImport').show();
         }
     @endforeach
   }