diff --git a/app/Http/Controllers/ImportController.php b/app/Http/Controllers/ImportController.php index 30af4a6e02b4..b9e28d35ec50 100644 --- a/app/Http/Controllers/ImportController.php +++ b/app/Http/Controllers/ImportController.php @@ -134,4 +134,19 @@ class ImportController extends BaseController 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); + } } diff --git a/app/Http/routes.php b/app/Http/routes.php index d1dc9df9b7f5..c0aa67eaa7b0 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -281,6 +281,7 @@ Route::group([ Route::post('/export', 'ExportController@doExport'); Route::post('/import', 'ImportController@doImport'); + Route::get('/cancel_import', 'ImportController@cancelImport'); Route::post('/import_csv', 'ImportController@doImportCSV'); Route::get('gateways/create/{show_wepay?}', 'AccountGatewayController@create'); diff --git a/resources/views/accounts/import_map.blade.php b/resources/views/accounts/import_map.blade.php index 3bf6d2d65895..27124707ffcc 100644 --- a/resources/views/accounts/import_map.blade.php +++ b/resources/views/accounts/import_map.blade.php @@ -19,7 +19,7 @@ @endforeach {!! 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'))) !!} {!! Former::close() !!}