Merge remote-tracking branch 'origin/master'

app/Classes/Modules/Accounts/Services/ExpiresPasswordReset.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Classes\Modules\Accounts\Services;
+
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Models\PasswordReset;
+
+class ExpiresPasswordReset extends AbstractUpdateRecord
+{
+
+
+    /**
+     * @param PasswordReset $model
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws MalformedRequestException
+     */
+    public function execute(PasswordReset $model){
+
+        $model->is_expired = true;
+        return $this->handler($model);
+
+
+    }
+
+
+}

app/Classes/Modules/Accounts/Services/GeneratesAuthenticationToken.php

@@ -55,6 +55,7 @@ class GeneratesAuthenticationToken {
 
         /** @var Company $companyModule */
         $companyModule = $user->companyModule()->first();
+        $order = $companyModule->orders->count();
 
         $claims = [
             'id' => $user->id,
@@ -66,7 +67,9 @@ class GeneratesAuthenticationToken {
 
         if($user->type === RoleTypes::USER) {
             $claims = array_merge($claims, [
-                'company_id' => $companyModule->company_id
+                'company_id' => $companyModule->company_id,
+                'company_module_id' => $companyModule->id,
+                'order' => $order
             ]);
         }
 

app/Models/CompanyModule.php

@@ -6,6 +6,8 @@ use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 use Illuminate\Database\Eloquent\Relations\MorphMany;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
@@ -56,6 +58,15 @@ class CompanyModule extends AbstractModel
         return $this->belongsToMany(User::class, (new CompanyEmployee())->getTable(), 'company_module_id', 'user_id');
     }
 
+    /**
+     * @return HasMany
+     */
+    public function orders(): HasMany
+    {
+        return $this->HasMany(Order::class, 'company_module_id');
+    }
+
+
     // /**
     //  * @return HasMany
     //  */