From 65b5ec92327d66727dec2047fc2f0836e3730e2b Mon Sep 17 00:00:00 2001
From: Annika Wolff <annika@galaxis-euphoria.de>
Date: Wed, 11 Mar 2020 10:45:18 +0100
Subject: [PATCH 1/2] bugfix: show multiple flash messages in admin panel

---
 .../src/Resources/views/layouts/master.blade.php   | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php
index 352d70598..86512323a 100755
--- a/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php
@@ -55,15 +55,11 @@
         <script type="text/javascript">
             window.flashMessages = [];
 
-            @if ($success = session('success'))
-                window.flashMessages = [{'type': 'alert-success', 'message': "{{ $success }}" }];
-            @elseif ($warning = session('warning'))
-                window.flashMessages = [{'type': 'alert-warning', 'message': "{{ $warning }}" }];
-            @elseif ($error = session('error'))
-                window.flashMessages = [{'type': 'alert-error', 'message': "{{ $error }}" }];
-            @elseif ($info = session('info'))
-                window.flashMessages = [{'type': 'alert-info', 'message': "{{ $info }}" }];
-            @endif
+            @foreach (['success', 'warning', 'error', 'info'] as $key)
+                @if ($value = session($key))
+                    window.flashMessages.push({'type': 'alert-{{ $key }}', 'message': "{{ $value }}" });
+                @endif
+            @endforeach
 
             window.serverErrors = [];
             @if (isset($errors))

From 04c35bb88d97ea9f6e1b3091c9d7b0ee563f0a77 Mon Sep 17 00:00:00 2001
From: Annika Wolff <annika@galaxis-euphoria.de>
Date: Wed, 11 Mar 2020 11:06:17 +0100
Subject: [PATCH 2/2] uncommented factory loading in TaxServiceProvider, bc.
 tests will miss it

---
 packages/Webkul/Tax/src/Providers/TaxServiceProvider.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/Webkul/Tax/src/Providers/TaxServiceProvider.php b/packages/Webkul/Tax/src/Providers/TaxServiceProvider.php
index 227b4f47c..181258405 100755
--- a/packages/Webkul/Tax/src/Providers/TaxServiceProvider.php
+++ b/packages/Webkul/Tax/src/Providers/TaxServiceProvider.php
@@ -22,6 +22,6 @@ class TaxServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        // $this->loadFactoriesFrom(__DIR__ . '/../Database/Factories');
+        $this->loadFactoriesFrom(__DIR__ . '/../Database/Factories');
     }
 }
\ No newline at end of file