unsub

diff --git a/app/Events/DispatchMailgunEvent.php b/app/Events/DispatchMailgunEvent.php
index 77f7cd9c045745ea179ee09d376f8a3c79437f2f..55286675783ee8e250c3247f6e766cb21c09294a 100644 (file)
--- a/app/Events/DispatchMailgunEvent.php
+++ b/app/Events/DispatchMailgunEvent.php
@@ -73,11 +73,8 @@ class DispatchMailgunEvent implements ShouldBroadcast
         $event->touch();
         $this->data = $event;
 
-        /**
-         * @todo track unsubscribes
-         */
         if($event->event === 'unsubscribed') {
-//            $event->user->unsubscribe();
+            $event->user->unsubscribe();
         }
 
 

diff --git a/app/User.php b/app/User.php
index 81974e7b93b1cd8814f72814561aa910445d7282..02420d2384504afff6793d4acd289935986e03dd 100644 (file)
--- a/app/User.php
+++ b/app/User.php
@@ -402,7 +402,7 @@ class User extends Authenticatable implements MustVerifyEmail, SendsEmails
      */
     public function scopeReceivesEmails(Builder $builder): void
     {
-        $builder->where('unsubscribed', '0');
+//        $builder->where('unsubscribed', '0');
         $builder->where(function($builder) {
 //            $builder->hasActiveSubscription()->orWhere->isOnTrial()->orWhere->isOnDiscovery();
             $builder->where('type', User::TYPE_SUBSCRIBER)->orWhere->isOnTrial()->orWhere->isOnDiscovery();