diff --git a/assets/js/src/subscribers/list.jsx b/assets/js/src/subscribers/list.jsx index 21846bb573..def968fa31 100644 --- a/assets/js/src/subscribers/list.jsx +++ b/assets/js/src/subscribers/list.jsx @@ -208,16 +208,6 @@ const bulkActions = [ ); }, }, - { - name: 'sendConfirmationEmail', - label: MailPoet.I18n.t('resendConfirmationEmail'), - onSuccess: function onSuccess(response) { - MailPoet.Notice.success( - MailPoet.I18n.t('multipleConfirmationEmailsSent') - .replace('%$1d', (Number(response.meta.count)).toLocaleString()) - ); - }, - }, { name: 'trash', label: MailPoet.I18n.t('moveToTrash'), diff --git a/lib/Models/Subscriber.php b/lib/Models/Subscriber.php index a65d218ac0..b9fd4a18b6 100644 --- a/lib/Models/Subscriber.php +++ b/lib/Models/Subscriber.php @@ -830,13 +830,4 @@ class Subscriber extends Model { $service = ContainerWrapper::getInstance()->get(\MailPoet\Subscribers\SubscriberActions::class); return $service->subscribe($subscriber_data, $segment_ids); } - - /** - * @deprecated - */ - static function bulkSendConfirmationEmail($orm) { - trigger_error('Calling Subscriber::bulkSendConfirmationEmail() is deprecated and will be removed. Use MailPoet\API\MP\v1\API instead. ', E_USER_DEPRECATED); - $service = ContainerWrapper::getInstance()->get(\MailPoet\Subscribers\SubscriberActions::class); - return $service->bulkSendConfirmationEmail($orm); - } } diff --git a/lib/Subscribers/SubscriberActions.php b/lib/Subscribers/SubscriberActions.php index aa23a7f461..190cd6b9ad 100644 --- a/lib/Subscribers/SubscriberActions.php +++ b/lib/Subscribers/SubscriberActions.php @@ -2,7 +2,6 @@ namespace MailPoet\Subscribers; -use MailPoet\Listing\BulkActionFactory; use MailPoet\Models\Segment; use MailPoet\Models\Subscriber; use MailPoet\Models\SubscriberSegment; @@ -22,9 +21,6 @@ class SubscriberActions { /** @var ConfirmationEmailMailer */ private $confirmation_email_mailer; - /** @var BulkActionFactory */ - private $bulk_action_factory; - /** @var WelcomeScheduler */ private $welcome_scheduler; @@ -32,14 +28,11 @@ class SubscriberActions { SettingsController $settings, NewSubscriberNotificationMailer $new_subscriber_notification_mailer, ConfirmationEmailMailer $confirmation_email_mailer, - BulkActionFactory $bulk_action_factory, WelcomeScheduler $welcome_scheduler ) { $this->settings = $settings; $this->new_subscriber_notification_mailer = $new_subscriber_notification_mailer; $this->confirmation_email_mailer = $confirmation_email_mailer; - $this->bulk_action_factory = $bulk_action_factory; - $this->bulk_action_factory->registerAction('\MailPoet\Models\Subscriber', 'bulkSendConfirmationEmail', $this); $this->welcome_scheduler = $welcome_scheduler; } @@ -107,23 +100,4 @@ class SubscriberActions { return $subscriber; } - function bulkSendConfirmationEmail($orm) { - $subscribers = $orm - ->where('status', Subscriber::STATUS_UNCONFIRMED) - ->findMany(); - - $emails_sent = 0; - if (!empty($subscribers)) { - foreach ($subscribers as $subscriber) { - if ($this->confirmation_email_mailer->sendConfirmationEmail($subscriber)) { - $emails_sent++; - } - } - } - - return [ - 'count' => $emails_sent, - ]; - } - } diff --git a/views/subscribers/subscribers.html b/views/subscribers/subscribers.html index b267911a1d..c268f63c4b 100644 --- a/views/subscribers/subscribers.html +++ b/views/subscribers/subscribers.html @@ -84,7 +84,6 @@ 'removeFromAllLists': __('Remove from all lists'), 'multipleSubscribersRemovedFromAllLists': __('%$1d subscribers were removed from all lists.'), 'resendConfirmationEmail': __('Resend confirmation email'), - 'multipleConfirmationEmailsSent': __('%$1d confirmation emails have been sent.'), 'listsToWhichSubscriberWasSubscribed': __('Lists to which the subscriber was subscribed.'), 'WPUsersSegment': __('WordPress Users'), 'WPUserEditNotice': __('This subscriber is a registered WordPress user. [link]Edit his/her profile[/link] to change his/her email.'),