- Removes validation of MailChimp API key

- Refactors import class
- Creates new method in Newsletter model to select welcome notifications
  for specific segments
- Updates Step 2 (error) and Step 3 (success) notices
- Gives MenuBootstrap class a comprehensible name
This commit is contained in:
Vlad
2016-05-26 18:50:30 -04:00
parent 142421ad48
commit 377498be1d
10 changed files with 49 additions and 51 deletions

View File

@@ -6,7 +6,7 @@ use MailPoet\Models\CustomField;
use MailPoet\Models\Segment;
use MailPoet\Models\Subscriber;
use MailPoet\Models\SubscriberSegment;
use MailPoet\Subscribers\ImportExport\BootStrapMenu;
use MailPoet\Subscribers\ImportExport\ImportExportFactory;
use MailPoet\Util\Helpers;
use MailPoet\Util\XLSXWriter;
@@ -258,8 +258,8 @@ class Export {
}
function formatSubscriberFields($subscriber_fields, $subscriber_custom_fields) {
$bootstrap_menu = new BootStrapMenu();
$translated_fields = $bootstrap_menu->getSubscriberFields();
$export_factory = new ImportExportFactory();
$translated_fields = $export_factory->getSubscriberFields();
return array_map(function($field) use (
$translated_fields, $subscriber_custom_fields
) {