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

Rename UserFlight to UserBid to match functionality

Browse Source
This commit is contained in:
Nabeel Shahzad
2017-12-12 11:49:35 -06:00
parent cc873f1a29
commit de582f617c
19 changed files with 67 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/Api/FlightController.php
View File

@@ -5,7 +5,6 @@ namespace App\Http\Controllers\Api;
use Illuminate\Http\Request;
use App\Http\Controllers\AppBaseController;
use App\Models\Transformers\FlightTransformer;
use App\Repositories\FlightRepository;
use App\Http\Resources\Flight as FlightResource;
use Prettus\Repository\Exceptions\RepositoryException;
@@ -33,7 +32,7 @@ class FlightController extends AppBaseController
} catch (RepositoryException $e) {
return response($e, 503);
}
return FlightResource::collection($flights);
//return fractal($flights, new FlightTransformer())->respond();
}
}

15
app/Http/Controllers/Api/PirepController.php
View File

@@ -2,16 +2,23 @@
namespace App\Http\Controllers\Api;
use App\Models\Pirep;
use App\Models\Transformers\PirepTransformer;
use App\Http\Resources\Pirep as PirepResource;
use App\Http\Controllers\AppBaseController;
use App\Repositories\PirepRepository;
class PirepController extends AppBaseController
{
protected $pirepRepo;
public function __construct(PirepRepository $pirepRepo)
{
$this->pirepRepo = $pirepRepo;
}
public function get($id)
{
$pirep = Pirep::find($id);
return fractal($pirep, new PirepTransformer())->respond();
PirepResource::withoutWrapping();
return new PirepResource($this->pirepRepo->find($id));
}
}

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

@@ -10,7 +10,7 @@ use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use App\Http\Controllers\AppBaseController;
use App\Models\UserFlight;
use App\Models\UserBid;
use App\Repositories\FlightRepository;
use App\Repositories\Criteria\WhereCriteria;
@@ -48,7 +48,7 @@ class FlightController extends AppBaseController
$flights = $this->flightRepo->paginate();
$saved_flights = UserFlight::where('user_id', Auth::id())
$saved_flights = UserBid::where('user_id', Auth::id())
->pluck('flight_id')->toArray();
return $this->view('flights.index', [
@@ -69,7 +69,7 @@ class FlightController extends AppBaseController
{
$flights = $this->flightRepo->searchCriteria($request)->paginate();
$saved_flights = UserFlight::where('user_id', Auth::id())
$saved_flights = UserBid::where('user_id', Auth::id())
->pluck('flight_id')->toArray();
return $this->view('flights.index', [
@@ -89,7 +89,7 @@ class FlightController extends AppBaseController
$cols = ['user_id' => $user_id, 'flight_id' => $flight_id];
if($action === 'save') {
$uf = UserFlight::create($cols);
$uf = UserBid::create($cols);
$uf->save();
return response()->json([
@@ -100,7 +100,7 @@ class FlightController extends AppBaseController
elseif ($action === 'remove') {
try {
$uf = UserFlight::where($cols)->first();
$uf = UserBid::where($cols)->first();
$uf->delete();
} catch (Exception $e) { }