From db0cd27c0df9213e15f2d15374ac9ffe3779acdd Mon Sep 17 00:00:00 2001
From: rahul shukla <rahulshukla.symfony517@webkul.com>
Date: Fri, 22 Feb 2019 17:05:27 +0530
Subject: [PATCH] issue #615

---
 packages/Webkul/Admin/src/Resources/lang/en/app.php           | 4 +++-
 .../Webkul/Admin/src/Resources/views/export/export.blade.php  | 2 +-
 .../Admin/src/Resources/views/tax/tax-rates/index.blade.php   | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
index 7d212e34d..767ca5edb 100755
--- a/packages/Webkul/Admin/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@@ -772,7 +772,9 @@ return [
         'file' => 'File',
         'upload-error' => 'The file must be a file of type: xls, xlsx, csv.',
         'duplicate-error' => 'Identifier must be unique, duplicate identifier :identifier at row :position.',
-        'enough-row-error' => 'file has not enough rows'
+        'enough-row-error' => 'file has not enough rows',
+        'allowed-type' => 'Allowed Type :',
+        'file-type' => 'csv, xls, xlsx.'
     ],
 
     'response' => [
diff --git a/packages/Webkul/Admin/src/Resources/views/export/export.blade.php b/packages/Webkul/Admin/src/Resources/views/export/export.blade.php
index 80473533b..55e6e9628 100755
--- a/packages/Webkul/Admin/src/Resources/views/export/export.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/export/export.blade.php
@@ -2,7 +2,7 @@
     <thead>
         <tr>
             @foreach ($columns as $column)
-                <th>{{ $column['label'] }}</th>
+                <th>{{ $column['index'] }}</th>
             @endforeach
         </tr>
     </thead>
diff --git a/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/index.blade.php b/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/index.blade.php
index d3ec7f978..d079a38f6 100755
--- a/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/index.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/index.blade.php
@@ -53,6 +53,8 @@
                 <div class="control-group" :class="[errors.has('file') ? 'has-error' : '']">
                     <label for="file" class="required">{{ __('admin::app.export.file') }}</label>
                     <input v-validate="'required'" type="file" class="control" id="file" name="file" data-vv-as="&quot;{{ __('admin::app.export.file') }}&quot;" value="{{ old('file') }}"/ style="padding-top: 5px">
+                    <span>{{ __('admin::app.export.allowed-type') }}</span>
+                    <span><b>{{ __('admin::app.export.file-type') }}</b></span>
                     <span class="control-error" v-if="errors.has('file')">@{{ errors.first('file') }}</span>
                 </div>