Skip to content

Commit 8bde139

Browse files
author
Yuri Kovsher
committed
Merge remote-tracking branch 'tango-ce/MAGETWO-36112' into MAGETWO-36610
2 parents f00020a + 2b8c53c commit 8bde139

File tree

5 files changed

+33
-24
lines changed

5 files changed

+33
-24
lines changed

‎app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportCsv.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?php
22
/**
3-
*
43
* Copyright © 2015 Magento. All rights reserved.
54
* See COPYING.txt for license details.
65
*/
76
namespace Magento\TaxImportExport\Controller\Adminhtml\Rate;
87

98
use Magento\Framework\App\ResponseInterface;
109
use Magento\Framework\App\Filesystem\DirectoryList;
10+
use Magento\Framework\Controller\ResultFactory;
1111

1212
class ExportCsv extends \Magento\TaxImportExport\Controller\Adminhtml\Rate
1313
{
@@ -18,8 +18,10 @@ class ExportCsv extends \Magento\TaxImportExport\Controller\Adminhtml\Rate
1818
*/
1919
public function execute()
2020
{
21-
$this->_view->loadLayout(false);
22-
$content = $this->_view->getLayout()->getChildBlock('adminhtml.tax.rate.grid', 'grid.export');
21+
/** @var \Magento\Framework\View\Result\Layout $resultLayout */
22+
$resultLayout = $this->resultFactory->create(ResultFactory::TYPE_LAYOUT);
23+
$content = $resultLayout->getLayout()->getChildBlock('adminhtml.tax.rate.grid', 'grid.export');
24+
2325
return $this->fileFactory->create(
2426
'rates.csv',
2527
$content->getCsvFile(),

‎app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportPost.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?php
22
/**
3-
*
43
* Copyright © 2015 Magento. All rights reserved.
54
* See COPYING.txt for license details.
65
*/
@@ -12,7 +11,7 @@
1211
class ExportPost extends \Magento\TaxImportExport\Controller\Adminhtml\Rate
1312
{
1413
/**
15-
* export action from import/export tax
14+
* Export action from import/export tax
1615
*
1716
* @return ResponseInterface
1817
*/
@@ -82,7 +81,6 @@ public function execute()
8281

8382
$content .= $rate->toString($template) . "\n";
8483
}
85-
$this->_view->loadLayout();
8684
return $this->fileFactory->create('tax_rates.csv', $content, DirectoryList::VAR_DIR);
8785
}
8886
}

‎app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportXml.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?php
22
/**
3-
*
43
* Copyright © 2015 Magento. All rights reserved.
54
* See COPYING.txt for license details.
65
*/
76
namespace Magento\TaxImportExport\Controller\Adminhtml\Rate;
87

98
use Magento\Framework\App\ResponseInterface;
109
use Magento\Framework\App\Filesystem\DirectoryList;
10+
use Magento\Framework\Controller\ResultFactory;
1111

1212
class ExportXml extends \Magento\TaxImportExport\Controller\Adminhtml\Rate
1313
{
@@ -18,8 +18,10 @@ class ExportXml extends \Magento\TaxImportExport\Controller\Adminhtml\Rate
1818
*/
1919
public function execute()
2020
{
21-
$this->_view->loadLayout(false);
22-
$content = $this->_view->getLayout()->getChildBlock('adminhtml.tax.rate.grid', 'grid.export');
21+
/** @var \Magento\Framework\View\Result\Layout $resultLayout */
22+
$resultLayout = $this->resultFactory->create(ResultFactory::TYPE_LAYOUT);
23+
$content = $resultLayout->getLayout()->getChildBlock('adminhtml.tax.rate.grid', 'grid.export');
24+
2325
return $this->fileFactory->create(
2426
'rates.xml',
2527
$content->getExcelFile(),

‎app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ImportExport.php

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,33 @@
11
<?php
22
/**
3-
*
43
* Copyright © 2015 Magento. All rights reserved.
54
* See COPYING.txt for license details.
65
*/
76
namespace Magento\TaxImportExport\Controller\Adminhtml\Rate;
87

8+
use Magento\Framework\Controller\ResultFactory;
9+
910
class ImportExport extends \Magento\TaxImportExport\Controller\Adminhtml\Rate
1011
{
1112
/**
1213
* Import and export Page
1314
*
14-
* @return void
15+
* @return \Magento\Backend\Model\View\Result\Page
1516
*/
1617
public function execute()
1718
{
18-
$this->_view->loadLayout();
19-
$this->_setActiveMenu(
20-
'Magento_TaxImportExport::system_convert_tax'
21-
)->_addContent(
22-
$this->_view->getLayout()->createBlock('Magento\TaxImportExport\Block\Adminhtml\Rate\ImportExportHeader')
23-
)->_addContent(
24-
$this->_view->getLayout()->createBlock('Magento\TaxImportExport\Block\Adminhtml\Rate\ImportExport')
19+
/** @var \Magento\Backend\Model\View\Result\Page $resultPage */
20+
$resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE);
21+
22+
$resultPage->setActiveMenu('Magento_TaxImportExport::system_convert_tax');
23+
$resultPage->addContent(
24+
$resultPage->getLayout()->createBlock('Magento\TaxImportExport\Block\Adminhtml\Rate\ImportExportHeader')
25+
);
26+
$resultPage->addContent(
27+
$resultPage->getLayout()->createBlock('Magento\TaxImportExport\Block\Adminhtml\Rate\ImportExport')
2528
);
26-
$this->_view->getPage()->getConfig()->getTitle()->prepend(__('Tax Zones and Rates'));
27-
$this->_view->getPage()->getConfig()->getTitle()->prepend(__('Import and Export Tax Rates'));
28-
$this->_view->renderLayout();
29+
$resultPage->getConfig()->getTitle()->prepend(__('Tax Zones and Rates'));
30+
$resultPage->getConfig()->getTitle()->prepend(__('Import and Export Tax Rates'));
31+
return $resultPage;
2932
}
3033
}

‎app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ImportPost.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
<?php
22
/**
3-
*
43
* Copyright © 2015 Magento. All rights reserved.
54
* See COPYING.txt for license details.
65
*/
76
namespace Magento\TaxImportExport\Controller\Adminhtml\Rate;
87

8+
use Magento\Framework\Controller\ResultFactory;
9+
910
class ImportPost extends \Magento\TaxImportExport\Controller\Adminhtml\Rate
1011
{
1112
/**
1213
* import action from import/export tax
1314
*
14-
* @return void
15+
* @return \Magento\Backend\Model\View\Result\Redirect
1516
*/
1617
public function execute()
1718
{
@@ -30,6 +31,9 @@ public function execute()
3031
} else {
3132
$this->messageManager->addError(__('Invalid file upload attempt'));
3233
}
33-
$this->getResponse()->setRedirect($this->_redirect->getRedirectUrl($this->getUrl('*')));
34+
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
35+
$resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
36+
$resultRedirect->setPath('*/*/importexport');
37+
return $resultRedirect;
3438
}
3539
}

0 commit comments

Comments
 (0)