FGFS-4.1/phpvms
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add checkbox to clear previous data when importing #490 (#546)

Browse Source 
* Add checkbox to clear previous data when importing #490
This commit is contained in:
Nabeel S
2020-02-11 10:51:18 -05:00
committed by GitHub
parent 99118daad9
commit be6c164f03
9 changed files with 122 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/Http/Controllers/Admin/ExpenseController.php
View File

@@ -3,21 +3,22 @@
namespace App\Http\Controllers\Admin;
use App\Contracts\Controller;
use App\Http\Requests\ImportRequest;
use App\Http\Controllers\Admin\Traits\Importable;
use App\Models\Enums\ExpenseType;
use App\Models\Enums\ImportExportType;
use App\Models\Expense;
use App\Repositories\AirlineRepository;
use App\Repositories\ExpenseRepository;
use App\Services\ExportService;
use App\Services\ImportService;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Storage;
use Laracasts\Flash\Flash;
use Prettus\Repository\Criteria\RequestCriteria;
class ExpenseController extends Controller
{
use Importable;
private $airlineRepo;
private $expenseRepo;
private $importSvc;
@@ -223,16 +224,7 @@ class ExpenseController extends Controller
];
if ($request->isMethod('post')) {
ImportRequest::validate($request);
$path = Storage::putFileAs(
'import',
$request->file('csv_file'),
'import_expenses.csv'
);
$path = storage_path('app/'.$path);
Log::info('Uploaded expenses import file to '.$path);
$logs = $this->importSvc->importExpenses($path);
$logs = $this->importFile($request, ImportExportType::EXPENSES);
}
return view('admin.expenses.import', [