diff --git a/app/Models/BaseModel.php b/app/Models/BaseModel.php index be12477baba8..7e88a5898c3c 100644 --- a/app/Models/BaseModel.php +++ b/app/Models/BaseModel.php @@ -31,13 +31,15 @@ use Illuminate\Support\Str; * @property string $number * @property int $company_id * @property \App\Models\Company $company - * @method static \Illuminate\Database\Eloquent\Builder|BaseModel company() + * @method static \Illuminate\Database\Eloquent\Builder|BaseModel|Illuminate\Database\Eloquent\Relations\BelongsTo|\Awobaz\Compoships\Database\Eloquent\Relations\BelongsTo|\App\Models\Company company() * @method static \Illuminate\Database\Eloquent\Builder|BaseModel exclude($columns) * @method static \Illuminate\Database\Eloquent\Builder|BaseModel newModelQuery() * @method static \Illuminate\Database\Eloquent\Builder|BaseModel newQuery() * @method static \Illuminate\Database\Eloquent\Builder|BaseModel query() * @method static \Illuminate\Database\Eloquent\Builder|BaseModel exclude(array $excludeable) * @method static \Illuminate\Database\Eloquent\Builder|BaseModel withTrashed() + * @method \App\Models\Company company() + * @method int companyId() * @mixin \Eloquent */ class BaseModel extends Model diff --git a/app/Models/CompanyToken.php b/app/Models/CompanyToken.php index 41da2b4bb0e8..d4b879a9eb23 100644 --- a/app/Models/CompanyToken.php +++ b/app/Models/CompanyToken.php @@ -29,7 +29,6 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @property bool $is_system * @property-read \App\Models\Account $account * @property-read \App\Models\Company $company - * @property-read \Illuminate\Database\Eloquent\Collection $company * @property-read \App\Models\CompanyUser|null $company_user * @property-read \App\Models\CompanyUser|null $cu * @property-read mixed $hashed_id diff --git a/app/Models/RecurringInvoice.php b/app/Models/RecurringInvoice.php index 8c45cc3e9475..eab645792ac8 100644 --- a/app/Models/RecurringInvoice.php +++ b/app/Models/RecurringInvoice.php @@ -96,8 +96,6 @@ use Laracasts\Presenter\PresentableTrait; * @property-read mixed $hashed_id * @property-read mixed $status * @property-read \Illuminate\Database\Eloquent\Collection $history - * @property-read \Illuminate\Database\Eloquent\Collection $client - * @property-read \Illuminate\Database\Eloquent\Collection $company * @property-read int|null $history_count * @property-read \Illuminate\Database\Eloquent\Collection $invitations * @property-read int|null $invitations_count diff --git a/app/Models/User.php b/app/Models/User.php index 4195e715f656..62bc06e240c4 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -312,7 +312,7 @@ class User extends Authenticatable implements MustVerifyEmail } elseif ($truth->getCompany()) { return $truth->getCompany(); } elseif (request()->header('X-API-TOKEN')) { - $company_token = CompanyToken::with(['company'])->where('token', request()->header('X-API-TOKEN'))->first(); + $company_token = CompanyToken::with('company')->where('token', request()->header('X-API-TOKEN'))->first(); return $company_token->company; }