Merge pull request #596 from magento-troll/sprint23 (78ef9914) · Commits · KIII-12 / Magento

Commit 78ef9914 authored 8 years ago by

Roman Ganin Committed by GitHub 8 years ago

Merge pull request #596 from magento-troll/sprint23

MAGETWO-60634: Add Price Type into Tier Prices

parents a9a65c7c 2ad1a87a

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/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/CatalogImportExport/Model/Import/Product/RowValidatorInterface.php 2 additions, 0 deletions

...portExport/Model/Import/Product/RowValidatorInterface.php
app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php 34 additions, 19 deletions

...de/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
app/code/Magento/ImportExport/Files/Sample/advanced_pricing.csv 5 additions, 5 deletions

...de/Magento/ImportExport/Files/Sample/advanced_pricing.csv
app/code/Magento/ImportExport/composer.json 1 addition, 0 deletions

app/code/Magento/ImportExport/composer.json
dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Section/AdvancedPricing/OptionTier.xml 7 additions, 0 deletions

...nhtml/Product/Edit/Section/AdvancedPricing/OptionTier.xml
dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductTierPriceInCart.php 129 additions, 0 deletions

.../Catalog/Test/Constraint/AssertProductTierPriceInCart.php
dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product/TierPrice.xml 24 additions, 0 deletions

...app/Magento/Catalog/Test/Repository/Product/TierPrice.xml

with 1056 additions and 54 deletions

Please register or to comment

Admin message

Merge pull request #596 from magento-troll/sprint23