Merge pull request #621 from magento-troll/bugfixes
[Troll] Bugfixes
Showing
- app/code/Magento/CatalogRule/Model/Rule.php 52 additions, 0 deletionsapp/code/Magento/CatalogRule/Model/Rule.php
- app/code/Magento/CatalogRule/Test/Unit/Model/RuleTest.php 114 additions, 4 deletionsapp/code/Magento/CatalogRule/Test/Unit/Model/RuleTest.php
- app/code/Magento/CatalogRule/i18n/de_DE.csv 3 additions, 0 deletionsapp/code/Magento/CatalogRule/i18n/de_DE.csv
- app/code/Magento/CatalogRule/i18n/en_US.csv 3 additions, 0 deletionsapp/code/Magento/CatalogRule/i18n/en_US.csv
- app/code/Magento/CatalogRule/i18n/es_ES.csv 3 additions, 0 deletionsapp/code/Magento/CatalogRule/i18n/es_ES.csv
- app/code/Magento/CatalogRule/i18n/fr_FR.csv 3 additions, 0 deletionsapp/code/Magento/CatalogRule/i18n/fr_FR.csv
- app/code/Magento/CatalogRule/i18n/nl_NL.csv 3 additions, 0 deletionsapp/code/Magento/CatalogRule/i18n/nl_NL.csv
- app/code/Magento/CatalogRule/i18n/pt_BR.csv 3 additions, 0 deletionsapp/code/Magento/CatalogRule/i18n/pt_BR.csv
- app/code/Magento/CatalogRule/i18n/zh_CN.csv 3 additions, 0 deletionsapp/code/Magento/CatalogRule/i18n/zh_CN.csv
- app/code/Magento/CatalogRule/view/adminhtml/templates/promo/js.phtml 39 additions, 1 deletion...gento/CatalogRule/view/adminhtml/templates/promo/js.phtml
- app/code/Magento/Rule/Model/AbstractModel.php 9 additions, 9 deletionsapp/code/Magento/Rule/Model/AbstractModel.php
- app/code/Magento/Sales/Block/Adminhtml/Report/Filter/Form.php 1 addition, 1 deletion...code/Magento/Sales/Block/Adminhtml/Report/Filter/Form.php
Please register or sign in to comment