There was an error fetching the commit references. Please try again later.
Merge branch 'develop' of https://github.com/magento/magento2ce into MAGETWO-60453
Showing
- app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php 22 additions, 0 deletions...Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
- app/code/Magento/Bundle/Model/Product/Type.php 38 additions, 51 deletionsapp/code/Magento/Bundle/Model/Product/Type.php
- app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php 124 additions, 2 deletions...gento/Bundle/Model/ResourceModel/Selection/Collection.php
- app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php 45 additions, 41 deletionsapp/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
- app/code/Magento/Bundle/Pricing/Adjustment/DefaultSelectionPriceListProvider.php 208 additions, 0 deletions.../Pricing/Adjustment/DefaultSelectionPriceListProvider.php
- app/code/Magento/Bundle/Pricing/Adjustment/SelectionPriceListProviderInterface.php 23 additions, 0 deletions...ricing/Adjustment/SelectionPriceListProviderInterface.php
- app/code/Magento/Bundle/Pricing/Price/BundleSelectionFactory.php 2 additions, 8 deletions...e/Magento/Bundle/Pricing/Price/BundleSelectionFactory.php
- app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php 17 additions, 5 deletions...ode/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php
- app/code/Magento/Bundle/Test/Unit/Block/Catalog/Product/View/Type/BundleTest.php 40 additions, 17 deletions.../Test/Unit/Block/Catalog/Product/View/Type/BundleTest.php
- app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php 57 additions, 126 deletionsapp/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php
- app/code/Magento/Bundle/Test/Unit/Pricing/Adjustment/CalculatorTest.php 23 additions, 47 deletions...to/Bundle/Test/Unit/Pricing/Adjustment/CalculatorTest.php
- app/code/Magento/Bundle/Test/Unit/Pricing/Price/BundleSelectionFactoryTest.php 0 additions, 22 deletions...le/Test/Unit/Pricing/Price/BundleSelectionFactoryTest.php
- app/code/Magento/Bundle/etc/di.xml 1 addition, 0 deletionsapp/code/Magento/Bundle/etc/di.xml
- app/code/Magento/Catalog/Model/Product.php 4 additions, 0 deletionsapp/code/Magento/Catalog/Model/Product.php
- app/code/Magento/CatalogRule/Model/ResourceModel/Product/CollectionProcessor.php 95 additions, 0 deletions...gRule/Model/ResourceModel/Product/CollectionProcessor.php
- app/code/Magento/CatalogRuleConfigurable/Plugin/ConfigurableProduct/Model/ResourceModel/AddCatalogRulePrice.php 8 additions, 60 deletions...urableProduct/Model/ResourceModel/AddCatalogRulePrice.php
- app/code/Magento/CatalogRuleConfigurable/composer.json 0 additions, 2 deletionsapp/code/Magento/CatalogRuleConfigurable/composer.json
- dev/tests/functional/composer.json 1 addition, 1 deletiondev/tests/functional/composer.json
- dev/tests/functional/lib/Magento/Mtf/App/State/State1.php 1 addition, 1 deletiondev/tests/functional/lib/Magento/Mtf/App/State/State1.php
- dev/tests/functional/tests/app/Magento/Authorizenet/Test/TestCase/OnePageCheckoutTest.xml 0 additions, 4 deletions...agento/Authorizenet/Test/TestCase/OnePageCheckoutTest.xml
Please register or sign in to comment