shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improved error handler of import/export

Browse Source
This commit is contained in:
Denis Duliçi
2021-01-31 23:47:36 +03:00
parent c08106418c
commit 0320df1c9b
11 changed files with 95 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Banking/Transactions.php
View File

@ -84,6 +84,6 @@ class Transactions extends Controller
*/
public function export()
{
return \Excel::download(new Export(), \Str::filename(trans_choice('general.transactions', 2)) . '.xlsx');
return $this->exportExcel(new Export, trans_choice('general.transactions', 2));
}
}

40
app/Http/Controllers/Banking/Transfers.php
View File

@ -139,6 +139,26 @@ class Transfers extends Controller
return response()->json($response);
}
/**
* Import the specified resource.
*
* @param ImportRequest $request
*
* @return Response
*/
public function import(ImportRequest $request)
{
if (true !== $result = $this->importExcel(new Import, $request, 'banking/transfers')) {
return $result;
}
$message = trans('messages.success.imported', ['type' => trans_choice('general.transfers', 2)]);
flash($message)->success();
return redirect()->route('transfers.index');
}
/**
* Show the form for editing the specified resource.
*
@ -222,24 +242,6 @@ class Transfers extends Controller
return response()->json($response);
}
/**
* Import the specified resource.
*
* @param ImportRequest $request
*
* @return Response
*/
public function import(ImportRequest $request)
{
\Excel::import(new Import(), $request->file('import'));
$message = trans('messages.success.imported', ['type' => trans_choice('general.transfers', 2)]);
flash($message)->success();
return redirect()->route('transfers.index');
}
/**
* Export the specified resource.
*
@ -247,6 +249,6 @@ class Transfers extends Controller
*/
public function export()
{
return \Excel::download(new Export(), \Str::filename(trans_choice('general.transfers', 2)) . '.xlsx');
return $this->exportExcel(new Export, trans_choice('general.transfers', 2));
}
}