From 2e9dd31f9b08cb14f48454897d531b3ea4758c44 Mon Sep 17 00:00:00 2001
From: Anton Kaplya <akaplya@ebay.com>
Date: Wed, 13 May 2015 22:23:03 +0300
Subject: [PATCH] MAGETWO-36882: Stabilizing branch
---
.htaccess | 1 +
app/code/Magento/SalesRule/etc/di.xml | 15 +++++++++++++++
app/code/Magento/Tax/etc/di.xml | 10 ++++++++++
3 files changed, 26 insertions(+)
diff --git a/.htaccess b/.htaccess
index 404488eb7ff..9486d29c5f7 100644
--- 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
diff --git a/app/code/Magento/SalesRule/etc/di.xml b/app/code/Magento/SalesRule/etc/di.xml
index 5aa241a5a16..612dcb6f8a2 100644
--- 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>
diff --git a/app/code/Magento/Tax/etc/di.xml b/app/code/Magento/Tax/etc/di.xml
index 43e8d0247dc..6f1f1afe820 100644
--- 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>
--
GitLab