diff --git a/app/Models/User.php b/app/Models/User.php index ea91ad72..4db60fa2 100755 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -25,7 +25,7 @@ use Laratrust\Traits\LaratrustUserTrait; * @property \Carbon\Carbon updated_at * @property Rank rank * @property Journal journal - * @property string pilot_id + * @property int rank_id * @property int state * @property bool opt_in * @mixin \Illuminate\Notifications\Notifiable @@ -137,7 +137,7 @@ class User extends Authenticatable } return new File([ - 'path' => $this->attributes['avatar'] + 'path' => $this->attributes['avatar'] ]); } diff --git a/app/Providers/CronServiceProvider.php b/app/Providers/CronServiceProvider.php index f686afa5..2de85f4d 100644 --- a/app/Providers/CronServiceProvider.php +++ b/app/Providers/CronServiceProvider.php @@ -12,10 +12,13 @@ use App\Cron\Nightly\PilotLeave; use App\Cron\Nightly\RecalculateBalances; use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider; +/** + * All of the hooks for the cron jobs + * @package App\Providers + */ class CronServiceProvider extends ServiceProvider { protected $listen = [ - # Cron hooks CronNightly::class => [ ApplyExpenses::class, RecalculateBalances::class, @@ -31,6 +34,4 @@ class CronServiceProvider extends ServiceProvider \App\Cron\Monthly\ApplyExpenses::class ], ]; - - protected $subscribe = []; } diff --git a/app/Services/UserService.php b/app/Services/UserService.php index 6a952572..9c10214c 100644 --- a/app/Services/UserService.php +++ b/app/Services/UserService.php @@ -199,9 +199,9 @@ class UserService extends Service foreach ($ranks as $rank) { if ($rank->hours > $pilot_hours->hours) { break; - } else { - $user->rank_id = $rank->id; } + + $user->rank_id = $rank->id; } // Only trigger the event/update if there's been a change