merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

validation for upload

This commit is contained in:
rahul shukla 2019-02-11 17:15:22 +05:30
parent d1b14fa38e
commit 1c16e2f2a9
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/Webkul/Admin/src/Resources/lang/en/app.php
View File

@ -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' => [

13
packages/Webkul/Tax/src/Http/Controllers/TaxRateController.php
View File

@ -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);