Merge branch 'develop' into MAGETWO-31191
Showing
- app/code/Magento/Backend/etc/di.xml 0 additions, 1 deletionapp/code/Magento/Backend/etc/di.xml
- app/code/Magento/Checkout/Controller/Cart/Index.php 1 addition, 0 deletionsapp/code/Magento/Checkout/Controller/Cart/Index.php
- app/code/Magento/Core/etc/di.xml 0 additions, 2 deletionsapp/code/Magento/Core/etc/di.xml
- app/code/Magento/OfflinePayments/Block/Form/AbstractInstruction.php 32 additions, 0 deletions...agento/OfflinePayments/Block/Form/AbstractInstruction.php
- app/code/Magento/OfflinePayments/Block/Form/Banktransfer.php 1 addition, 21 deletionsapp/code/Magento/OfflinePayments/Block/Form/Banktransfer.php
- app/code/Magento/OfflinePayments/Block/Form/Cashondelivery.php 1 addition, 21 deletions...ode/Magento/OfflinePayments/Block/Form/Cashondelivery.php
- app/code/Magento/OfflinePayments/Model/Banktransfer.php 0 additions, 10 deletionsapp/code/Magento/OfflinePayments/Model/Banktransfer.php
- app/code/Magento/OfflinePayments/Model/Observer.php 5 additions, 3 deletionsapp/code/Magento/OfflinePayments/Model/Observer.php
- app/code/Magento/OfflineShipping/Model/Config/Backend/Tablerate.php 3 additions, 1 deletion...agento/OfflineShipping/Model/Config/Backend/Tablerate.php
- app/code/Magento/OfflineShipping/Model/Observer/SalesRule/ActionsTab.php 17 additions, 15 deletions...o/OfflineShipping/Model/Observer/SalesRule/ActionsTab.php
- app/code/Magento/Payment/Block/Info/Instructions.php 1 addition, 1 deletionapp/code/Magento/Payment/Block/Info/Instructions.php
- dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Form/AbstractInstructionTest.php 40 additions, 0 deletions...to/OfflinePayments/Block/Form/AbstractInstructionTest.php
- dev/tests/unit/testsuite/Magento/OfflinePayments/Block/Info/CheckmoTest.php 85 additions, 0 deletions...tsuite/Magento/OfflinePayments/Block/Info/CheckmoTest.php
- dev/tests/unit/testsuite/Magento/OfflinePayments/Model/BanktransferTest.php 7 additions, 2 deletions...tsuite/Magento/OfflinePayments/Model/BanktransferTest.php
- dev/tests/unit/testsuite/Magento/OfflinePayments/Model/CashondeliveryTest.php 7 additions, 2 deletions...uite/Magento/OfflinePayments/Model/CashondeliveryTest.php
- dev/tests/unit/testsuite/Magento/OfflinePayments/Model/CheckmoTest.php 80 additions, 0 deletions...t/testsuite/Magento/OfflinePayments/Model/CheckmoTest.php
- dev/tests/unit/testsuite/Magento/OfflinePayments/Model/ObserverTest.php 84 additions, 0 deletions.../testsuite/Magento/OfflinePayments/Model/ObserverTest.php
- dev/tests/unit/testsuite/Magento/OfflinePayments/Model/PurchaseorderTest.php 52 additions, 0 deletions...suite/Magento/OfflinePayments/Model/PurchaseorderTest.php
- dev/tests/unit/testsuite/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/GridTest.php 127 additions, 0 deletions...neShipping/Block/Adminhtml/Carrier/Tablerate/GridTest.php
- dev/tests/unit/testsuite/Magento/OfflineShipping/Model/Config/Backend/TablerateTest.php 51 additions, 0 deletions...to/OfflineShipping/Model/Config/Backend/TablerateTest.php
Please register or sign in to comment