Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-08 17:14:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Delete files when canceling import

Browse Source
This commit is contained in:
Hillel Coren 2017-06-05 12:13:24 +03:00
parent bbdaeb05d2
commit ebfb76bfac
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/Http/Controllers/ImportController.php
View File

@ -134,4 +134,19 @@ class ImportController extends BaseController
return Redirect::to('/settings/' . ACCOUNT_IMPORT_EXPORT); return Redirect::to('/settings/' . ACCOUNT_IMPORT_EXPORT);
} }
} }
public function cancelImport()
{
try {
$path = env('FILE_IMPORT_PATH') ?: storage_path() . '/import';
foreach ([ENTITY_CLIENT, ENTITY_INVOICE, ENTITY_PAYMENT, ENTITY_QUOTE, ENTITY_PRODUCT] as $entityType) {
$fileName = sprintf('%s/%s_%s_%s.csv', $path, Auth::user()->account_id, request()->timestamp, $entityType);
\File::delete($fileName);
}
} catch (Exception $exception) {
Utils::logError($exception);
}
return Redirect::to('/settings/' . ACCOUNT_IMPORT_EXPORT);
}
} }

1
app/Http/routes.php
View File

@ -281,6 +281,7 @@ Route::group([
Route::post('/export', 'ExportController@doExport'); Route::post('/export', 'ExportController@doExport');
Route::post('/import', 'ImportController@doImport'); Route::post('/import', 'ImportController@doImport');
Route::get('/cancel_import', 'ImportController@cancelImport');
Route::post('/import_csv', 'ImportController@doImportCSV'); Route::post('/import_csv', 'ImportController@doImportCSV');
Route::get('gateways/create/{show_wepay?}', 'AccountGatewayController@create'); Route::get('gateways/create/{show_wepay?}', 'AccountGatewayController@create');

2
resources/views/accounts/import_map.blade.php
View File

@ -19,7 +19,7 @@
@endforeach @endforeach
{!! Former::actions( {!! Former::actions(
Button::normal(trans('texts.cancel'))->large()->asLinkTo(URL::to('/settings/import_export'))->appendIcon(Icon::create('remove-circle')), Button::normal(trans('texts.cancel'))->large()->asLinkTo(URL::to('/cancel_import?timestamp=' . $timestamp))->appendIcon(Icon::create('remove-circle')),
Button::success(trans('texts.import'))->submit()->large()->appendIcon(Icon::create('floppy-disk'))) !!} Button::success(trans('texts.import'))->submit()->large()->appendIcon(Icon::create('floppy-disk'))) !!}
{!! Former::close() !!} {!! Former::close() !!}