Merge branch 'master' of https://github.com/jamesmills/laravel-timezone

Author: jamesmills

README.md

@@ -108,7 +108,17 @@ php artisan vendor:publish --provider="JamesMills\LaravelTimezone\LaravelTimezon
 
 ### Flash Messages
 
-By default, when the timezone has been set, there is a flash message set in the session. There is an optional integration to use [laracasts/flash](https://github.com/laracasts/flash) package if you wish. Just publish the config and override the default `'flash' => 'laracasts'` settings.  
+When the timezone has been set, we display a flash message, By default, is configured to use Laravel default flash messaging, here are some of the optional integrations.
+
+[laracasts/flash](https://github.com/laracasts/flash) - `'flash' => 'laracasts'`
+
+[mercuryseries/flashy](https://github.com/mercuryseries/flashy) - `'flash' => 'mercuryseries'`
+
+[spatie/laravel-flash](https://github.com/spatie/laravel-flash) - `'flash' => 'spatie'`
+
+[mckenziearts/laravel-notify](https://github.com/mckenziearts/laravel-notify) - `'flash' => 'mckenziearts'`
+
+To override this configuration, you just need to change the `flash` property inside the configuration file `config/timezone.php` for the desired package.  
 
 ### Overwrite existing timezones in the database
 

src/Listeners/Auth/UpdateUsersTimezone.php

@@ -24,16 +24,53 @@ public function handle(Login $event)
                 $user->timezone = $geoip_info['timezone'];
                 $user->save();
 
-                if (config('timezone.flash') == 'laracasts') {
-                    flash()->success('We have set your timezone to ' . $geoip_info['timezone']);
-                } else {
-                    request()->session()->flash('success', 'We have set your timezone to ' . $geoip_info['timezone']);
-                }
+                $this->notify($geoip_info);
             }
         }
     }
 
     /**
+     * @param  \Torann\GeoIP\Location  $geoip_info
+     */
+    public function notify(\Torann\GeoIP\Location $geoip_info)
+    {
+        if (config('timezone.flash') == 'off') {
+            return;
+        }
+
+        $message = 'We have set your timezone to ' . $geoip_info['timezone'];
+
+        if (config('timezone.flash') == 'laravel') {
+            request()->session()->flash('success', $message);
+
+            return;
+        }
+
+        if (config('timezone.flash') == 'laracasts') {
+            flash()->success($message);
+
+            return;
+        }
+
+        if (config('timezone.flash') == 'mercuryseries') {
+            flashy()->success($message);
+
+            return;
+        }
+
+        if (config('timezone.flash') == 'spatie') {
+            flash()->success($message);
+
+            return;
+        }
+
+        if (config('timezone.flash') == 'mckenziearts') {
+            notify()->success($message);
+
+            return;
+        }
+     
+     /**
      * @return mixed
      */
     public function getFromLookup()

src/config/timezone.php

@@ -9,11 +9,11 @@
     |
     | Here you may configure if to use the laracasts/flash package for flash
     | notifications when a users timezone is set.
-    | options [standard, laracasts]
+    | options [laravel, laracasts, mercuryseries, spatie, mckenziearts]
     |
     */
 
-    'flash' => 'standard',
+    'flash' => 'laravel',
 
     /*
     |--------------------------------------------------------------------------