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

Rename user_bids table to bids

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-02-27 13:25:32 -06:00
parent c89926399b
commit 97764866f2
10 changed files with 40 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -177,16 +177,17 @@ class FlightController extends BaseController
}
$time = new Time($flight->flight_time);
$flight->hours = $time->hours;
$flight->minutes = $time->minutes;
$avail_subfleets = $this->getAvailSubfleets($flight);
return view('admin.flights.edit', [
'flight' => $flight,
'airlines' => $this->airlineRepo->selectBoxList(),
'airports' => $this->airportRepo->selectBoxList(),
'alt_airports' => $this->airportRepo->selectBoxList(true),
'avail_fares' => $this->getAvailFares($flight),
'avail_subfleets' => $avail_subfleets,
'avail_subfleets' => $this->getAvailSubfleets($flight),
'flight_types' => FlightType::select(true),
]);
}

6
app/Http/Controllers/Api/UserController.php
View File

@@ -8,7 +8,7 @@ use App\Http\Resources\Pirep as PirepResource;
use App\Http\Resources\Subfleet as SubfleetResource;
use App\Http\Resources\User as UserResource;
use App\Models\Enums\PirepState;
use App\Models\UserBid;
use App\Models\Bid;
use App\Repositories\Criteria\WhereCriteria;
use App\Repositories\FlightRepository;
use App\Repositories\PirepRepository;
@@ -111,7 +111,7 @@ class UserController extends RestController
if ($request->isMethod('DELETE')) {
if($request->filled('bid_id')) {
$bid = UserBid::findOrFail($request->input('bid_id'));
$bid = Bid::findOrFail($request->input('bid_id'));
$flight_id = $bid->flight_id;
} else {
$flight_id = $request->input('flight_id');
@@ -122,7 +122,7 @@ class UserController extends RestController
}
# Return the flights they currently have bids on
$bids = UserBid::where(['user_id' => $user->id])->get();
$bids = Bid::where(['user_id' => $user->id])->get();
return BidResource::collection($bids);
}

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

@@ -3,7 +3,7 @@
namespace App\Http\Controllers\Frontend;
use App\Http\Controllers\Controller;
use App\Models\UserBid;
use App\Models\Bid;
use App\Repositories\AirlineRepository;
use App\Repositories\AirportRepository;
use App\Repositories\Criteria\WhereCriteria;
@@ -65,7 +65,7 @@ class FlightController extends Controller
$flights = $this->flightRepo->paginate();
$saved_flights = UserBid::where('user_id', Auth::id())
$saved_flights = Bid::where('user_id', Auth::id())
->pluck('flight_id')->toArray();
return $this->view('flights.index', [
@@ -86,7 +86,7 @@ class FlightController extends Controller
{
$flights = $this->flightRepo->searchCriteria($request)->paginate();
$saved_flights = UserBid::where('user_id', Auth::id())
$saved_flights = Bid::where('user_id', Auth::id())
->pluck('flight_id')->toArray();
return $this->view('flights.index', [