File tree Expand file tree Collapse file tree 3 files changed +6
-5
lines changed
app/code/Magento/Sales/Controller/Adminhtml/Order Expand file tree Collapse file tree 3 files changed +6
-5
lines changed Original file line number Diff line number Diff line change @@ -16,13 +16,14 @@ class CommentsHistory extends \Magento\Sales\Controller\Adminhtml\Order
16
16
public function execute ()
17
17
{
18
18
$ this ->_initOrder ();
19
- $ resultPage = $ this ->resultPageFactory ->create ();
20
- $ html = $ resultPage ->getLayout ()->createBlock ('Magento\Sales\Block\Adminhtml\Order\View\Tab\History ' )->toHtml ();
19
+ $ resultLayout = $ this ->resultLayoutFactory ->create ();
20
+ $ html = $ resultLayout ->getLayout ()
21
+ ->createBlock ('Magento\Sales\Block\Adminhtml\Order\View\Tab\History ' )
22
+ ->toHtml ();
21
23
$ this ->_translateInline ->processResponseBody ($ html );
22
24
/** @var \Magento\Framework\Controller\Result\Raw $resultRaw */
23
25
$ resultRaw = $ this ->resultRawFactory ->create ();
24
26
$ resultRaw ->setContents ($ html );
25
-
26
27
return $ resultRaw ;
27
28
}
28
29
}
Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ public function execute()
20
20
{
21
21
$ fileName = 'orders.csv ' ;
22
22
/** @var \Magento\Backend\Block\Widget\Grid\ExportInterface $exportBlock */
23
- $ exportBlock = $ this ->resultLayoutFactory ->create ()
23
+ $ exportBlock = $ this ->resultPageFactory ->create ()
24
24
->getLayout ()
25
25
->getChildBlock ('sales.order.grid ' , 'grid.export ' );
26
26
return $ this ->_fileFactory ->create ($ fileName , $ exportBlock ->getCsvFile (), DirectoryList::VAR_DIR );
Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ public function execute()
20
20
{
21
21
$ fileName = 'orders.xml ' ;
22
22
/** @var \Magento\Backend\Block\Widget\Grid\ExportInterface $exportBlock */
23
- $ exportBlock = $ this ->resultLayoutFactory ->create ()
23
+ $ exportBlock = $ this ->resultPageFactory ->create ()
24
24
->getLayout ()
25
25
->getChildBlock ('sales.order.grid ' , 'grid.export ' );
26
26
return $ this ->_fileFactory ->create ($ fileName , $ exportBlock ->getExcelFile ($ fileName ), DirectoryList::VAR_DIR );
You can’t perform that action at this time.
0 commit comments