Remove bulk option to resend confirmation emails

[MAILPOET-2315]
This commit is contained in:
Ján Mikláš
2019-09-02 16:52:12 +02:00
committed by Jack Kitterhing
parent f41f7f5138
commit e8253ad94e
4 changed files with 0 additions and 46 deletions

View File

@ -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'),

View File

@ -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);
}
}

View File

@ -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,
];
}
}

View File

@ -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.'),