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

Improved import upload page..

Browse Source
This commit is contained in:
Cüneyt Şentürk
2021-02-11 18:08:06 +03:00
parent 716bc9f422
commit 58daa83030
13 changed files with 198 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,13 +42,23 @@ class Transactions extends Controller
*/
public function import(ImportRequest $request)
{
\Excel::import(new Import(), $request->file('import'));
$response = $this->importExcel(new Import, $request);
$message = trans('messages.success.imported', ['type' => trans_choice('general.transactions', 2)]);
if ($response['success']) {
$response['redirect'] = route('transactions.index');
flash($message)->success();
$message = trans('messages.success.imported', ['type' => trans_choice('general.transactions', 1)]);
return redirect()->route('transactions.index');
flash($message)->success();
} else {
$response['redirect'] = route('import.create', ['banking', 'transactions']);
$message = $response['message'];
flash($message)->error()->important();
}
return response()->json($response);
}
/**

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

@ -95,15 +95,23 @@ class Transfers extends Controller
*/
public function import(ImportRequest $request)
{
if (true !== $result = $this->importExcel(new Import, $request, 'banking/transfers')) {
return $result;
$response = $this->importExcel(new Import, $request);
if ($response['success']) {
$response['redirect'] = route('transfers.index');
$message = trans('messages.success.imported', ['type' => trans_choice('general.transfers', 1)]);
flash($message)->success();
} else {
$response['redirect'] = route('import.create', ['banking', 'transfers']);
$message = $response['message'];
flash($message)->error()->important();
}
$message = trans('messages.success.imported', ['type' => trans_choice('general.transfers', 2)]);
flash($message)->success();
return redirect()->route('transfers.index');
return response()->json($response);
}
/**

22
app/Http/Controllers/Common/Items.php
View File

@ -111,15 +111,23 @@ class Items extends Controller
*/
public function import(ImportRequest $request)
{
if (true !== $result = $this->importExcel(new Import, $request, 'common/items')) {
return $result;
$response = $this->importExcel(new Import, $request);
if ($response['success']) {
$response['redirect'] = route('items.index');
$message = trans('messages.success.imported', ['type' => trans_choice('general.items', 1)]);
flash($message)->success();
} else {
$response['redirect'] = route('import.create', ['common', 'items']);
$message = $response['message'];
flash($message)->error()->important();
}
$message = trans('messages.success.imported', ['type' => trans_choice('general.items', 2)]);
flash($message)->success();
return redirect()->route('items.index');
return response()->json($response);
}
/**

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

@ -128,15 +128,23 @@ class Bills extends Controller
*/
public function import(ImportRequest $request)
{
if (true !== $result = $this->importExcel(new Import, $request, 'purchases/bills')) {
return $result;
$response = $this->importExcel(new Import, $request);
if ($response['success']) {
$response['redirect'] = route('bills.index');
$message = trans('messages.success.imported', ['type' => trans_choice('general.bills', 1)]);
flash($message)->success();
} else {
$response['redirect'] = route('import.create', ['purchases', 'bills']);
$message = $response['message'];
flash($message)->error()->important();
}
$message = trans('messages.success.imported', ['type' => trans_choice('general.bills', 2)]);
flash($message)->success();
return redirect()->route('bills.index');
return response()->json($response);
}
/**

22
app/Http/Controllers/Purchases/Payments.php
View File

@ -134,15 +134,23 @@ class Payments extends Controller
*/
public function import(ImportRequest $request)
{
if (true !== $result = $this->importExcel(new Import, $request, 'purchases/payments')) {
return $result;
$response = $this->importExcel(new Import, $request);
if ($response['success']) {
$response['redirect'] = route('payments.index');
$message = trans('messages.success.imported', ['type' => trans_choice('general.payments', 1)]);
flash($message)->success();
} else {
$response['redirect'] = route('import.create', ['purchases', 'payments']);
$message = $response['message'];
flash($message)->error()->important();
}
$message = trans('messages.success.imported', ['type' => trans_choice('general.payments', 2)]);
flash($message)->success();
return redirect()->route('payments.index');
return response()->json($response);
}
/**

22
app/Http/Controllers/Purchases/Vendors.php
View File

@ -161,15 +161,23 @@ class Vendors extends Controller
*/
public function import(ImportRequest $request)
{
if (true !== $result = $this->importExcel(new Import, $request, 'purchases/vendors')) {
return $result;
$response = $this->importExcel(new Import, $request);
if ($response['success']) {
$response['redirect'] = route('vendors.index');
$message = trans('messages.success.imported', ['type' => trans_choice('general.vendors', 1)]);
flash($message)->success();
} else {
$response['redirect'] = route('import.create', ['purchases', 'vendors']);
$message = $response['message'];
flash($message)->error()->important();
}
$message = trans('messages.success.imported', ['type' => trans_choice('general.vendors', 2)]);
flash($message)->success();
return redirect()->route('vendors.index');
return response()->json($response);
}
/**

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

@ -159,15 +159,23 @@ class Customers extends Controller
*/
public function import(ImportRequest $request)
{
if (true !== $result = $this->importExcel(new Import, $request, 'sales/customers')) {
return $result;
$response = $this->importExcel(new Import, $request);
if ($response['success']) {
$response['redirect'] = route('customers.index');
$message = trans('messages.success.imported', ['type' => trans_choice('general.customers', 1)]);
flash($message)->success();
} else {
$response['redirect'] = route('import.create', ['sales', 'customers']);
$message = $response['message'];
flash($message)->error()->important();
}
$message = trans('messages.success.imported', ['type' => trans_choice('general.customers', 2)]);
flash($message)->success();
return redirect()->route('customers.index');
return response()->json($response);
}
/**

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

@ -127,15 +127,23 @@ class Invoices extends Controller
*/
public function import(ImportRequest $request)
{
if (true !== $result = $this->importExcel(new Import, $request, 'sales/invoices')) {
return $result;
$response = $this->importExcel(new Import, $request);
if ($response['success']) {
$response['redirect'] = route('invoices.index');
$message = trans('messages.success.imported', ['type' => trans_choice('general.invoices', 1)]);
flash($message)->success();
} else {
$response['redirect'] = route('import.create', ['sales', 'invoices']);
$message = $response['message'];
flash($message)->error()->important();
}
$message = trans('messages.success.imported', ['type' => trans_choice('general.invoices', 2)]);
flash($message)->success();
return redirect()->route('invoices.index');
return response()->json($response);
}
/**

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

@ -134,15 +134,23 @@ class Revenues extends Controller
*/
public function import(ImportRequest $request)
{
if (true !== $result = $this->importExcel(new Import, $request, 'sales/revenues')) {
return $result;
$response = $this->importExcel(new Import, $request);
if ($response['success']) {
$response['redirect'] = route('revenues.index');
$message = trans('messages.success.imported', ['type' => trans_choice('general.revenues', 1)]);
flash($message)->success();
} else {
$response['redirect'] = route('import.create', ['sales', 'revenues']);
$message = $response['message'];
flash($message)->error()->important();
}
$message = trans('messages.success.imported', ['type' => trans_choice('general.revenues', 2)]);
flash($message)->success();
return redirect()->route('revenues.index');
return response()->json($response);
}
/**