@@ -40,7 +40,7 @@ discard block  | 
                                                    ||
| 40 | 40 | public function scopeDashboardExpiring($query)  | 
                                                        
| 41 | 41 |      { | 
                                                        
| 42 | 42 | return $query  | 
                                                        
| 43 | -            ->with(['member' => function ($query) { | 
                                                        |
| 43 | +            ->with(['member' => function($query) { | 
                                                        |
| 44 | 44 |                  $query->where('status', '=', \constStatus::Active); | 
                                                        
| 45 | 45 | }])  | 
                                                        
| 46 | 46 |              ->where('end_date', '<', Carbon::today()->addDays(7)) | 
                                                        
@@ -50,7 +50,7 @@ discard block  | 
                                                    ||
| 50 | 50 | public function scopeDashboardExpired($query)  | 
                                                        
| 51 | 51 |      { | 
                                                        
| 52 | 52 | return $query  | 
                                                        
| 53 | -            ->with(['member' => function ($query) { | 
                                                        |
| 53 | +            ->with(['member' => function($query) { | 
                                                        |
| 54 | 54 |                  $query->where('status', '=', \constStatus::Active); | 
                                                        
| 55 | 55 | }])  | 
                                                        
| 56 | 56 |              ->where('status', '=', \constSubscription::Expired); |