Merge branch 'main_develop' into bugfix (6d87d7cc) · Commits · KIII-12 / Magento

Commit 6d87d7cc authored 8 years ago by

Iryna Lagno

Merge branch 'main_develop' into bugfix

# Conflicts:
#	dev/tests/functional/tests/app/Magento/Bundle/Test/etc/di.xml

parents 1db9cef7 ab69a79a

Branches

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php 28 additions, 1 deletion

...ancedPricingImportExport/Model/Export/AdvancedPricing.php
app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php 28 additions, 9 deletions

...ancedPricingImportExport/Model/Import/AdvancedPricing.php
app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPrice.php 3 additions, 1 deletion

...port/Model/Import/AdvancedPricing/Validator/TierPrice.php
app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPriceType.php 48 additions, 0 deletions

.../Model/Import/AdvancedPricing/Validator/TierPriceType.php
app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/TierPriceTypeTest.php 78 additions, 0 deletions

...el/Import/AdvancedPricing/Validator/TierPriceTypeTest.php
app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php 126 additions, 24 deletions

...portExport/Test/Unit/Model/Import/AdvancedPricingTest.php
app/code/Magento/AdvancedPricingImportExport/etc/di.xml 1 addition, 0 deletions

app/code/Magento/AdvancedPricingImportExport/etc/di.xml
app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js 1 addition, 1 deletion

...ew/frontend/web/js/view/payment/method-renderer/paypal.js
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 deletions

app/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 deletions

app/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 deletions

app/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

with 912 additions and 355 deletions

Please register or to comment

Admin message

Merge branch 'main_develop' into bugfix