formatting

app/Http/Controllers/Auth/Login.php

@@ -84,7 +84,7 @@ class Login extends Controller
         }
 
         // Check if is customer
-        if ($user->contact) {
+        if ($user->can('read-client-portal')) {
             $path = session('url.intended', 'portal');
 
             // Path must start with 'portal' prefix

app/Http/Controllers/Auth/Users.php

@@ -81,7 +81,7 @@ class Users extends Controller
      */
     public function edit(User $user)
     {
-        if ($user->contact) {
+        if ($user->can('read-client-portal')) {
             // Show only roles with customer permission
             $roles = Role::all()->reject(function ($r) {
                 return !$r->hasPermission('read-client-portal');

app/Http/Controllers/Expenses/Bills.php

@@ -65,7 +65,7 @@ class Bills extends Controller
 
         $currencies = Currency::enabled()->orderBy('name')->pluck('name', 'code')->toArray();
 
-        $currency = Currency::where('code', $bil->currency_code)->first();
+        $currency = Currency::where('code', $bill->currency_code)->first();
 
         $account_currency_code = Account::where('id', setting('default.account'))->pluck('currency_code')->first();
 

app/Http/ViewComposers/Header.php

@@ -27,8 +27,8 @@ class Header
         $company = null;
 
         // Get customer company
-        if ($user->contact) {
-            $company = (object)[
+        if ($user->can('read-client-portal')) {
+            $company = (object) [
                 'company_name' => setting('company.name'),
                 'company_email' => setting('company.email'),
                 'company_address' => setting('company.address'),

app/Listeners/Income/CreateInvoiceTransaction.php

@@ -26,21 +26,19 @@ class CreateInvoiceTransaction
         } catch (\Exception $e) {
             $message = $e->getMessage();
 
-            $user = user();
-
-            if ($user) {
-                if ($user->contact) {
-                    flash($message)->error();
-
-                    redirect()->route('portal.invoices.show', $invoice->id)->send();
-                }
-
-                throw new \Exception($message);
+            if (!$user = user()) {
+                flash($message)->error();
+    
+                redirect()->route('signed.invoices.show', $invoice->id)->send();
             }
 
-            flash($message)->error();
+            if ($user->can('read-client-portal')) {
+                flash($message)->error();
 
-            redirect()->route('signed.invoices.show', $invoice->id)->send();
+                redirect()->route('portal.invoices.show', $invoice->id)->send();
+            }
+
+            throw new \Exception($message);
         }
     }
 }