From d111a7c41a52eb7baadc264eb0029750399fb8f6 Mon Sep 17 00:00:00 2001
From: Dmytro Zavalkin <dmytro.zavalkin@gmail.com>
Date: Sat, 1 Feb 2014 10:24:12 +0100
Subject: [PATCH] Implemented MAGETWO-11122: Configurable Grids (#471) -
 converted Magento\Sales\Block\Adminhtml\Invoice\Grid to new layout xml config
 format

---
 .../Magento/Sales/Block/Adminhtml/Invoice.php |   1 -
 .../Sales/Block/Adminhtml/Invoice/Grid.php    | 176 +----------------
 .../Sales/Controller/Adminhtml/Invoice.php    |  22 ++-
 .../Adminhtml/Invoice/AbstractInvoice.php     |  12 +-
 .../Order/Invoice/Grid/StatusesArray.php      |  56 ++++++
 .../layout/sales_invoice_exportcsv.xml        |  29 +++
 .../layout/sales_invoice_exportexcel.xml      |  29 +++
 .../adminhtml/layout/sales_invoice_grid.xml   |  30 +++
 .../layout/sales_invoice_grid_block.xml       | 177 ++++++++++++++++++
 .../adminhtml/layout/sales_invoice_index.xml  |  31 +++
 10 files changed, 373 insertions(+), 190 deletions(-)
 create mode 100644 app/code/Magento/Sales/Model/Resource/Order/Invoice/Grid/StatusesArray.php
 create mode 100644 app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_exportcsv.xml
 create mode 100644 app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_exportexcel.xml
 create mode 100644 app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_grid.xml
 create mode 100644 app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_grid_block.xml
 create mode 100644 app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_index.xml

diff --git a/app/code/Magento/Sales/Block/Adminhtml/Invoice.php b/app/code/Magento/Sales/Block/Adminhtml/Invoice.php
index 0c8f155569209..db7d2dd492cab 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Invoice.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Invoice.php
@@ -36,7 +36,6 @@
 
 class Invoice extends \Magento\Backend\Block\Widget\Grid\Container
 {
-
     protected function _construct()
     {
         $this->_controller = 'adminhtml_invoice';
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Invoice/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Invoice/Grid.php
index 5043c9b50e1fe..a30673f815a42 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Invoice/Grid.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Invoice/Grid.php
@@ -31,180 +31,6 @@
  */
 namespace Magento\Sales\Block\Adminhtml\Invoice;
 
-class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
+class Grid extends \Magento\Backend\Block\Widget\Grid
 {
-    /**
-     * @var \Magento\Sales\Model\Resource\Order\Invoice\Grid\CollectionFactory
-     */
-    protected $_collectionFactory;
-
-    /**
-     * @var \Magento\Sales\Model\Order\InvoiceFactory
-     */
-    protected $_invoiceFactory;
-
-    /**
-     * @param \Magento\Backend\Block\Template\Context $context
-     * @param \Magento\Backend\Helper\Data $backendHelper
-     * @param \Magento\Sales\Model\Order\InvoiceFactory $invoiceFactory
-     * @param \Magento\Sales\Model\Resource\Order\Invoice\Grid\CollectionFactory $collectionFactory
-     * @param array $data
-     */
-    public function __construct(
-        \Magento\Backend\Block\Template\Context $context,
-        \Magento\Backend\Helper\Data $backendHelper,
-        \Magento\Sales\Model\Order\InvoiceFactory $invoiceFactory,
-        \Magento\Sales\Model\Resource\Order\Invoice\Grid\CollectionFactory $collectionFactory,
-        array $data = array()
-    ) {
-        $this->_invoiceFactory = $invoiceFactory;
-        $this->_collectionFactory = $collectionFactory;
-        parent::__construct($context, $backendHelper, $data);
-    }
-
-    protected function _construct()
-    {
-        parent::_construct();
-        $this->setId('sales_invoice_grid');
-        $this->setUseAjax(true);
-        $this->setDefaultSort('created_at');
-        $this->setDefaultDir('DESC');
-        $this->setSaveParametersInSession(true);
-    }
-
-    /**
-     * Retrieve collection class
-     *
-     * @return string
-     */
-    protected function _getCollectionClass()
-    {
-        return 'Magento\Sales\Model\Resource\Order\Invoice\Grid\Collection';
-    }
-
-    protected function _prepareCollection()
-    {
-        $collection = $this->_collectionFactory->create();
-        $this->setCollection($collection);
-        return parent::_prepareCollection();
-    }
-
-    protected function _prepareColumns()
-    {
-        $this->addColumn('increment_id', array(
-            'header'    => __('Invoice'),
-            'index'     => 'increment_id',
-            'type'      => 'text',
-            'header_css_class'  => 'col-invoice-number',
-            'column_css_class'  => 'col-invoice-number'
-        ));
-
-        $this->addColumn('created_at', array(
-            'header'    => __('Invoice Date'),
-            'index'     => 'created_at',
-            'type'      => 'datetime',
-            'header_css_class'  => 'col-period',
-            'column_css_class'  => 'col-period'
-        ));
-
-        $this->addColumn('order_increment_id', array(
-            'header'    => __('Order'),
-            'index'     => 'order_increment_id',
-            'type'      => 'text',
-            'header_css_class'  => 'col-order-number',
-            'column_css_class'  => 'col-order-number'
-        ));
-
-        $this->addColumn('order_created_at', array(
-            'header'    => __('Order Date'),
-            'index'     => 'order_created_at',
-            'type'      => 'datetime',
-            'header_css_class'  => 'col-period',
-            'column_css_class'  => 'col-period'
-        ));
-
-        $this->addColumn('billing_name', array(
-            'header' => __('Bill-to Name'),
-            'index' => 'billing_name',
-            'header_css_class'  => 'col-name',
-            'column_css_class'  => 'col-name'
-        ));
-
-        $this->addColumn('state', array(
-            'header'    => __('Status'),
-            'index'     => 'state',
-            'type'      => 'options',
-            'options'   => $this->_invoiceFactory->create()->getStates(),
-            'header_css_class'  => 'col-status',
-            'column_css_class'  => 'col-status'
-        ));
-
-        $this->addColumn('grand_total', array(
-            'header'    => __('Amount'),
-            'index'     => 'grand_total',
-            'type'      => 'currency',
-            'align'     => 'right',
-            'currency'  => 'order_currency_code',
-            'header_css_class'  => 'col-qty',
-            'column_css_class'  => 'col-qty'
-        ));
-
-        $this->addColumn('action',
-            array(
-                'header'    => __('Action'),
-                'width'     => '50px',
-                'type'      => 'action',
-                'getter'     => 'getId',
-                'actions'   => array(
-                    array(
-                        'caption' => __('View'),
-                        'url'     => array('base'=>'sales/invoice/view'),
-                        'field'   => 'invoice_id'
-                    )
-                ),
-                'filter'    => false,
-                'sortable'  => false,
-                'is_system' => true,
-                'header_css_class'  => 'col-actions',
-                'column_css_class'  => 'col-actions'
-        ));
-
-        $this->addExportType('*/*/exportCsv', __('CSV'));
-        $this->addExportType('*/*/exportExcel', __('Excel XML'));
-
-        return parent::_prepareColumns();
-    }
-
-    protected function _prepareMassaction()
-    {
-        $this->setMassactionIdField('entity_id');
-        $this->getMassactionBlock()->setFormFieldName('invoice_ids');
-        $this->getMassactionBlock()->setUseSelectAll(false);
-
-        $this->getMassactionBlock()->addItem('pdfinvoices_order', array(
-             'label'=> __('PDF Invoices'),
-             'url'  => $this->getUrl('sales/invoice/pdfinvoices'),
-        ));
-
-        return $this;
-    }
-
-    public function getRowUrl($row)
-    {
-        if (!$this->_authorization->isAllowed(null)) {
-            return false;
-        }
-
-        return $this->getUrl('sales/invoice/view',
-            array(
-                'invoice_id'=> $row->getId(),
-            )
-        );
-    }
-
-    public function getGridUrl()
-    {
-        return $this->getUrl('sales/*/grid', array('_current' => true));
-    }
-
 }
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Invoice.php b/app/code/Magento/Sales/Controller/Adminhtml/Invoice.php
index 884d022aabe21..98a43992e4480 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Invoice.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Invoice.php
@@ -25,7 +25,7 @@
  */
 
 /**
- * Adminhtml sales orders controller
+ * Adminhtml sales invoices controller
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
@@ -38,9 +38,11 @@ class Invoice extends \Magento\Sales\Controller\Adminhtml\Invoice\AbstractInvoic
      */
     public function exportCsvAction()
     {
-        $fileName   = 'invoices.csv';
-        $grid       = $this->_view->getLayout()->createBlock('Magento\Sales\Block\Adminhtml\Invoice\Grid');
-        return $this->_fileFactory->create($fileName, $grid->getCsvFile());
+        $this->_view->loadLayout();
+        $fileName = 'invoices.csv';
+        /** @var \Magento\Backend\Block\Widget\Grid\ExportInterface $exportBlock  */
+        $exportBlock = $this->_view->getLayout()->getChildBlock('sales.invoice.grid', 'grid.export');
+        return $this->_fileFactory->create($fileName, $exportBlock->getCsvFile(), \Magento\App\Filesystem::VAR_DIR);
     }
 
     /**
@@ -48,8 +50,14 @@ public function exportCsvAction()
      */
     public function exportExcelAction()
     {
-        $fileName   = 'invoices.xml';
-        $grid       = $this->_view->getLayout()->createBlock('Magento\Sales\Block\Adminhtml\Invoice\Grid');
-        return $this->_fileFactory->create($fileName, $grid->getExcelFile($fileName));
+        $this->_view->loadLayout();
+        $fileName = 'invoices.xml';
+        /** @var \Magento\Backend\Block\Widget\Grid\ExportInterface $exportBlock  */
+        $exportBlock = $this->_view->getLayout()->getChildBlock('sales.invoice.grid', 'grid.export');
+        return $this->_fileFactory->create(
+            $fileName,
+            $exportBlock->getExcelFile($fileName),
+            \Magento\App\Filesystem::VAR_DIR
+        );
     }
 }
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice.php b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice.php
index 2aa4d18f581a5..569a23a0a4694 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Invoice/AbstractInvoice.php
@@ -50,6 +50,7 @@ public function __construct(
         $this->_fileFactory = $fileFactory;
         parent::__construct($context);
     }
+
     /**
      * Init layout, menu and breadcrumb
      *
@@ -69,10 +70,8 @@ protected function _initAction()
      */
     public function gridAction()
     {
-        $this->_view->loadLayout();
-        $this->getResponse()->setBody(
-            $this->_view->getLayout()->createBlock('Magento\Sales\Block\Adminhtml\Invoice\Grid')->toHtml()
-        );
+        $this->_view->loadLayout(false);
+        $this->_view->renderLayout();
     }
 
     /**
@@ -82,8 +81,7 @@ public function indexAction()
     {
         $this->_title->add(__('Invoices'));
 
-        $this->_initAction()
-            ->_addContent($this->_view->getLayout()->createBlock('Magento\Sales\Block\Adminhtml\Invoice'));
+        $this->_initAction();
         $this->_view->renderLayout();
     }
 
@@ -142,7 +140,7 @@ public function printAction()
         }
     }
 
-    public function pdfinvoicesAction()
+    public function massPrintInvoicesAction()
     {
         $invoicesIds = $this->getRequest()->getPost('invoice_ids');
         if (!empty($invoicesIds)) {
diff --git a/app/code/Magento/Sales/Model/Resource/Order/Invoice/Grid/StatusesArray.php b/app/code/Magento/Sales/Model/Resource/Order/Invoice/Grid/StatusesArray.php
new file mode 100644
index 0000000000000..f9362d4599128
--- /dev/null
+++ b/app/code/Magento/Sales/Model/Resource/Order/Invoice/Grid/StatusesArray.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Magento
+ * @package     Magento_Sales
+ * @copyright   Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Sales invoices statuses option array
+ */
+namespace Magento\Sales\Model\Resource\Order\Invoice\Grid;
+
+class StatusesArray implements \Magento\Core\Model\Option\ArrayInterface
+{
+    /**
+     * @var \Magento\Sales\Model\Order\InvoiceFactory
+     */
+    protected $_invoiceFactory;
+
+    /**
+     * @param \Magento\Sales\Model\Order\InvoiceFactory $invoiceFactory
+     */
+    public function __construct(\Magento\Sales\Model\Order\InvoiceFactory $invoiceFactory)
+    {
+        $this->_invoiceFactory = $invoiceFactory;
+    }
+
+    /**
+     * Return option array
+     *
+     * @return array
+     */
+    public function toOptionArray()
+    {
+        return $this->_invoiceFactory->create()->getStates();
+    }
+}
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_exportcsv.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_exportcsv.xml
new file mode 100644
index 0000000000000..925d6e696e1f4
--- /dev/null
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_exportcsv.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright   Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <update handle="sales_invoice_grid_block"/>
+    <block class="Magento\Backend\Block\Widget\Grid\Container" name="sales_invoice.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
+</layout>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_exportexcel.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_exportexcel.xml
new file mode 100644
index 0000000000000..925d6e696e1f4
--- /dev/null
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_exportexcel.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright   Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <update handle="sales_invoice_grid_block"/>
+    <block class="Magento\Backend\Block\Widget\Grid\Container" name="sales_invoice.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml"/>
+</layout>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_grid.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_grid.xml
new file mode 100644
index 0000000000000..cd24f1c4b6529
--- /dev/null
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_grid.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright   Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <update handle="formkey"/>
+    <update handle="sales_invoice_grid_block"/>
+    <block class="Magento\Backend\Block\Widget\Grid\Container" name="sales_invoice.grid.container" template="Magento_Backend::widget/grid/container/empty.phtml" output="1"/>
+</layout>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_grid_block.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_grid_block.xml
new file mode 100644
index 0000000000000..72193b3cb8c42
--- /dev/null
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_grid_block.xml
@@ -0,0 +1,177 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright   Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <referenceBlock name="sales_invoice.grid.container">
+        <block class="Magento\Sales\Block\Adminhtml\Invoice\Grid" name="sales.invoice.grid" as="grid">
+            <arguments>
+                <argument name="id" xsi:type="string">sales_invoice_grid</argument>
+                <argument name="dataSource" xsi:type="object">Magento\Sales\Model\Resource\Order\Invoice\Grid\Collection</argument>
+                <argument name="use_ajax" xsi:type="string">true</argument>
+                <argument name="default_sort" xsi:type="string">created_at</argument>
+                <argument name="default_dir" xsi:type="string">DESC</argument>
+                <argument name="save_parameters_in_session" xsi:type="string">1</argument>
+                <argument name="grid_url" xsi:type="url" path="*/*/grid">
+                    <param name="_current">1</param>
+                </argument>
+            </arguments>
+            <block class="Magento\Backend\Block\Widget\Grid\Massaction" name="sales.invoice.grid.massaction" as="grid.massaction">
+                <arguments>
+                    <argument name="massaction_id_field" xsi:type="string">entity_id</argument>
+                    <argument name="form_field_name" xsi:type="string">invoice_ids</argument>
+                    <argument name="use_select_all" xsi:type="string">0</argument>
+                    <argument name="options" xsi:type="array">
+                        <updater>Magento\Sales\Model\Grid\Massaction\ItemsUpdater</updater>
+                        <item name="print_invoices" xsi:type="array">
+                            <item name="label" xsi:type="string" translate="true">Print Invoices</item>
+                            <item name="url" xsi:type="string">sales/invoice/massPrintInvoices</item>
+                        </item>
+                    </argument>
+                </arguments>
+            </block>
+            <block class="Magento\Backend\Block\Widget\Grid\Export" name="sales.invoice.grid.export" as="grid.export">
+                <arguments>
+                    <argument name="exportTypes" xsi:type="array">
+                        <item name="csv" xsi:type="array">
+                            <item name="urlPath" xsi:type="string">*/*/exportCsv</item>
+                            <item name="label" xsi:type="string" translate="true">CSV</item>
+                        </item>
+                        <item name="excel" xsi:type="array">
+                            <item name="urlPath" xsi:type="string">*/*/exportExcel</item>
+                            <item name="label" xsi:type="string" translate="true">Excel XML</item>
+                        </item>
+                    </argument>
+                </arguments>
+            </block>
+            <block class="Magento\Backend\Block\Widget\Grid\ColumnSet" as="grid.columnSet" name="sales.invoice.grid.columnSet">
+                <arguments>
+                    <argument name="id" xsi:type="string">sales_invoice_grid</argument>
+                    <argument name="rowUrl" xsi:type="array">
+                        <item name="generatorClass" xsi:type="string">Magento\Sales\Model\Grid\Row\UrlGenerator</item>
+                        <item name="path" xsi:type="string">sales/invoice/view</item>
+                        <item name="extraParamsTemplate" xsi:type="array">
+                            <item name="invoice_id" xsi:type="string">getId</item>
+                        </item>
+                    </argument>
+                </arguments>
+                <block class="Magento\Backend\Block\Widget\Grid\Column" as="real_invoice_id">
+                    <arguments>
+                        <argument name="header" xsi:type="string" translate="true">Invoice</argument>
+                        <argument name="type" xsi:type="string">text</argument>
+                        <argument name="index" xsi:type="string">increment_id</argument>
+                        <argument name="id" xsi:type="string">real_invoice_id</argument>
+                        <argument name="header_css_class" xsi:type="string">col-invoice-number</argument>
+                        <argument name="column_css_class" xsi:type="string">col-invoice-number</argument>
+                    </arguments>
+                </block>
+                <block class="Magento\Backend\Block\Widget\Grid\Column" as="created_at">
+                    <arguments>
+                        <argument name="header" xsi:type="string" translate="true">Invoice Date</argument>
+                        <argument name="type" xsi:type="string">datetime</argument>
+                        <argument name="index" xsi:type="string">created_at</argument>
+                        <argument name="id" xsi:type="string">created_at</argument>
+                        <argument name="header_css_class" xsi:type="string">col-period</argument>
+                        <argument name="column_css_class" xsi:type="string">col-period</argument>
+                    </arguments>
+                </block>
+                <block class="Magento\Backend\Block\Widget\Grid\Column" as="order_increment_id">
+                    <arguments>
+                        <argument name="header" xsi:type="string" translate="true">Order</argument>
+                        <argument name="type" xsi:type="string">text</argument>
+                        <argument name="index" xsi:type="string">order_increment_id</argument>
+                        <argument name="id" xsi:type="string">order_increment_id</argument>
+                        <argument name="header_css_class" xsi:type="string">col-order-number</argument>
+                        <argument name="column_css_class" xsi:type="string">col-order-number</argument>
+                    </arguments>
+                </block>
+                <block class="Magento\Backend\Block\Widget\Grid\Column" as="order_created_at">
+                    <arguments>
+                        <argument name="header" xsi:type="string" translate="true">Order Date</argument>
+                        <argument name="type" xsi:type="string">datetime</argument>
+                        <argument name="index" xsi:type="string">order_created_at</argument>
+                        <argument name="id" xsi:type="string">order_created_at</argument>
+                        <argument name="header_css_class" xsi:type="string">col-period</argument>
+                        <argument name="column_css_class" xsi:type="string">col-period</argument>
+                    </arguments>
+                </block>
+                <block class="Magento\Backend\Block\Widget\Grid\Column" as="billing_name">
+                    <arguments>
+                        <argument name="id" xsi:type="string">billing_name</argument>
+                        <argument name="header" xsi:type="string" translate="true">Bill-to Name</argument>
+                        <argument name="index" xsi:type="string">billing_name</argument>
+                        <argument name="header_css_class" xsi:type="string">col-bill-to-name</argument>
+                        <argument name="column_css_class" xsi:type="string">col-bill-to-name</argument>
+                    </arguments>
+                </block>
+                <block class="Magento\Backend\Block\Widget\Grid\Column" as="state">
+                    <arguments>
+                        <argument name="id" xsi:type="string">state</argument>
+                        <argument name="header" xsi:type="string" translate="true">Status</argument>
+                        <argument name="type" xsi:type="string">options</argument>
+                        <argument name="index" xsi:type="string">state</argument>
+                        <argument name="options" xsi:type="options" model="Magento\Sales\Model\Resource\Order\Invoice\Grid\StatusesArray"/>
+                        <argument name="header_css_class" xsi:type="string">col-status</argument>
+                        <argument name="column_css_class" xsi:type="string">col-status</argument>
+                    </arguments>
+                </block>
+                <block class="Magento\Backend\Block\Widget\Grid\Column" as="grand_total">
+                    <arguments>
+                        <argument name="id" xsi:type="string">grand_total</argument>
+                        <argument name="header" xsi:type="string" translate="true">Grand Total (Purchased)</argument>
+                        <argument name="type" xsi:type="string">currency</argument>
+                        <argument name="currency" xsi:type="string">invoice_currency_code</argument>
+                        <argument name="rate" xsi:type="string">1</argument>
+                        <argument name="index" xsi:type="string">grand_total</argument>
+                        <argument name="header_css_class" xsi:type="string">col-gtpurchased</argument>
+                        <argument name="column_css_class" xsi:type="string">col-gtpurchased</argument>
+                    </arguments>
+                </block>
+
+                <block class="Magento\Backend\Block\Widget\Grid\Column" as="action" acl="Magento_Sales::actions_view">
+                    <arguments>
+                        <argument name="id" xsi:type="string">action</argument>
+                        <argument name="header" xsi:type="string" translate="true">Action</argument>
+                        <argument name="type" xsi:type="string">action</argument>
+                        <argument name="getter" xsi:type="string">getId</argument>
+                        <argument name="filter" xsi:type="string">0</argument>
+                        <argument name="sortable" xsi:type="string">0</argument>
+                        <argument name="is_system" xsi:type="string">1</argument>
+                        <argument name="actions" xsi:type="array">
+                            <item name="view_action" xsi:type="array">
+                                <item name="caption" xsi:type="string" translate="true">View</item>
+                                <item name="url" xsi:type="array">
+                                    <item name="base" xsi:type="string">sales/invoice/view</item>
+                                </item>
+                                <item name="field" xsi:type="string">invoice_id</item>
+                            </item>
+                        </argument>
+                        <argument name="header_css_class" xsi:type="string">col-actions</argument>
+                        <argument name="column_css_class" xsi:type="string">col-actions</argument>
+                    </arguments>
+                </block>
+            </block>
+        </block>
+    </referenceBlock>
+</layout>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_index.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_index.xml
new file mode 100644
index 0000000000000..eaac5d9c06eb5
--- /dev/null
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_invoice_index.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright   Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+-->
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <update handle="sales_invoice_grid_block"/>
+    <referenceContainer name="content">
+        <block class="Magento\Sales\Block\Adminhtml\Invoice" name="sales_invoice.grid.container"/>
+    </referenceContainer>
+</layout>