MAGETWO-36882: Stabilizing branch

2e9dd31f · Anton Kaplya · valdislav · f90a7150 · 2e9dd31f · 2e9dd31f
Commit 2e9dd31f authored 10 years ago by Anton Kaplya Committed by valdislav 10 years ago
--- a/.htaccess
+++ b/.htaccess
@@ -189,3 +189,4 @@
 ## http://developer.yahoo.com/performance/rules.html#etags

    #FileETag none
+SetEnv MAGE_MODE developer
\ No newline at end of file
--- a/app/code/Magento/SalesRule/etc/di.xml
+++ b/app/code/Magento/SalesRule/etc/di.xml
@@ -24,4 +24,19 @@
            </argument>
        </arguments>
    </type>
+    <type name="Magento\SalesRule\Model\Resource\Report\Rule">
+        <arguments>
+            <argument name="resourcePrefix" xsi:type="string">sales</argument>
+        </arguments>
+    </type>
+    <type name="Magento\SalesRule\Model\Resource\Report\Rule\Createdat">
+        <arguments>
+            <argument name="resourcePrefix" xsi:type="string">sales</argument>
+        </arguments>
+    </type>
+    <type name="Magento\SalesRule\Model\Resource\Report\Rule\Updatedat">
+        <arguments>
+            <argument name="resourcePrefix" xsi:type="string">sales</argument>
+        </arguments>
+    </type>
 </config>
--- a/app/code/Magento/Tax/etc/di.xml
+++ b/app/code/Magento/Tax/etc/di.xml
@@ -62,4 +62,14 @@
    <type name="Magento\Quote\Model\Quote\Address\ToOrder">
        <plugin name="add_tax_to_order" type="Magento\Tax\Model\Quote\ToOrderConverter"/>
    </type>
+    <type name="Magento\Tax\Model\Resource\Report\Tax\Createdat">
+        <arguments>
+            <argument name="resourcePrefix" xsi:type="string">sales</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Tax\Model\Resource\Report\Tax\Updatedat">
+        <arguments>
+            <argument name="resourcePrefix" xsi:type="string">sales</argument>
+        </arguments>
+    </type>
 </config>