';
+ }
+ $this->messageManager->addNotice(
+ $noticeHtml
+ );
+ try {
+ $this->messageManager->addNotice(
+ $renderErrorMessages->renderMessages($errorAggregator)
+ );
+ } catch (\Exception $e) {
+ foreach ($renderErrorMessages->getErrorMessages($errorAggregator) as $errorMessage) {
+ $this->messageManager->addError($errorMessage);
+ }
+ }
+ }
} else {
$this->messageManager->addError(__('We can\'t run the operation right now, see error log for details.'));
}
diff --git a/vendor/magento/module-scheduled-import-export/Model/Export.php b/vendor/magento/module-scheduled-import-export/Model/Export.php
index 30625b4c711d..a433ff5c31fa 100644
--- a/vendor/magento/module-scheduled-import-export/Model/Export.php
+++ b/vendor/magento/module-scheduled-import-export/Model/Export.php
@@ -5,6 +5,8 @@
*/
namespace Magento\ScheduledImportExport\Model;
+use Magento\ImportExport\Model\LocaleEmulatorInterface;
+
/**
* Export model
*
@@ -26,11 +28,6 @@ class Export extends \Magento\ImportExport\Model\Export implements
*/
protected $_dateModel;
- /**
- * @var \Magento\Framework\Locale\ResolverInterface
- */
- private $localeResolver;
-
/**
* @param \Psr\Log\LoggerInterface $logger
* @param \Magento\Framework\Filesystem $filesystem
@@ -38,7 +35,7 @@ class Export extends \Magento\ImportExport\Model\Export implements
* @param \Magento\ImportExport\Model\Export\Entity\Factory $entityFactory
* @param \Magento\ImportExport\Model\Export\Adapter\Factory $exportAdapterFac
* @param \Magento\Framework\Stdlib\DateTime\DateTime $coreDate
- * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
+ * @param LocaleEmulatorInterface $localeEmulator
* @param array $data
*/
public function __construct(
@@ -48,11 +45,10 @@ public function __construct(
\Magento\ImportExport\Model\Export\Entity\Factory $entityFactory,
\Magento\ImportExport\Model\Export\Adapter\Factory $exportAdapterFac,
\Magento\Framework\Stdlib\DateTime\DateTime $coreDate,
- \Magento\Framework\Locale\ResolverInterface $localeResolver,
+ LocaleEmulatorInterface $localeEmulator,
array $data = []
) {
$this->_dateModel = $coreDate;
- $this->localeResolver = $localeResolver;
parent::__construct(
$logger,
@@ -60,7 +56,8 @@ public function __construct(
$exportConfig,
$entityFactory,
$exportAdapterFac,
- $data
+ $data,
+ $localeEmulator
);
}
@@ -74,17 +71,11 @@ public function __construct(
*/
public function runSchedule(Scheduled\Operation $operation)
{
- $currentLocale = $this->localeResolver->getLocale();
- $locale = $operation->getFileInfo()['locale'] ?? $currentLocale;
- $this->localeResolver->setLocale($locale);
-
try {
$data = $this->export();
} catch (\Exception $e) {
$operation->saveFileSource($this, $e->getMessage());
throw $e;
- } finally {
- $this->localeResolver->setLocale($currentLocale);
}
$result = $operation->saveFileSource($this, $data);
@@ -109,6 +100,7 @@ public function initialize(Scheduled\Operation $operation)
'operation_type' => $operation->getOperationType(),
'run_at' => $operation->getStartTime(),
'scheduled_operation_id' => $operation->getId(),
+ 'locale' => $fileInfo['locale'] ?? null,
];
if (isset($attributes['skip_attr'])) {
$data['skip_attr'] = $attributes['skip_attr'];
diff --git a/vendor/magento/module-scheduled-import-export/Model/Scheduled/Operation.php b/vendor/magento/module-scheduled-import-export/Model/Scheduled/Operation.php
index 423d2e10673a..7dc2040e2842 100644
--- a/vendor/magento/module-scheduled-import-export/Model/Scheduled/Operation.php
+++ b/vendor/magento/module-scheduled-import-export/Model/Scheduled/Operation.php
@@ -513,6 +513,7 @@ public function run()
if ($operation->getErrorAggregator() && $operation->getErrorAggregator()->getErrorsCount()) {
$shouldBeLogged = true;
+ $result = false;
}
if ($shouldBeLogged) {
diff --git a/vendor/magento/module-scheduled-import-export/view/adminhtml/layout/adminhtml_scheduled_operation_index.xml b/vendor/magento/module-scheduled-import-export/view/adminhtml/layout/adminhtml_scheduled_operation_index.xml
index f00891a0da54..4c67a1701040 100644
--- a/vendor/magento/module-scheduled-import-export/view/adminhtml/layout/adminhtml_scheduled_operation_index.xml
+++ b/vendor/magento/module-scheduled-import-export/view/adminhtml/layout/adminhtml_scheduled_operation_index.xml
@@ -8,6 +8,9 @@