Fixes for staticmodel scopes

app/Http/Requests/Activity/ShowActivityRequest.php

@@ -23,7 +23,7 @@ class ShowActivityRequest extends Request
      */
     public function authorize() : bool
     {
-        return auth()->user()->isAdmin();
+        // return auth()->user()->isAdmin();
-        // return auth()->user()->can('view', Activity::class);
+        return auth()->user()->can('view', Activity::class);
     }
 }

app/Models/Activity.php

@@ -375,18 +375,4 @@ class Activity extends StaticModel
         return $this->belongsTo(Company::class);
     }
 
-//     /**
-//      * @return mixed
-//      */
-//     public function resolveRouteBinding($value, $field = null)
-//     {
-//         if (is_numeric($value)) {
-//             throw new ModelNotFoundException("Record with value {$value} not found");
-//         }
-
-//         return $this
-//             //->withTrashed()
-//             ->where('id', $this->decodePrimaryKey($value))->firstOrFail();
-//     }
-
 }

app/Models/ClientGatewayToken.php

@@ -69,17 +69,5 @@ class ClientGatewayToken extends BaseModel
     {
         return $this->belongsTo(User::class)->withTrashed();
     }
-
+    
-    // /**
-    //  * Retrieve the model for a bound value.
-    //  *
-    //  * @param mixed $value
-    //  * @param null $field
-    //  * @return Model|null
-    //  */
-    // public function resolveRouteBinding($value, $field = null)
-    // {
-    //     return $this
-    //         ->where('id', $this->decodePrimaryKey($value))->firstOrFail();
-    // }
 }

app/Models/CompanyGateway.php

@@ -412,12 +412,4 @@ class CompanyGateway extends BaseModel
         return route('payment_webhook', ['company_key' => $this->company->company_key, 'company_gateway_id' => $this->hashed_id]);
     }
 
-    // public function resolveRouteBinding($value, $field = null)
-    // {
-
-    //     return $this
-    //         ->where('id', $this->decodePrimaryKey($value))->withTrashed()->firstOrFail();
-    // }
-
-
 }

app/Models/Currency.php

@@ -23,7 +23,6 @@ class Currency extends StaticModel
         'updated_at' => 'timestamp',
         'created_at' => 'timestamp',
         'deleted_at' => 'timestamp',
-        //'precision' => 'string',
         'precision' => 'integer',
     ];
 }

app/Models/GroupSetting.php

@@ -14,14 +14,13 @@ namespace App\Models;
 use App\Utils\Traits\MakesHash;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Database\Eloquent\ModelNotFoundException as ModelNotFoundException;
 
 class GroupSetting extends StaticModel
 {
     use MakesHash;
     use SoftDeletes;
 
-    //public $timestamps = false;
-
     protected $casts = [
         'settings' => 'object',
         'updated_at' => 'timestamp',
@@ -65,4 +64,25 @@ class GroupSetting extends StaticModel
         return $this->morphMany(Document::class, 'documentable');
     }
 
+    /**
+     * Retrieve the model for a bound value.
+     *
+     * @param mixed $value
+     * @param null $field
+     * @return Model|null
+     */
+    public function resolveRouteBinding($value, $field = null)
+    {
+            
+        if (is_numeric($value)) {
+            throw new ModelNotFoundException("Record with value {$value} not found");
+        }
+
+        return $this
+            ->withTrashed()
+            ->company()
+            ->where('id', $this->decodePrimaryKey($value))->firstOrFail();
+
+    }
 }
+

app/Models/Payment.php

@@ -292,14 +292,6 @@ class Payment extends BaseModel
         return new PaymentService($this);
     }
 
-
-    // public function resolveRouteBinding($value, $field = null)
-    // {
-    //     return $this
-    //         ->withTrashed()
-    //         ->where('id', $this->decodePrimaryKey($value))->firstOrFail();
-    // }
-
     public function refund(array $data) :self
     {
         return $this->service()->refundPayment($data);

app/Models/StaticModel.php

@@ -57,8 +57,7 @@ class StaticModel extends Model
         }
 
         return $this
-            ->withTrashed()
-            ->company()
             ->where('id', $this->decodePrimaryKey($value))->firstOrFail();
+
     }
 }