@@ -230,7 +230,7 @@ |
||
| 230 | 230 | DB::beginTransaction(); |
| 231 | 231 | |
| 232 | 232 | $userTokens = UserToken::where('user_id', $user->id) |
| 233 | - ->where('type', UserToken::TYPE_REMEMBER_ME); |
|
| 233 | + ->where('type', UserToken::TYPE_REMEMBER_ME); |
|
| 234 | 234 | |
| 235 | 235 | if ($request->has('rememberToken')) { |
| 236 | 236 | $userTokens = $userTokens->where('token', $request->get('rememberToken')); |
@@ -72,8 +72,8 @@ |
||
| 72 | 72 | private function checkExpiringTasks() |
| 73 | 73 | { |
| 74 | 74 | $expiringUserTasks = UserTask::where('status', UserTask::STATUS_ASSIGNED) |
| 75 | - ->where('deadline', Carbon::now()->format('Y-m-d')) |
|
| 76 | - ->get(); |
|
| 75 | + ->where('deadline', Carbon::now()->format('Y-m-d')) |
|
| 76 | + ->get(); |
|
| 77 | 77 | |
| 78 | 78 | $this->info('[' . Carbon::now()->format('Y-m-d H:i:s') . ']: Found ' . $expiringUserTasks->count() . ' expiring tasks.'); |
| 79 | 79 | |
@@ -58,7 +58,7 @@ |
||
| 58 | 58 | private function removeExpiredTokens() |
| 59 | 59 | { |
| 60 | 60 | $userTokens = UserToken::where('expire_on', '<=', Carbon::now()->format('Y-m-d H:i:s')) |
| 61 | - ->get(); |
|
| 61 | + ->get(); |
|
| 62 | 62 | |
| 63 | 63 | $this->info('[' . Carbon::now()->format('Y-m-d H:i:s') . ']: Found ' . $userTokens->count() . ' tokens to be removed.'); |
| 64 | 64 | |
@@ -32,11 +32,11 @@ |
||
| 32 | 32 | protected function schedule(Schedule $schedule) |
| 33 | 33 | { |
| 34 | 34 | $schedule->command('delete:expiredTokens') |
| 35 | - ->daily()->at('4:00') |
|
| 36 | - ->appendOutputTo(storage_path('logs/cron_delete_expired_tokens.log')); |
|
| 35 | + ->daily()->at('4:00') |
|
| 36 | + ->appendOutputTo(storage_path('logs/cron_delete_expired_tokens.log')); |
|
| 37 | 37 | |
| 38 | 38 | $schedule->command('send:taskNotifications') |
| 39 | - ->daily()->at('8:00') |
|
| 40 | - ->appendOutputTo(storage_path('logs/cron_send_task_notifications.log')); |
|
| 39 | + ->daily()->at('8:00') |
|
| 40 | + ->appendOutputTo(storage_path('logs/cron_send_task_notifications.log')); |
|
| 41 | 41 | } |
| 42 | 42 | } |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | return User::with([ |
| 110 | 110 | 'role' => function ($query) { |
| 111 | 111 | $query->select(['id', 'name']) |
| 112 | - ->with(['permissions']); |
|
| 112 | + ->with(['permissions']); |
|
| 113 | 113 | } |
| 114 | 114 | ]); |
| 115 | 115 | } |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | /** @var User|null $user */ |
| 175 | 175 | $user = $builder->whereHas('userTokens', function ($query) use ($token) { |
| 176 | 176 | $query->where('token', $token) |
| 177 | - ->where('expire_on', '>=', Carbon::now()->format('Y-m-d H:i:s')); |
|
| 177 | + ->where('expire_on', '>=', Carbon::now()->format('Y-m-d H:i:s')); |
|
| 178 | 178 | })->first(); |
| 179 | 179 | |
| 180 | 180 | return $user; |
@@ -189,8 +189,8 @@ discard block |
||
| 189 | 189 | public function updateRememberTokenValability($token, $days = 14) |
| 190 | 190 | { |
| 191 | 191 | $userToken = UserToken::where('token', $token) |
| 192 | - ->where('type', UserToken::TYPE_REMEMBER_ME) |
|
| 193 | - ->first(); |
|
| 192 | + ->where('type', UserToken::TYPE_REMEMBER_ME) |
|
| 193 | + ->first(); |
|
| 194 | 194 | |
| 195 | 195 | if ($userToken) { |
| 196 | 196 | $userToken->expire_on = Carbon::now()->addDays($days)->format('Y-m-d H:i:s'); |
@@ -258,7 +258,7 @@ discard block |
||
| 258 | 258 | |
| 259 | 259 | $user = $builder->where(function ($query) use ($socialUser, $socialId) { |
| 260 | 260 | $query->where($socialId, $socialUser->getId()) |
| 261 | - ->orWhereEncrypted('email', $socialUser->getEmail()); |
|
| 261 | + ->orWhereEncrypted('email', $socialUser->getEmail()); |
|
| 262 | 262 | })->first(); |
| 263 | 263 | |
| 264 | 264 | if (!$user) { |
@@ -209,12 +209,12 @@ |
||
| 209 | 209 | env('CACHE_PERIOD'), |
| 210 | 210 | function () use ($userId, $permissionId) { |
| 211 | 211 | return RolePermission::where('permission_id', $permissionId) |
| 212 | - ->whereHas('role', function ($query) use ($userId) { |
|
| 213 | - $query->whereHas('users', |
|
| 214 | - function ($query) use ($userId) { |
|
| 215 | - $query->where('id', $userId); |
|
| 216 | - }); |
|
| 217 | - })->first(); |
|
| 212 | + ->whereHas('role', function ($query) use ($userId) { |
|
| 213 | + $query->whereHas('users', |
|
| 214 | + function ($query) use ($userId) { |
|
| 215 | + $query->where('id', $userId); |
|
| 216 | + }); |
|
| 217 | + })->first(); |
|
| 218 | 218 | } |
| 219 | 219 | ); |
| 220 | 220 | } |
@@ -26,10 +26,10 @@ |
||
| 26 | 26 | public function __construct($to, string $subject, string $blade, array $data) |
| 27 | 27 | { |
| 28 | 28 | $this->to($to) |
| 29 | - ->from(env('MAIL_FROM_ADDRESS'), env('MAIL_FROM_NAME')) |
|
| 30 | - ->subject($subject) |
|
| 31 | - ->view($blade) |
|
| 32 | - ->with($data); |
|
| 29 | + ->from(env('MAIL_FROM_ADDRESS'), env('MAIL_FROM_NAME')) |
|
| 30 | + ->subject($subject) |
|
| 31 | + ->view($blade) |
|
| 32 | + ->with($data); |
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | /** |