Skip to content

Commit 9f68da8

Browse files
committed
MAGETWO-89238: [Sales email] Disabled invoice emails produce performance issue
1 parent 55e23bc commit 9f68da8

File tree

6 files changed

+3
-13
lines changed

6 files changed

+3
-13
lines changed

app/code/Magento/Backend/Controller/Adminhtml/System/Store/Save.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ private function processWebsiteSave($postData)
4646
*/
4747
private function processStoreSave($postData)
4848
{
49-
$eventName = 'store_edit';
49+
//$eventName = 'store_edit';
5050
/** @var \Magento\Store\Model\Store $storeModel */
5151
$storeModel = $this->_objectManager->create(\Magento\Store\Model\Store::class);
5252
$postData['store']['name'] = $this->filterManager->removeTags($postData['store']['name']);
@@ -56,7 +56,7 @@ private function processStoreSave($postData)
5656
$storeModel->setData($postData['store']);
5757
if ($postData['store']['store_id'] == '') {
5858
$storeModel->setId(null);
59-
$eventName = 'store_add';
59+
//$eventName = 'store_add';
6060
}
6161
$groupModel = $this->_objectManager->create(
6262
\Magento\Store\Model\Group::class

app/code/Magento/Sales/Model/EmailSenderHandler.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ class EmailSenderHandler
6060
* @param \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig
6161
* @param IdentityInterface|null $identityContainer
6262
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
63-
* @throws \InvalidArgumentException
6463
*/
6564
public function __construct(
6665
\Magento\Sales\Model\Order\Email\Sender $emailSender,

app/code/Magento/Store/Test/Unit/Model/Config/Importer/Processor/DeleteTest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,6 @@ public function testRun()
244244
->method('get')
245245
->with('test')
246246
->willReturn($this->storeMock);
247-
$this->storeResourceMock->expects($this->once())
248-
->method('addCommitCallback');
249247

250248
$this->registryMock->expects($this->once())
251249
->method('unregister')

app/code/Magento/Store/Test/Unit/Model/Config/Importer/Processor/UpdateTest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,6 @@ public function testRun()
247247
$this->storeResourceMock->expects($this->once())
248248
->method('save')
249249
->with($this->storeMock);
250-
$this->storeResourceMock->expects($this->once())
251-
->method('addCommitCallback');
252250

253251
$this->model->run($data);
254252
}

dev/tests/integration/testsuite/Magento/Sales/Model/InvoiceEmailSenderHandlerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ protected function setUp()
5555

5656
/**
5757
* @magentoAppIsolation enabled
58-
* @magentoDbIsolation enabled
58+
* @magentoDbIsolation disabled
5959
* @magentoDataFixture Magento/Sales/_files/invoice_list_different_stores.php
6060
*/
6161
public function testInvoiceEmailSenderExecute()

dev/tests/integration/testsuite/Magento/Store/_files/second_store.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,3 @@
3030
);
3131
$store->save();
3232
}
33-
34-
/* Refresh stores memory cache */
35-
//\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
36-
// \Magento\Store\Model\StoreManagerInterface::class
37-
//)->reinitStores();

0 commit comments

Comments
 (0)