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

Rename import/export, fix tests with parser

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-03-21 19:12:36 -05:00
parent 276b93fc57
commit 9657e8bd40
9 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Admin/AircraftController.php
View File

@@ -10,7 +10,7 @@ use App\Models\Enums\AircraftStatus;
use App\Models\Expense;
use App\Models\Subfleet;
use App\Repositories\AircraftRepository;
use App\Services\ImporterService;
use App\Services\ImportService;
use Flash;
use Illuminate\Http\Request;
use Log;
@@ -29,11 +29,11 @@ class AircraftController extends Controller
/**
* AircraftController constructor.
* @param AircraftRepository $aircraftRepo
* @param ImporterService $importSvc
* @param ImportService $importSvc
*/
public function __construct(
AircraftRepository $aircraftRepo,
ImporterService $importSvc
ImportService $importSvc
) {
$this->aircraftRepo = $aircraftRepo;
$this->importSvc = $importSvc;

6
app/Http/Controllers/Admin/AirportController.php
View File

@@ -9,7 +9,7 @@ use App\Models\Airport;
use App\Models\Expense;
use App\Repositories\AirportRepository;
use App\Repositories\Criteria\WhereCriteria;
use App\Services\ImporterService;
use App\Services\ImportService;
use Flash;
use Illuminate\Http\Request;
use Jackiedo\Timezonelist\Facades\Timezonelist;
@@ -28,11 +28,11 @@ class AirportController extends Controller
/**
* @param AirportRepository $airportRepo
* @param ImporterService $importSvc
* @param ImportService $importSvc
*/
public function __construct(
AirportRepository $airportRepo,
ImporterService $importSvc
ImportService $importSvc
) {
$this->airportRepo = $airportRepo;
$this->importSvc = $importSvc;

10
app/Http/Controllers/Admin/FlightController.php
View File

@@ -15,10 +15,10 @@ use App\Repositories\FareRepository;
use App\Repositories\FlightFieldRepository;
use App\Repositories\FlightRepository;
use App\Repositories\SubfleetRepository;
use App\Services\ExporterService;
use App\Services\ExportService;
use App\Services\FareService;
use App\Services\FlightService;
use App\Services\ImporterService;
use App\Services\ImportService;
use App\Support\Units\Time;
use Flash;
use Illuminate\Http\Request;
@@ -51,7 +51,7 @@ class FlightController extends Controller
* @param FlightFieldRepository $flightFieldRepo
* @param FareService $fareSvc
* @param FlightService $flightSvc
* @param ImporterService $importSvc
* @param ImportService $importSvc
* @param SubfleetRepository $subfleetRepo
*/
public function __construct(
@@ -62,7 +62,7 @@ class FlightController extends Controller
FlightFieldRepository $flightFieldRepo,
FareService $fareSvc,
FlightService $flightSvc,
ImporterService $importSvc,
ImportService $importSvc,
SubfleetRepository $subfleetRepo
) {
$this->airlineRepo = $airlineRepo;
@@ -319,7 +319,7 @@ class FlightController extends Controller
*/
public function export(Request $request)
{
$exporter = app(ExporterService::class);
$exporter = app(ExportService::class);
$path = storage_path('app/import/export_flight.csv');
$flights = $this->flightRepo->all();

6
app/Http/Controllers/Admin/SubfleetController.php
View File

@@ -15,7 +15,7 @@ use App\Repositories\RankRepository;
use App\Repositories\SubfleetRepository;
use App\Services\FareService;
use App\Services\FleetService;
use App\Services\ImporterService;
use App\Services\ImportService;
use Flash;
use Illuminate\Http\Request;
use Log;
@@ -43,7 +43,7 @@ class SubfleetController extends Controller
* @param FleetService $fleetSvc
* @param FareRepository $fareRepo
* @param FareService $fareSvc
* @param ImporterService $importSvc
* @param ImportService $importSvc
* @param RankRepository $rankRepo
* @param SubfleetRepository $subfleetRepo
*/
@@ -52,7 +52,7 @@ class SubfleetController extends Controller
FleetService $fleetSvc,
FareRepository $fareRepo,
FareService $fareSvc,
ImporterService $importSvc,
ImportService $importSvc,
RankRepository $rankRepo,
SubfleetRepository $subfleetRepo
) {