Merge remote-tracking branch 'origin/MDVA-189' into 2.0.5_backlog

Author: magento-services-vantiv-deploy

app/code/Magento/Backend/Helper/Dashboard/Order.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Backend\Helper\Dashboard;
 
+use Magento\Framework\App\ObjectManager;
+
 /**
  * Adminhtml dashboard helper for orders
  */
@@ -15,6 +17,11 @@ class Order extends \Magento\Backend\Helper\Dashboard\AbstractDashboard
      */
     protected $_orderCollection;
 
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    protected $_storeManager;
+
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Reports\Model\ResourceModel\Order\Collection $orderCollection
@@ -41,17 +48,31 @@ protected function _initCollection()
         if ($this->getParam('store')) {
             $this->_collection->addFieldToFilter('store_id', $this->getParam('store'));
         } elseif ($this->getParam('website')) {
-            $storeIds = $this->_storeManager->getWebsite($this->getParam('website'))->getStoreIds();
+            $storeIds = $this->getStoreManager()->getWebsite($this->getParam('website'))->getStoreIds();
             $this->_collection->addFieldToFilter('store_id', ['in' => implode(',', $storeIds)]);
         } elseif ($this->getParam('group')) {
-            $storeIds = $this->_storeManager->getGroup($this->getParam('group'))->getStoreIds();
+            $storeIds = $this->getStoreManager()->getGroup($this->getParam('group'))->getStoreIds();
             $this->_collection->addFieldToFilter('store_id', ['in' => implode(',', $storeIds)]);
         } elseif (!$this->_collection->isLive()) {
             $this->_collection->addFieldToFilter(
                 'store_id',
-                ['eq' => $this->_storeManager->getStore(\Magento\Store\Model\Store::ADMIN_CODE)->getId()]
+                ['eq' => $this->getStoreManager()->getStore(\Magento\Store\Model\Store::ADMIN_CODE)->getId()]
             );
         }
         $this->_collection->load();
     }
+
+    /**
+     * Get Store Manager
+     *
+     * @return \Magento\Store\Model\StoreManagerInterface
+     */
+    public function getStoreManager()
+    {
+        if (!$this->_storeManager) {
+            $this->_storeManager = ObjectManager::getInstance()->get('Magento\Store\Model\StoreManager');
+        }
+
+        return $this->_storeManager;
+    }
 }

app/code/Magento/Sales/etc/adminhtml/system.xml

@@ -109,7 +109,7 @@
             <group id="dashboard" translate="label,comment" sortOrder="60" showInDefault="1" showInWebsite="0" showInStore="0">
                 <label>Dashboard</label>
                 <field id="use_aggregated_data" translate="label" sortOrder="10" type="select" showInDefault="1" showInWebsite="0" showInStore="0">
-                    <label>Use Aggregated Data (beta)</label>
+                    <label>Use Aggregated Data</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>Improves dashboard performance but provides non-realtime data.</comment>
                 </field>

app/code/Magento/Sales/i18n/en_US.csv

@@ -615,7 +615,7 @@ Comma-separated,Comma-separated
 "We'll use the default description above if you leave this empty.","We'll use the default description above if you leave this empty."
 "Multi-address Error to Show in Shopping Cart","Multi-address Error to Show in Shopping Cart"
 "We'll use the default error above if you leave this empty.","We'll use the default error above if you leave this empty."
-"Use Aggregated Data (beta)","Use Aggregated Data (beta)"
+"Use Aggregated Data","Use Aggregated Data"
 "Sales Emails","Sales Emails"
 "New Order Confirmation Email Sender","New Order Confirmation Email Sender"
 "New Order Confirmation Template","New Order Confirmation Template"