From 82bae9cc74b8eadb01d367cd1f7842a1fcd5f3ad Mon Sep 17 00:00:00 2001
From: Nabeel S <nabeelio@users.noreply.github.com>
Date: Thu, 4 Jun 2020 03:11:57 -0700
Subject: [PATCH] Update the flash messages #739 (#742)

---
 .../layouts/default/flash/message.blade.php   | 28 ++++++++++++-------
 .../layouts/default/flash/modal.blade.php     |  6 ++--
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/resources/views/layouts/default/flash/message.blade.php b/resources/views/layouts/default/flash/message.blade.php
index 9e47c4fd..b165337e 100644
--- a/resources/views/layouts/default/flash/message.blade.php
+++ b/resources/views/layouts/default/flash/message.blade.php
@@ -1,19 +1,27 @@
-@if (session()->has('flash_notification.message'))
-  @if (session()->has('flash_notification.overlay'))
+@foreach (session('flash_notification', collect())->toArray() as $message)
+  @if ($message['overlay'])
     @include('flash::modal', [
         'modalClass' => 'flash-modal',
-        'title'      => session('flash_notification.title'),
-        'body'       => session('flash_notification.message')
+        'title'      => $message['title'],
+        'body'       => $message['message']
     ])
   @else
     <div class="alert
-                    alert-{{ session('flash_notification.level') }}
-    {{ session()->has('flash_notification.important') ? 'alert-important' : '' }}">
-      @if(session()->has('flash_notification.important'))
-        <button type="button" class="close" data-dismiss="alert">&times;</button>
+                    alert-{{ $message['level'] }}
+    {{ $message['important'] ? 'alert-important' : '' }}"
+         role="alert">
+      @if ($message['important'])
+        <button type="button"
+                class="close"
+                data-dismiss="alert"
+                aria-hidden="true"
+        >&times;
+        </button>
       @endif
 
-      {{ session('flash_notification.message') }}
+      {!! $message['message'] !!}
     </div>
   @endif
-@endif
+@endforeach
+
+{{ session()->forget('flash_notification') }}
diff --git a/resources/views/layouts/default/flash/modal.blade.php b/resources/views/layouts/default/flash/modal.blade.php
index 04023991..3a31f2a3 100644
--- a/resources/views/layouts/default/flash/modal.blade.php
+++ b/resources/views/layouts/default/flash/modal.blade.php
@@ -1,4 +1,4 @@
-<div id="flash-overlay-modal" class="modal fade {{ $modalClass or '' }}">
+<div id="flash-overlay-modal" class="modal fade {{ isset($modalClass) ? $modalClass : '' }}">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
@@ -8,11 +8,11 @@
       </div>
 
       <div class="modal-body">
-        <p>{{ $body }}</p>
+        <p>{!! $body !!}</p>
       </div>
 
       <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">@lang('common.close')</button>
+        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
       </div>
     </div>
   </div>