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

flash import error

Browse Source
This commit is contained in:
denisdulici 2020-02-29 15:31:35 +03:00
parent f537ca5c50
commit 3f596c2eda
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/Purchases/Bills.php
View File

@ -13,7 +13,6 @@ use App\Jobs\Purchase\DeleteBill;
use App\Jobs\Purchase\DuplicateBill; use App\Jobs\Purchase\DuplicateBill;
use App\Jobs\Purchase\UpdateBill; use App\Jobs\Purchase\UpdateBill;
use App\Models\Banking\Account; use App\Models\Banking\Account;
use App\Models\Banking\Transaction;
use App\Models\Common\Contact; use App\Models\Common\Contact;
use App\Models\Common\Item; use App\Models\Common\Item;
use App\Models\Purchase\Bill; use App\Models\Purchase\Bill;
@ -167,11 +166,11 @@ class Bills extends Controller
*/ */
public function import(ImportRequest $request) public function import(ImportRequest $request)
{ {
$success = true; try {
\Excel::import(new Import(), $request->file('import'));
} catch (\Maatwebsite\Excel\Exceptions\SheetNotFoundException $e) {
flash($e->getMessage())->error()->important();
\Excel::import(new Import(), $request->file('import'));
if (!$success) {
return redirect()->route('import.create', ['purchases', 'bills']); return redirect()->route('import.create', ['purchases', 'bills']);
} }

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

@ -13,7 +13,6 @@ use App\Jobs\Sale\DeleteInvoice;
use App\Jobs\Sale\DuplicateInvoice; use App\Jobs\Sale\DuplicateInvoice;
use App\Jobs\Sale\UpdateInvoice; use App\Jobs\Sale\UpdateInvoice;
use App\Models\Banking\Account; use App\Models\Banking\Account;
use App\Models\Banking\Transaction;
use App\Models\Common\Contact; use App\Models\Common\Contact;
use App\Models\Common\Item; use App\Models\Common\Item;
use App\Models\Sale\Invoice; use App\Models\Sale\Invoice;
@ -173,11 +172,11 @@ class Invoices extends Controller
*/ */
public function import(ImportRequest $request) public function import(ImportRequest $request)
{ {
$success = true; try {
\Excel::import(new Import(), $request->file('import'));
} catch (\Maatwebsite\Excel\Exceptions\SheetNotFoundException $e) {
flash($e->getMessage())->error()->important();
\Excel::import(new Import(), $request->file('import'));
if (!$success) {
return redirect()->route('import.create', ['sales', 'invoices']); return redirect()->route('import.create', ['sales', 'invoices']);
} }
@ -185,7 +184,7 @@ class Invoices extends Controller
flash($message)->success(); flash($message)->success();
return redirect('sales/invoices'); return redirect()->route('invoices.index');
} }
/** /**