unsubscribe fix

diff --git a/app/Events/DispatchMailgunEvent.php b/app/Events/DispatchMailgunEvent.php
index 3a02b3e68e7f13c39acccb834407e4e236c137ed..7242e7a407e8f87e7aab222ea321c0fe14222284 100644 (file)
--- a/app/Events/DispatchMailgunEvent.php
+++ b/app/Events/DispatchMailgunEvent.php
@@ -73,7 +73,7 @@ class DispatchMailgunEvent implements ShouldBroadcast
         $event->touch();
         $this->data = $event;
 
-        if($event->event === 'unsubscribe') {
+        if($event->event === 'unsubscribed') {
             $event->user->unsubscribe();
         }
 

diff --git a/app/Nova/Filters/AccountStates.php b/app/Nova/Filters/AccountStates.php
new file mode 100644 (file)
index 0000000..336c73d
--- /dev/null
+++ b/app/Nova/Filters/AccountStates.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Nova\Filters;
+
+use Illuminate\Http\Request;
+use Laravel\Nova\Filters\BooleanFilter;
+
+class AccountStates extends BooleanFilter
+{
+
+    public $name = "Etat du compte";
+    /**
+     * Apply the filter to the given query.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param  mixed  $value
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function apply(Request $request, $query, $value)
+    {
+        if($value['reg_complete']) {
+            $query->where('reg_complete', 1);
+        }
+
+        if($value['not_reg_complete']) {
+            $query->where('reg_complete', 0);
+        }
+
+        if($value['unsubscribed']) {
+            $query->where('unsubscribed', 1);
+        }
+        
+        return $query;
+    }
+
+    /**
+     * Get the filter's available options.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function options(Request $request)
+    {
+        return [
+            'Comptes activés' => 'reg_complete',
+            'Comptes non activés' => 'not_reg_complete',
+            'Désabonnés' => 'unsubscribed',
+        ];
+    }
+}

diff --git a/app/Nova/Filters/ActivatedAccounts.php b/app/Nova/Filters/ActivatedAccounts.php
deleted file mode 100644 (file)
index 85c21bd..0000000
--- a/app/Nova/Filters/ActivatedAccounts.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-namespace App\Nova\Filters;
-
-use Illuminate\Http\Request;
-use Laravel\Nova\Filters\BooleanFilter;
-
-class ActivatedAccounts extends BooleanFilter
-{
-    /**
-     * Apply the filter to the given query.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Illuminate\Database\Eloquent\Builder  $query
-     * @param  mixed  $value
-     * @return \Illuminate\Database\Eloquent\Builder
-     */
-    public function apply(Request $request, $query, $value)
-    {
-        if($value['reg_complete']) {
-            $query->where('reg_complete', 1);
-        }
-        if($value['not_reg_complete']) {
-            $query->where('reg_complete', 0);
-        }
-        return $query;
-    }
-
-    /**
-     * Get the filter's available options.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
-    public function options(Request $request)
-    {
-        return [
-            'Comptes activés' => 'reg_complete',
-            'Comptes non activés' => 'not_reg_complete'
-        ];
-    }
-}

diff --git a/app/Nova/SpecialUsers.php b/app/Nova/SpecialUsers.php
index b7be00f030a5b2d89eb5cbb7217f832b1cbd5015..f6c433344a43412ff4dd68af4e168fa72ff3084b 100644 (file)
--- a/app/Nova/SpecialUsers.php
+++ b/app/Nova/SpecialUsers.php
@@ -9,7 +9,7 @@ use Laravel\Nova\Http\Requests\NovaRequest;
 class SpecialUsers extends User
 {
     public static $group = "Annuaire";
-    
+
     public static $type = \App\User::TYPE_SPECIAL;
 
     public static $globallySearchable = true;

diff --git a/app/Nova/Subscriber.php b/app/Nova/Subscriber.php
index 7ffcbb9005f88c435e9e0e22cd591397c063bec2..7f2622462fa11ad61c15c281b8edf32d11d1f726 100644 (file)
--- a/app/Nova/Subscriber.php
+++ b/app/Nova/Subscriber.php
@@ -4,7 +4,7 @@
 namespace App\Nova;
 
 
-use App\Nova\Filters\ActivatedAccounts;
+use App\Nova\Filters\AccountStates;
 use Illuminate\Http\Request;
 use Laravel\Nova\Http\Requests\NovaRequest;
 
@@ -30,11 +30,4 @@ class Subscriber extends User
 
 
 
-    public function filters(Request $request)
-    {
-        return array_merge(parent::filters($request), [
-           new ActivatedAccounts,
-        ]);
-    }
-
 }

diff --git a/app/Nova/User.php b/app/Nova/User.php
index ae7689a46bdb58d4011720855bd6f17abf408da0..b6d0bf6f5405cb3dbfead8e9fa0b281e910cc8b4 100644 (file)
--- a/app/Nova/User.php
+++ b/app/Nova/User.php
@@ -7,6 +7,7 @@ use App\Nova\Actions\SendNotification;
 use App\Nova\Actions\StartTrial;
 use App\Nova\Actions\ValidateAddress;
 use App\Nova\Actions\VerifyEmail;
+use App\Nova\Filters\AccountStates;
 use App\Nova\Filters\FilterByOrganization;
 use App\Nova\Lenses\FailedMailgun;
 use App\Nova\Lenses\MailgunStatus;
@@ -151,7 +152,8 @@ class User extends Resource
     public function filters(Request $request)
     {
         return [
-            new FilterByOrganization
+            new FilterByOrganization,
+            new AccountStates
         ];
     }