improved error handler of import/export
This commit is contained in:
parent
c08106418c
commit
0320df1c9b
@ -6,12 +6,18 @@ use App\Abstracts\Http\Response;
|
|||||||
use App\Traits\Jobs;
|
use App\Traits\Jobs;
|
||||||
use App\Traits\Permissions;
|
use App\Traits\Permissions;
|
||||||
use App\Traits\Relationships;
|
use App\Traits\Relationships;
|
||||||
|
use Exception;
|
||||||
|
use ErrorException;
|
||||||
use Illuminate\Database\Eloquent\Collection;
|
use Illuminate\Database\Eloquent\Collection;
|
||||||
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
|
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
|
||||||
use Illuminate\Foundation\Validation\ValidatesRequests;
|
use Illuminate\Foundation\Validation\ValidatesRequests;
|
||||||
use Illuminate\Pagination\Paginator;
|
use Illuminate\Pagination\Paginator;
|
||||||
use Illuminate\Pagination\LengthAwarePaginator;
|
use Illuminate\Pagination\LengthAwarePaginator;
|
||||||
use Illuminate\Routing\Controller as BaseController;
|
use Illuminate\Routing\Controller as BaseController;
|
||||||
|
use Illuminate\Support\Str;
|
||||||
|
use Maatwebsite\Excel\Exceptions\SheetNotFoundException;
|
||||||
|
use Maatwebsite\Excel\Facades\Excel;
|
||||||
|
use Throwable;
|
||||||
|
|
||||||
abstract class Controller extends BaseController
|
abstract class Controller extends BaseController
|
||||||
{
|
{
|
||||||
@ -66,4 +72,45 @@ abstract class Controller extends BaseController
|
|||||||
|
|
||||||
return $response;
|
return $response;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Import the excel file or catch errors
|
||||||
|
*
|
||||||
|
* @param $class
|
||||||
|
* @param $request
|
||||||
|
* @param $url
|
||||||
|
*
|
||||||
|
* @return mixed
|
||||||
|
*/
|
||||||
|
public function importExcel($class, $request, $url)
|
||||||
|
{
|
||||||
|
try {
|
||||||
|
Excel::import($class, $request->file('import'));
|
||||||
|
} catch (SheetNotFoundException | ErrorException | Exception | Throwable $e) {
|
||||||
|
flash($e->getMessage())->error()->important();
|
||||||
|
|
||||||
|
return redirect()->route('import.create', explode('/', $url));
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Export the excel file or catch errors
|
||||||
|
*
|
||||||
|
* @param $class
|
||||||
|
* @param $file_name
|
||||||
|
*
|
||||||
|
* @return mixed
|
||||||
|
*/
|
||||||
|
public function exportExcel($class, $file_name, $extension = 'xlsx')
|
||||||
|
{
|
||||||
|
try {
|
||||||
|
return Excel::download($class, Str::filename($file_name) . '.' . $extension);
|
||||||
|
} catch (ErrorException | Exception | Throwable $e) {
|
||||||
|
flash($e->getMessage())->error()->important();
|
||||||
|
|
||||||
|
return back();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -84,6 +84,6 @@ class Transactions extends Controller
|
|||||||
*/
|
*/
|
||||||
public function export()
|
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));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -139,6 +139,26 @@ class Transfers extends Controller
|
|||||||
return response()->json($response);
|
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.
|
* Show the form for editing the specified resource.
|
||||||
*
|
*
|
||||||
@ -222,24 +242,6 @@ class Transfers extends Controller
|
|||||||
return response()->json($response);
|
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.
|
* Export the specified resource.
|
||||||
*
|
*
|
||||||
@ -247,6 +249,6 @@ class Transfers extends Controller
|
|||||||
*/
|
*/
|
||||||
public function export()
|
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));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -111,7 +111,9 @@ class Items extends Controller
|
|||||||
*/
|
*/
|
||||||
public function import(ImportRequest $request)
|
public function import(ImportRequest $request)
|
||||||
{
|
{
|
||||||
\Excel::import(new Import(), $request->file('import'));
|
if (true !== $result = $this->importExcel(new Import, $request, 'common/items')) {
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
$message = trans('messages.success.imported', ['type' => trans_choice('general.items', 2)]);
|
$message = trans('messages.success.imported', ['type' => trans_choice('general.items', 2)]);
|
||||||
|
|
||||||
@ -237,7 +239,7 @@ class Items extends Controller
|
|||||||
*/
|
*/
|
||||||
public function export()
|
public function export()
|
||||||
{
|
{
|
||||||
return \Excel::download(new Export(), \Str::filename(trans_choice('general.items', 2)) . '.xlsx');
|
return $this->exportExcel(new Export, trans_choice('general.items', 2));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function autocomplete()
|
public function autocomplete()
|
||||||
|
@ -128,12 +128,8 @@ class Bills extends Controller
|
|||||||
*/
|
*/
|
||||||
public function import(ImportRequest $request)
|
public function import(ImportRequest $request)
|
||||||
{
|
{
|
||||||
try {
|
if (true !== $result = $this->importExcel(new Import, $request, 'purchases/bills')) {
|
||||||
\Excel::import(new Import(), $request->file('import'));
|
return $result;
|
||||||
} catch (\Maatwebsite\Excel\Exceptions\SheetNotFoundException $e) {
|
|
||||||
flash($e->getMessage())->error()->important();
|
|
||||||
|
|
||||||
return redirect()->route('import.create', ['purchases', 'bills']);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$message = trans('messages.success.imported', ['type' => trans_choice('general.bills', 2)]);
|
$message = trans('messages.success.imported', ['type' => trans_choice('general.bills', 2)]);
|
||||||
@ -217,7 +213,7 @@ class Bills extends Controller
|
|||||||
*/
|
*/
|
||||||
public function export()
|
public function export()
|
||||||
{
|
{
|
||||||
return \Excel::download(new Export(), \Str::filename(trans_choice('general.bills', 2)) . '.xlsx');
|
return $this->exportExcel(new Export, trans_choice('general.bills', 2));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -124,7 +124,9 @@ class Payments extends Controller
|
|||||||
*/
|
*/
|
||||||
public function import(ImportRequest $request)
|
public function import(ImportRequest $request)
|
||||||
{
|
{
|
||||||
\Excel::import(new Import(), $request->file('import'));
|
if (true !== $result = $this->importExcel(new Import, $request, 'purchases/payments')) {
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
$message = trans('messages.success.imported', ['type' => trans_choice('general.payments', 2)]);
|
$message = trans('messages.success.imported', ['type' => trans_choice('general.payments', 2)]);
|
||||||
|
|
||||||
@ -229,6 +231,6 @@ class Payments extends Controller
|
|||||||
*/
|
*/
|
||||||
public function export()
|
public function export()
|
||||||
{
|
{
|
||||||
return \Excel::download(new Export(), \Str::filename(trans_choice('general.payments', 2)) . '.xlsx');
|
return $this->exportExcel(new Export, trans_choice('general.payments', 2));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -161,7 +161,9 @@ class Vendors extends Controller
|
|||||||
*/
|
*/
|
||||||
public function import(ImportRequest $request)
|
public function import(ImportRequest $request)
|
||||||
{
|
{
|
||||||
\Excel::import(new Import(), $request->file('import'));
|
if (true !== $result = $this->importExcel(new Import, $request, 'purchases/vendors')) {
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
$message = trans('messages.success.imported', ['type' => trans_choice('general.vendors', 2)]);
|
$message = trans('messages.success.imported', ['type' => trans_choice('general.vendors', 2)]);
|
||||||
|
|
||||||
@ -282,7 +284,7 @@ class Vendors extends Controller
|
|||||||
*/
|
*/
|
||||||
public function export()
|
public function export()
|
||||||
{
|
{
|
||||||
return \Excel::download(new Export(), \Str::filename(trans_choice('general.vendors', 2)) . '.xlsx');
|
return $this->exportExcel(new Export, trans_choice('general.vendors', 2));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function currency(Contact $vendor)
|
public function currency(Contact $vendor)
|
||||||
|
@ -159,7 +159,9 @@ class Customers extends Controller
|
|||||||
*/
|
*/
|
||||||
public function import(ImportRequest $request)
|
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)]);
|
$message = trans('messages.success.imported', ['type' => trans_choice('general.customers', 2)]);
|
||||||
|
|
||||||
@ -280,7 +282,7 @@ class Customers extends Controller
|
|||||||
*/
|
*/
|
||||||
public function export()
|
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)
|
public function currency(Contact $customer)
|
||||||
|
@ -13,7 +13,6 @@ use App\Jobs\Document\DuplicateDocument;
|
|||||||
use App\Jobs\Document\UpdateDocument;
|
use App\Jobs\Document\UpdateDocument;
|
||||||
use App\Models\Document\Document;
|
use App\Models\Document\Document;
|
||||||
use App\Notifications\Sale\Invoice as Notification;
|
use App\Notifications\Sale\Invoice as Notification;
|
||||||
use App\Models\Setting\Currency;
|
|
||||||
use App\Traits\Documents;
|
use App\Traits\Documents;
|
||||||
use File;
|
use File;
|
||||||
|
|
||||||
@ -128,12 +127,8 @@ class Invoices extends Controller
|
|||||||
*/
|
*/
|
||||||
public function import(ImportRequest $request)
|
public function import(ImportRequest $request)
|
||||||
{
|
{
|
||||||
try {
|
if (true !== $result = $this->importExcel(new Import, $request, 'sales/invoices')) {
|
||||||
\Excel::import(new Import(), $request->file('import'));
|
return $result;
|
||||||
} catch (\Maatwebsite\Excel\Exceptions\SheetNotFoundException $e) {
|
|
||||||
flash($e->getMessage())->error()->important();
|
|
||||||
|
|
||||||
return redirect()->route('import.create', ['sales', 'invoices']);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$message = trans('messages.success.imported', ['type' => trans_choice('general.invoices', 2)]);
|
$message = trans('messages.success.imported', ['type' => trans_choice('general.invoices', 2)]);
|
||||||
@ -217,7 +212,7 @@ class Invoices extends Controller
|
|||||||
*/
|
*/
|
||||||
public function export()
|
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));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -124,7 +124,9 @@ class Revenues extends Controller
|
|||||||
*/
|
*/
|
||||||
public function import(ImportRequest $request)
|
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)]);
|
$message = trans('messages.success.imported', ['type' => trans_choice('general.revenues', 2)]);
|
||||||
|
|
||||||
@ -229,6 +231,6 @@ class Revenues extends Controller
|
|||||||
*/
|
*/
|
||||||
public function export()
|
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));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -12,7 +12,6 @@ use Maatwebsite\Excel\Concerns\WithMultipleSheets;
|
|||||||
|
|
||||||
class Invoices implements WithMultipleSheets
|
class Invoices implements WithMultipleSheets
|
||||||
{
|
{
|
||||||
|
|
||||||
public function sheets(): array
|
public function sheets(): array
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
|
Loading…
x
Reference in New Issue
Block a user