From 09139a981d5ed6c029e7a9367215c529e5210bd6 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 13 Aug 2019 19:20:55 +1000
Subject: [PATCH] Update contact password form

---
 resources/views/portal/default/header.blade.php        | 6 +++++-
 resources/views/portal/default/profile/index.blade.php | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/resources/views/portal/default/header.blade.php b/resources/views/portal/default/header.blade.php
index 423f044a172e..7507f5bf8772 100644
--- a/resources/views/portal/default/header.blade.php
+++ b/resources/views/portal/default/header.blade.php
@@ -39,7 +39,11 @@
 
         <li class="nav-item dropdown" style="padding-right: 20px;">
             <a class="nav-link" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
-                <img class="img-avatar" src="/images/logo.png" alt=""> {{ auth()->user()->present()->name() }}
+                @if(auth()->user()->avatar)
+                <img class="img-avatar" src="{{ auth()->user()->avatar }}" alt="" class="img-fluid"> {{ auth()->user()->present()->name() }}
+                @else
+                <img class="img-avatar" src="/images/logo.png" alt="" class="img-fluid"> {{ auth()->user()->present()->name() }}
+                @endif
             </a>
             <div class="dropdown-menu dropdown-menu-sm">
                 <div class="dropdown-header text-center">
diff --git a/resources/views/portal/default/profile/index.blade.php b/resources/views/portal/default/profile/index.blade.php
index 937283be4f6a..8812b033b721 100644
--- a/resources/views/portal/default/profile/index.blade.php
+++ b/resources/views/portal/default/profile/index.blade.php
@@ -82,7 +82,7 @@
 
                   {!! Former::password('password')->placeholder( ctrans('texts.password'))->label('') !!}
 
-                  {!! Former::password('password_confirmed')->placeholder( ctrans('texts.confirm_password'))->label('') !!}
+                  {!! Former::password('password_confirmation')->placeholder( ctrans('texts.confirm_password'))->label('') !!}
 
                   </div>