Merge remote-tracking branch 'magento2/develop' into MAGETWO-60611 (6415b1f3) · Commits · KIII-12 / Magento

There was an error fetching the commit references. Please try again later.

Commit 6415b1f3 authored 8 years ago by

Maxim Medinskiy

Browse files

Merge remote-tracking branch 'magento2/develop' into MAGETWO-60611

parents 475c4b4f 71f4018a

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 18 additions, 4 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/Catalog/Block/Product/View.php 12 additions, 18 deletions

app/code/Magento/Catalog/Block/Product/View.php
app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/TierPriceTest.php 141 additions, 0 deletions

...t/Ui/DataProvider/Product/Form/Modifier/TierPriceTest.php
app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/TierPrice.php 171 additions, 0 deletions

...talog/Ui/DataProvider/Product/Form/Modifier/TierPrice.php
app/code/Magento/Catalog/etc/adminhtml/di.xml 4 additions, 0 deletions

app/code/Magento/Catalog/etc/adminhtml/di.xml
app/code/Magento/Catalog/view/adminhtml/web/js/tier-price/percentage-processor.js 73 additions, 0 deletions

.../view/adminhtml/web/js/tier-price/percentage-processor.js
app/code/Magento/Catalog/view/adminhtml/web/js/tier-price/value-type-select.js 118 additions, 0 deletions

...log/view/adminhtml/web/js/tier-price/value-type-select.js
app/code/Magento/Catalog/view/adminhtml/web/js/utils/percentage-price-calculator.js 45 additions, 0 deletions

...iew/adminhtml/web/js/utils/percentage-price-calculator.js
app/code/Magento/Catalog/view/frontend/templates/product/view/addtocart.phtml 3 additions, 3 deletions

...alog/view/frontend/templates/product/view/addtocart.phtml
app/code/Magento/CatalogImportExport/Model/Import/Product/RowValidatorInterface.php 2 additions, 0 deletions

...portExport/Model/Import/Product/RowValidatorInterface.php
app/code/Magento/Checkout/view/frontend/templates/cart/item/configure/updatecart.phtml 7 additions, 1 deletion

...w/frontend/templates/cart/item/configure/updatecart.phtml
app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml 0 additions, 1 deletion

.../Checkout/view/frontend/templates/cart/item/default.phtml
app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html 1 addition, 2 deletions

...out/view/frontend/web/template/minicart/item/default.html
app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php 12 additions, 0 deletions

...figurableProduct/Block/Product/View/Type/Configurable.php

with 891 additions and 55 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'magento2/develop' into MAGETWO-60611