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

Merge pull request #1692 from burakcakirel/seperate-export-import-document-to-invoice-bill

Browse Source 
Separate export import document to invoice bill
This commit is contained in:
Denis Duliçi
2020-12-25 20:49:51 +03:00
committed by GitHub
parent eccaaad06b 3b965a39d2
commit 2d023873cc
45 changed files with 981 additions and 539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,10 +3,10 @@
namespace App\Http\Controllers\Purchases;
use App\Abstracts\Http\Controller;
use App\Exports\Document\Documents as Export;
use App\Exports\Purchases\Bills as Export;
use App\Http\Requests\Common\Import as ImportRequest;
use App\Http\Requests\Document\Document as Request;
use App\Imports\Document\Documents as Import;
use App\Imports\Purchases\Bills as Import;
use App\Jobs\Banking\CreateBankingDocumentTransaction;
use App\Jobs\Document\CreateDocument;
use App\Jobs\Document\DeleteDocument;
@@ -131,7 +131,7 @@ class Bills extends Controller
public function import(ImportRequest $request)
{
try {
\Excel::import(new Import(Document::BILL_TYPE), $request->file('import'));
\Excel::import(new Import(), $request->file('import'));
} catch (\Maatwebsite\Excel\Exceptions\SheetNotFoundException $e) {
flash($e->getMessage())->error()->important();
@@ -219,7 +219,7 @@ class Bills extends Controller
*/
public function export()
{
return \Excel::download(new Export(null, Document::BILL_TYPE), \Str::filename(trans_choice('general.bills', 2)) . '.xlsx');
return \Excel::download(new Export(), \Str::filename(trans_choice('general.bills', 2)) . '.xlsx');
}
/**

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

@@ -3,10 +3,10 @@
namespace App\Http\Controllers\Sales;
use App\Abstracts\Http\Controller;
use App\Exports\Document\Documents as Export;
use App\Exports\Sales\Invoices as Export;
use App\Http\Requests\Common\Import as ImportRequest;
use App\Http\Requests\Document\Document as Request;
use App\Imports\Document\Documents as Import;
use App\Imports\Sales\Invoices as Import;
use App\Jobs\Document\CreateDocument;
use App\Jobs\Document\DeleteDocument;
use App\Jobs\Document\DuplicateDocument;
@@ -131,7 +131,7 @@ class Invoices extends Controller
public function import(ImportRequest $request)
{
try {
\Excel::import(new Import(Document::INVOICE_TYPE), $request->file('import'));
\Excel::import(new Import(), $request->file('import'));
} catch (\Maatwebsite\Excel\Exceptions\SheetNotFoundException $e) {
flash($e->getMessage())->error()->important();
@@ -219,7 +219,7 @@ class Invoices extends Controller
*/
public function export()
{
return \Excel::download(new Export(null, Document::INVOICE_TYPE), \Str::filename(trans_choice('general.invoices', 2)) . '.xlsx');
return \Excel::download(new Export(), \Str::filename(trans_choice('general.invoices', 2)) . '.xlsx');
}
/**