Stop asset acceptances from shown to user if full company support is …

…enabled and companies not match
snipe · Aug 3, 2023 · 9ca163e · 9ca163e
1 parent 924f528
commit 9ca163e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/app/Http/Controllers/Account/AcceptanceController.php b/app/Http/Controllers/Account/AcceptanceController.php
@@ -69,7 +69,7 @@ public function create($id)
         }
 
         if (! Company::isCurrentUserHasAccess($acceptance->checkoutable)) {
-            return redirect()->route('account.accept')->with('error', trans('general.insufficient_permissions'));
+            return redirect()->route('account.accept')->with('error', trans('general.error_user_company'));
         }
 
         return view('account/accept.create', compact('acceptance'));

diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php
@@ -452,6 +452,7 @@
     'serial_number'        => 'Serial Number',
     'item_notes' => ':item Notes',
     'item_name_var' => ':item Name',
+    'error_user_company' => 'User and Asset companies missmatch',
     'importer' => [
         'checked_out_to_fullname' => 'Checked Out to: Full Name',
         'checked_out_to_first_name' => 'Checked Out to: First Name',

diff --git a/resources/views/account/accept/index.blade.php b/resources/views/account/accept/index.blade.php
@@ -41,9 +41,11 @@ class="table table-striped snipe-table"
             <tbody>
               @foreach ($acceptances as $acceptance)
               <tr>
+                @if ($acceptance->checkoutable)
                 <td>{{ ($acceptance->checkoutable) ? $acceptance->checkoutable->present()->name : '' }}</td>
                 <td><a href="{{ route('account.accept.item', $acceptance) }}" class="btn btn-default btn-sm">{{ trans('general.accept_decline') }}</a></td>
               </tr>
+              @endif
               @endforeach
             </tbody>
           </table>