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

fixed tests and bulk action export

Browse Source
This commit is contained in:
Denis Duliçi
2021-05-23 17:13:13 +03:00
parent 21e14f1191
commit 4e924ab46d
21 changed files with 274 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/Abstracts/BulkAction.php
View File

@ -7,7 +7,8 @@ use App\Jobs\Common\UpdateContact;
use App\Jobs\Banking\DeleteTransaction;
use App\Traits\Jobs;
use App\Traits\Relationships;
use Artisan;
use App\Utilities\Export;
use App\Utilities\Import;
abstract class BulkAction
{
@ -164,4 +165,32 @@ abstract class BulkAction
}
}
}
/**
* Import the excel file or catch errors
*
* @param $class
* @param $request
* @param $translation
*
* @return array
*/
public function importExcel($class, $request, $translation)
{
return Import::fromExcel($class, $request, $translation);
}
/**
* Export the excel file or catch errors
*
* @param $class
* @param $translation
* @param $extension
*
* @return mixed
*/
public function exportExcel($class, $translation, $extension = 'xlsx')
{
return Export::toExcel($class, $translation, $extension);
}
}

85
app/Abstracts/Http/Controller.php
View File

@ -3,19 +3,17 @@
namespace App\Abstracts\Http;
use App\Abstracts\Http\Response;
use App\Jobs\Auth\NotifyUser;
use App\Jobs\Common\CreateMediableForExport;
use App\Notifications\Common\ImportCompleted;
use App\Traits\Jobs;
use App\Traits\Permissions;
use App\Traits\Relationships;
use App\Utilities\Export;
use App\Utilities\Import;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Pagination\Paginator;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Routing\Controller as BaseController;
use Illuminate\Support\Str;
abstract class Controller extends BaseController
{
@ -78,57 +76,11 @@ abstract class Controller extends BaseController
* @param $request
* @param $translation
*
* @return mixed
* @return array
*/
public function importExcel($class, $request, $translation)
{
try {
$file = $request->file('import');
if (should_queue()) {
$class->queue($file)->onQueue('imports')->chain([
new NotifyUser(user(), new ImportCompleted),
]);
$message = trans('messages.success.import_queued', ['type' => $translation]);
} else {
$class->import($file);
$message = trans('messages.success.imported', ['type' => $translation]);
}
$response = [
'success' => true,
'error' => false,
'data' => null,
'message' => $message,
];
} catch (\Throwable $e) {
if ($e instanceof \Maatwebsite\Excel\Validators\ValidationException) {
foreach ($e->failures() as $failure) {
$message = trans('messages.error.import_column', [
'message' => collect($failure->errors())->first(),
'column' => $failure->attribute(),
'line' => $failure->row(),
]);
flash($message)->error()->important();
}
$message = '';
} else {
$message = $e->getMessage();
}
$response = [
'success' => false,
'error' => true,
'data' => null,
'message' => $message,
];
}
return $response;
return Import::fromExcel($class, $request, $translation);
}
/**
@ -142,33 +94,6 @@ abstract class Controller extends BaseController
*/
public function exportExcel($class, $translation, $extension = 'xlsx')
{
try {
$file_name = Str::filename($translation) . '-' . time() . '.' . $extension;
if (should_queue()) {
$disk = 'temp';
if (config('excel.temporary_files.remote_disk') !== null) {
$disk = config('excel.temporary_files.remote_disk');
$file_name = config('excel.temporary_files.remote_prefix') . $file_name;
}
$class->queue($file_name, $disk)->onQueue('exports')->chain([
new CreateMediableForExport(user(), $file_name),
]);
$message = trans('messages.success.export_queued', ['type' => $translation]);
flash($message)->success();
return back();
} else {
return $class->download($file_name);
}
} catch (\Throwable $e) {
flash($e->getMessage())->error()->important();
return back();
}
return Export::toExcel($class, $translation, $extension);
}
}

2
app/BulkActions/Banking/Transactions.php
View File

@ -32,6 +32,6 @@ class Transactions extends BulkAction
{
$selected = $this->getSelectedInput($request);
return \Excel::download(new Export($selected), \Str::filename(trans_choice('general.transactions', 2)) . '.xlsx');
return $this->exportExcel(new Export($selected), trans_choice('general.transactions', 2));
}
}

2
app/BulkActions/Banking/Transfers.php
View File

@ -41,6 +41,6 @@ class Transfers extends BulkAction
{
$selected = $this->getSelectedInput($request);
return \Excel::download(new Export($selected), \Str::filename(trans_choice('general.transfers', 2)) . '.xlsx');
return $this->exportExcel(new Export($selected), trans_choice('general.transfers', 2));
}
}

2
app/BulkActions/Common/Items.php
View File

@ -55,6 +55,6 @@ class Items extends BulkAction
{
$selected = $this->getSelectedInput($request);
return \Excel::download(new Export($selected), trans_choice('general.items', 2) . '.xlsx');
return $this->exportExcel(new Export($selected), trans_choice('general.items', 2));
}
}

2
app/BulkActions/Purchases/Bills.php
View File

@ -104,6 +104,6 @@ class Bills extends BulkAction
{
$selected = $this->getSelectedInput($request);
return \Excel::download(new Export($selected), \Str::filename(trans_choice('general.bills', 2)) . '.xlsx');
return $this->exportExcel(new Export($selected), trans_choice('general.bills', 2));
}
}

2
app/BulkActions/Purchases/Payments.php
View File

@ -32,6 +32,6 @@ class Payments extends BulkAction
{
$selected = $this->getSelectedInput($request);
return \Excel::download(new Export($selected), \Str::filename(trans_choice('general.payments', 2)) . '.xlsx');
return $this->exportExcel(new Export($selected), trans_choice('general.payments', 2));
}
}

2
app/BulkActions/Purchases/Vendors.php
View File

@ -47,6 +47,6 @@ class Vendors extends BulkAction
{
$selected = $this->getSelectedInput($request);
return \Excel::download(new Export($selected), \Str::filename(trans_choice('general.vendors', 2)) . '.xlsx');
return $this->exportExcel(new Export($selected), trans_choice('general.vendors', 2));
}
}

2
app/BulkActions/Sales/Customers.php
View File

@ -47,6 +47,6 @@ class Customers extends BulkAction
{
$selected = $this->getSelectedInput($request);
return \Excel::download(new Export($selected), \Str::filename(trans_choice('general.customers', 2)) . '.xlsx');
return $this->exportExcel(new Export($selected), trans_choice('general.customers', 2));
}
}

2
app/BulkActions/Sales/Invoices.php
View File

@ -108,6 +108,6 @@ class Invoices extends BulkAction
{
$selected = $this->getSelectedInput($request);
return \Excel::download(new Export($selected), \Str::filename(trans_choice('general.invoices', 2)) . '.xlsx');
return $this->exportExcel(new Export($selected), trans_choice('general.invoices', 2));
}
}

2
app/BulkActions/Sales/Revenues.php
View File

@ -32,6 +32,6 @@ class Revenues extends BulkAction
{
$selected = $this->getSelectedInput($request);
return \Excel::download(new Export($selected), \Str::filename(trans_choice('general.revenues', 2)) . '.xlsx');
return $this->exportExcel(new Export($selected), trans_choice('general.revenues', 2));
}
}

51
app/Utilities/Export.php Normal file
View File

@ -0,0 +1,51 @@
<?php
namespace App\Utilities;
use App\Jobs\Common\CreateMediableForExport;
use Illuminate\Support\Str;
use Throwable;
class Export
{
/**
* Export the excel file or catch errors
*
* @param $class
* @param $translation
* @param $extension
*
* @return mixed
*/
public static function toExcel($class, $translation, $extension = 'xlsx')
{
try {
$file_name = Str::filename($translation) . '-' . time() . '.' . $extension;
if (should_queue()) {
$disk = 'temp';
if (config('excel.temporary_files.remote_disk') !== null) {
$disk = config('excel.temporary_files.remote_disk');
$file_name = config('excel.temporary_files.remote_prefix') . $file_name;
}
$class->queue($file_name, $disk)->onQueue('exports')->chain([
new CreateMediableForExport(user(), $file_name),
]);
$message = trans('messages.success.export_queued', ['type' => $translation]);
flash($message)->success();
return back();
} else {
return $class->download($file_name);
}
} catch (Throwable $e) {
flash($e->getMessage())->error()->important();
return back();
}
}
}

71
app/Utilities/Import.php Normal file
View File

@ -0,0 +1,71 @@
<?php
namespace App\Utilities;
use App\Jobs\Auth\NotifyUser;
use App\Notifications\Common\ImportCompleted;
use Maatwebsite\Excel\Validators\ValidationException;
use Throwable;
class Import
{
/**
* Import the excel file or catch errors
*
* @param $class
* @param $request
* @param $translation
*
* @return array
*/
public static function fromExcel($class, $request, $translation)
{
try {
$file = $request->file('import');
if (should_queue()) {
$class->queue($file)->onQueue('imports')->chain([
new NotifyUser(user(), new ImportCompleted),
]);
$message = trans('messages.success.import_queued', ['type' => $translation]);
} else {
$class->import($file);
$message = trans('messages.success.imported', ['type' => $translation]);
}
$response = [
'success' => true,
'error' => false,
'data' => null,
'message' => $message,
];
} catch (Throwable $e) {
if ($e instanceof ValidationException) {
foreach ($e->failures() as $failure) {
$message = trans('messages.error.import_column', [
'message' => collect($failure->errors())->first(),
'column' => $failure->attribute(),
'line' => $failure->row(),
]);
flash($message)->error()->important();
}
$message = '';
} else {
$message = $e->getMessage();
}
$response = [
'success' => false,
'error' => true,
'data' => null,
'message' => $message,
];
}
return $response;
}
}