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

6
app/Http/Controllers/Sales/Customers.php
View File

@ -159,7 +159,9 @@ class Customers extends Controller
*/
public function import(ImportRequest $request)
{
\Excel::import(new Import(), $request->file('import'));
if (true !== $result = $this->importExcel(new Import, $request, 'sales/customers')) {
return $result;
}
$message = trans('messages.success.imported', ['type' => trans_choice('general.customers', 2)]);
@ -280,7 +282,7 @@ class Customers extends Controller
*/
public function export()
{
return \Excel::download(new Export(), \Str::filename(trans_choice('general.customers', 2)) . '.xlsx');
return $this->exportExcel(new Export, trans_choice('general.customers', 2));
}
public function currency(Contact $customer)

11
app/Http/Controllers/Sales/Invoices.php
View File

@ -13,7 +13,6 @@ use App\Jobs\Document\DuplicateDocument;
use App\Jobs\Document\UpdateDocument;
use App\Models\Document\Document;
use App\Notifications\Sale\Invoice as Notification;
use App\Models\Setting\Currency;
use App\Traits\Documents;
use File;
@ -128,12 +127,8 @@ class Invoices extends Controller
*/
public function import(ImportRequest $request)
{
try {
\Excel::import(new Import(), $request->file('import'));
} catch (\Maatwebsite\Excel\Exceptions\SheetNotFoundException $e) {
flash($e->getMessage())->error()->important();
return redirect()->route('import.create', ['sales', 'invoices']);
if (true !== $result = $this->importExcel(new Import, $request, 'sales/invoices')) {
return $result;
}
$message = trans('messages.success.imported', ['type' => trans_choice('general.invoices', 2)]);
@ -217,7 +212,7 @@ class Invoices extends Controller
*/
public function export()
{
return \Excel::download(new Export(), \Str::filename(trans_choice('general.invoices', 2)) . '.xlsx');
return $this->exportExcel(new Export, trans_choice('general.invoices', 2));
}
/**

6
app/Http/Controllers/Sales/Revenues.php
View File

@ -124,7 +124,9 @@ class Revenues extends Controller
*/
public function import(ImportRequest $request)
{
\Excel::import(new Import(), $request->file('import'));
if (true !== $result = $this->importExcel(new Import, $request, 'sales/revenues')) {
return $result;
}
$message = trans('messages.success.imported', ['type' => trans_choice('general.revenues', 2)]);
@ -229,6 +231,6 @@ class Revenues extends Controller
*/
public function export()
{
return \Excel::download(new Export(), \Str::filename(trans_choice('general.revenues', 2)) . '.xlsx');
return $this->exportExcel(new Export, trans_choice('general.revenues', 2));
}
}