fixing applied agents

counterstrikesharp-panel · Nov 29, 2024 · f9c92b3 · f9c92b3
1 parent 92e416b
commit f9c92b3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/app/Http/Controllers/WeaponSkinController.php b/app/Http/Controllers/WeaponSkinController.php
@@ -264,17 +264,15 @@ public function agents()
 
         foreach ($agents as &$agent) {
             if ($appliedAgents) {
-                $agent['is_applied_t'] = $agent['team'] == 2 && $agent['model'] == $appliedAgents->agent_t;
-                $agent['is_applied_ct'] = $agent['team'] == 3 && $agent['model'] == $appliedAgents->agent_ct;
+                $agent['is_applied'] = ($agent['team'] == 2 && $agent['model'] == $appliedAgents->agent_t) || ($agent['team'] == 3 && $agent['model'] == $appliedAgents->agent_ct);
             } else {
-                $agent['is_applied_t'] = false;
-                $agent['is_applied_ct'] = false;
+                $agent['is_applied'] = false;
             }
         }
 
-        // Sort applied agents to be first (T or CT applied)
-        usort($agents, function ($a, $b) {
-            return ($b['is_applied_t'] || $b['is_applied_ct']) - ($a['is_applied_t'] || $a['is_applied_ct']);
+        // Sort applied agents to be first
+        usort($agents, function($a, $b) {
+            return $b['is_applied'] - $a['is_applied'];
         });
 
         return view('weapons.agents', ['agents' => $agents]);

diff --git a/resources/views/weapons/agents.blade.php b/resources/views/weapons/agents.blade.php
@@ -24,14 +24,15 @@
                                                 <span class="badge badge-warning">T</span>
                                             @endif
 
-                                            <span id="agent_{{$agent['model']}}" class="badge badge-{{ $agent['team'] == 3 ? 'primary' : 'danger' }}">{{ (isset($agent['is_applied_t']) && isset($agent['is_applied_ct']) && $agent['is_applied_t'] && $agent['is_applied_ct']) 
-                                                ? __('skins.active_both') 
-                                                : (isset($agent['is_applied_t']) && $agent['is_applied_t'] 
-                                                    ? __('skins.active_t') 
-                                                    : (isset($agent['is_applied_ct']) && $agent['is_applied_ct'] 
-                                                        ? __('skins.active_ct') 
-                                                        : '')) 
-                                            }}</span>
+                                            @if($agent['is_applied'])
+                                            <span id="agent_{{$agent['model']}}" class="badge badge-{{ $agent['team'] == 3 ? 'primary' : 'danger' }}">
+                                                    @if($agent['team'] == 2)
+                                                        {{ __('skins.active_t') }}
+                                                    @elseif($agent['team'] == 3)
+                                                        {{ __('skins.active_ct') }}
+                                                    @endif
+                                            </span>
+                                            @endif
                                             <div class="loader-skins"></div> <!-- Add loader -->
                                             <img src="{{ $agent['image'] }}" class="card-img-top" alt="{{ $agent['agent_name'] }}" crossorigin="anonymous">
                                         </a>