MAGETWO-54054: Merge branch 'develop' of github.com:magento/magento2ce into MAGETWO-54054
Showing
- app/code/Magento/Catalog/Api/Data/ProductAttributeInterface.php 3 additions, 1 deletion...de/Magento/Catalog/Api/Data/ProductAttributeInterface.php
- app/code/Magento/Catalog/Api/ProductTierPriceManagementInterface.php 1 addition, 0 deletions...gento/Catalog/Api/ProductTierPriceManagementInterface.php
- app/code/Magento/Catalog/Api/ScopedProductTierPriceManagementInterface.php 45 additions, 0 deletions...Catalog/Api/ScopedProductTierPriceManagementInterface.php
- app/code/Magento/Catalog/Model/Config/Source/Product/Options/Price.php 5 additions, 3 deletions...nto/Catalog/Model/Config/Source/Product/Options/Price.php
- app/code/Magento/Catalog/Model/Config/Source/ProductPriceOptionsInterface.php 21 additions, 0 deletions...alog/Model/Config/Source/ProductPriceOptionsInterface.php
- app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php 34 additions, 2 deletions...to/Catalog/Model/Indexer/Product/Price/AbstractAction.php
- app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php 102 additions, 29 deletions...oduct/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
- app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php 97 additions, 0 deletions...nto/Catalog/Model/Product/Attribute/Backend/Tierprice.php
- app/code/Magento/Catalog/Model/Product/ScopedTierPriceManagement.php 156 additions, 0 deletions...gento/Catalog/Model/Product/ScopedTierPriceManagement.php
- app/code/Magento/Catalog/Model/Product/TierPrice.php 0 additions, 6 deletionsapp/code/Magento/Catalog/Model/Product/TierPrice.php
- app/code/Magento/Catalog/Model/Product/Type/Price.php 33 additions, 3 deletionsapp/code/Magento/Catalog/Model/Product/Type/Price.php
- app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php 17 additions, 9 deletions...oduct/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
- app/code/Magento/Catalog/Model/ResourceModel/Product/Attribute/Backend/Tierprice.php 1 addition, 0 deletions...del/ResourceModel/Product/Attribute/Backend/Tierprice.php
- app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php 11 additions, 40 deletions...agento/Catalog/Model/ResourceModel/Product/Collection.php
- app/code/Magento/Catalog/Setup/UpgradeSchema.php 25 additions, 0 deletionsapp/code/Magento/Catalog/Setup/UpgradeSchema.php
- app/code/Magento/Catalog/Test/Unit/Model/Product/Type/PriceTest.php 38 additions, 14 deletions...agento/Catalog/Test/Unit/Model/Product/Type/PriceTest.php
- app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php 36 additions, 32 deletions...Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php
- app/code/Magento/Catalog/etc/di.xml 2 additions, 0 deletionsapp/code/Magento/Catalog/etc/di.xml
- app/code/Magento/Catalog/etc/extension_attributes.xml 6 additions, 0 deletionsapp/code/Magento/Catalog/etc/extension_attributes.xml
- app/code/Magento/Catalog/etc/module.xml 1 addition, 1 deletionapp/code/Magento/Catalog/etc/module.xml
Please register or sign in to comment