diff --git a/app/Controllers/NotificationController.php b/app/Controllers/NotificationController.php index 6efe58e3..82771ba4 100755 --- a/app/Controllers/NotificationController.php +++ b/app/Controllers/NotificationController.php @@ -201,10 +201,17 @@ class NotificationController extends AdminController } if( isset($value['template_name']) && !empty($value['template_name']) && $value['template_name'] == "member_common_mail"){ - $value['common_mails'] = $this->CommonEMailModel->where('notification_id',$value['id'])->findAll()??[]; + $common_mails = $this->CommonEMailModel + ->where('notification_id',$value['id']) + ->where('is_active',1) + ->findAll()??[]; + $value['comman_mails'] = !empty($common_mails) + ? trim(implode("," , array_column( $common_mails,'email') )) + : []; + } - + return json_encode($value); diff --git a/app/Views/notification.php b/app/Views/notification.php index 99be6c3d..c6d84602 100755 --- a/app/Views/notification.php +++ b/app/Views/notification.php @@ -359,6 +359,7 @@ +