Remove subfleet_expenses and combine into main expenses table; select expense type on subfleet #130 #136

This commit is contained in:
Nabeel Shahzad
2018-03-05 21:24:49 -06:00
parent 8c05ad134e
commit 88a8fd2bbd
20 changed files with 160 additions and 138 deletions

View File

@@ -3,6 +3,7 @@
namespace App\Models;
use App\Models\Enums\AircraftStatus;
use App\Models\Traits\Expensable;
/**
* Class Subfleet
@@ -10,6 +11,8 @@ use App\Models\Enums\AircraftStatus;
*/
class Subfleet extends BaseModel
{
use Expensable;
public $table = 'subfleets';
public $fillable = [
@@ -88,14 +91,6 @@ class Subfleet extends BaseModel
return $this->belongsTo(Airline::class, 'airline_id');
}
/**
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
public function expenses()
{
return $this->hasMany(SubfleetExpense::class, 'subfleet_id');
}
public function fares()
{
return $this->belongsToMany(Fare::class, 'subfleet_fare')