diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php index 3f7c416ee..e6442c1ae 100755 --- a/packages/Webkul/Admin/src/Resources/lang/en/app.php +++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php @@ -754,7 +754,9 @@ return [ 'upload' => 'Upload', 'csv' => 'CSV', 'xls' => 'XLS', - 'file' => 'File' + '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.' ], 'response' => [ diff --git a/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php b/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php index 2b4ad7f42..97d38bc45 100755 --- a/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php +++ b/packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php @@ -177,15 +177,12 @@ class TaxRateController extends Controller */ public function import() { - $fileType = Validator::make(request()->all(), [ - 'file' => 'required|mimes:csv,xls,xlsx' - ]); + $valid_extension = ['xlsx', 'csv', 'xls']; - if ($fileType->fails()) { - $fileErrorMsg = $fileType->errors()->first('file'); - session()->flash('error', $fileErrorMsg); + if (!in_array(request()->file('file')->getClientOriginalExtension(), $valid_extension)) { + session()->flash('error', trans('admin::app.export.upload-error')); } else { - $excelData = (new DataGridImport)->toArray(request()->file('tax_rate')); + $excelData = (new DataGridImport)->toArray(request()->file('file')); foreach ($excelData as $data) { foreach ($data as $column => $uploadData) { @@ -212,7 +209,7 @@ class TaxRateController extends Controller if ($filtered) { foreach ($filtered as $position => $identifier) { - $message[] = 'Identifier must be unique, duplicate identifier' . ' ' . $identifier. ' at row' . ' ' . $position. '.'; + $message[] = trans('admin::app.export.duplicate-error', ['identifier' => $identifier, 'position' => $position]); } $finalMsg = implode(" ", $message);