@@ -15,8 +15,7 @@ |
||
| 15 | 15 | */ |
| 16 | 16 | public function adminLink(User $user) |
| 17 | 17 | { |
| 18 | - $userRole = UserRolePermissions::whereRoleId($user->role_id)->whereHas('UserRolePermissionTypes', function($q) |
|
| 19 | - { |
|
| 18 | + $userRole = UserRolePermissions::whereRoleId($user->role_id)->whereHas('UserRolePermissionTypes', function($q) { |
|
| 20 | 19 | $q->whereIsAdminLink(1); |
| 21 | 20 | })->whereAllow(1)->count(); |
| 22 | 21 | |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | $newCust = Customer::create($cust); |
| 61 | 61 | |
| 62 | 62 | event(new NewCustomerCreated($newCust)); |
| 63 | - return redirect(route('customers.show',$newCust->slug))->with(['message' => 'New Customer Created', 'type' => 'success']); |
|
| 63 | + return redirect(route('customers.show', $newCust->slug))->with(['message' => 'New Customer Created', 'type' => 'success']); |
|
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | /** |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | ->with('ParentFile.FileUpload') |
| 91 | 91 | ->firstOrFail(); |
| 92 | 92 | // Determine if the customer is bookmarked by the user |
| 93 | - $isFav = UserCustomerBookmark::where('user_id', Auth::user()->user_id) |
|
| 93 | + $isFav = UserCustomerBookmark::where('user_id', Auth::user()->user_id) |
|
| 94 | 94 | ->where('cust_id', $customer->cust_id) |
| 95 | 95 | ->count(); |
| 96 | 96 | |
@@ -100,29 +100,29 @@ discard block |
||
| 100 | 100 | 'file_types' => CustomerFileType::all(), |
| 101 | 101 | // User Permissions for customers |
| 102 | 102 | 'user_data' => [ |
| 103 | - 'fav' => $isFav, // Customer is bookmarked by the user |
|
| 104 | - 'edit' => Auth::user()->can('update', $customer), // User is allowed to edit the customers basic details |
|
| 105 | - 'manage' => Auth::user()->can('manage', $customer), // User can recover deleted items |
|
| 106 | - 'deactivate' => Auth::user()->can('delete', $customer), // User can deactivate the customer profile |
|
| 103 | + 'fav' => $isFav, // Customer is bookmarked by the user |
|
| 104 | + 'edit' => Auth::user()->can('update', $customer), // User is allowed to edit the customers basic details |
|
| 105 | + 'manage' => Auth::user()->can('manage', $customer), // User can recover deleted items |
|
| 106 | + 'deactivate' => Auth::user()->can('delete', $customer), // User can deactivate the customer profile |
|
| 107 | 107 | 'equipment' => [ |
| 108 | - 'create' => Auth::user()->can('create', CustomerEquipment::class), // If user can add equipment |
|
| 109 | - 'update' => Auth::user()->can('update', CustomerEquipment::class), // If user can edit equipment |
|
| 110 | - 'delete' => Auth::user()->can('delete', CustomerEquipment::class), // If user can delete equipment |
|
| 108 | + 'create' => Auth::user()->can('create', CustomerEquipment::class), // If user can add equipment |
|
| 109 | + 'update' => Auth::user()->can('update', CustomerEquipment::class), // If user can edit equipment |
|
| 110 | + 'delete' => Auth::user()->can('delete', CustomerEquipment::class), // If user can delete equipment |
|
| 111 | 111 | ], |
| 112 | 112 | 'contacts' => [ |
| 113 | - 'create' => Auth::user()->can('create', CustomerContact::class), // If user can add contact |
|
| 114 | - 'update' => Auth::user()->can('update', CustomerContact::class), // If user can edit contact |
|
| 115 | - 'delete' => Auth::user()->can('delete', CustomerContact::class), // If user can delete contact |
|
| 113 | + 'create' => Auth::user()->can('create', CustomerContact::class), // If user can add contact |
|
| 114 | + 'update' => Auth::user()->can('update', CustomerContact::class), // If user can edit contact |
|
| 115 | + 'delete' => Auth::user()->can('delete', CustomerContact::class), // If user can delete contact |
|
| 116 | 116 | ], |
| 117 | 117 | 'notes' => [ |
| 118 | - 'create' => Auth::user()->can('create', CustomerNote::class), // If user can add note |
|
| 119 | - 'update' => Auth::user()->can('update', CustomerNote::class), // If user can edit note |
|
| 120 | - 'delete' => Auth::user()->can('delete', CustomerNote::class), // If user can delete note |
|
| 118 | + 'create' => Auth::user()->can('create', CustomerNote::class), // If user can add note |
|
| 119 | + 'update' => Auth::user()->can('update', CustomerNote::class), // If user can edit note |
|
| 120 | + 'delete' => Auth::user()->can('delete', CustomerNote::class), // If user can delete note |
|
| 121 | 121 | ], |
| 122 | 122 | 'files' => [ |
| 123 | - 'create' => Auth::user()->can('create', CustomerFile::class), // If user can add file |
|
| 124 | - 'update' => Auth::user()->can('update', CustomerFile::class), // If user can edit file |
|
| 125 | - 'delete' => Auth::user()->can('delete', CustomerFile::class), // If user can delete file |
|
| 123 | + 'create' => Auth::user()->can('create', CustomerFile::class), // If user can add file |
|
| 124 | + 'update' => Auth::user()->can('update', CustomerFile::class), // If user can edit file |
|
| 125 | + 'delete' => Auth::user()->can('delete', CustomerFile::class), // If user can delete file |
|
| 126 | 126 | ], |
| 127 | 127 | ], |
| 128 | 128 | ]); |
@@ -65,7 +65,7 @@ |
||
| 65 | 65 | $fileType = CustomerFileType::find($id); |
| 66 | 66 | $this->authorize('delete', $fileType); |
| 67 | 67 | |
| 68 | - try{ |
|
| 68 | + try { |
|
| 69 | 69 | $fileType->delete(); |
| 70 | 70 | } |
| 71 | 71 | // The deletion may fail if the file type is currently in use |
@@ -65,7 +65,8 @@ |
||
| 65 | 65 | $fileType = CustomerFileType::find($id); |
| 66 | 66 | $this->authorize('delete', $fileType); |
| 67 | 67 | |
| 68 | - try{ |
|
| 68 | + try |
|
| 69 | + { |
|
| 69 | 70 | $fileType->delete(); |
| 70 | 71 | } |
| 71 | 72 | // The deletion may fail if the file type is currently in use |