Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Quantity Price Rules #791

Merged
merged 34 commits into from
Feb 13, 2019
Merged

Quantity Price Rules #791

merged 34 commits into from
Feb 13, 2019

Conversation

solverat
Copy link
Contributor

Q A
Bug fix? yes/no
New feature? yes/no
BC breaks? no
Deprecations? yes/no
Fixed tickets #790

=> More Info / Discussion

@CLAassistant
Copy link

CLAassistant commented Jan 28, 2019 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

dpfaffenbauer
dpfaffenbauer requested changes Jan 28, 2019
View reviewed changes
Copy link
Member

@dpfaffenbauer dpfaffenbauer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we merge that into the Core, we should move it to ProductComponent and ProductBundle.

...eShop/Bundle/CoreBundle/Resources/public/pimcore/js/coreExtension/tags/coreShopStorePrice.js Outdated Show resolved Hide resolved
src/CoreShop/Bundle/FrontendBundle/Resources/views/Product/detail.html.twig Show resolved Hide resolved
src/CoreShop/Bundle/TierPricingBundle/Form/Type/ProductSpecificTierPriceRangeType.php Outdated Show resolved Hide resolved
src/CoreShop/Bundle/TierPricingBundle/Resources/config/pimcore/admin.yml Outdated Show resolved Hide resolved
src/CoreShop/Bundle/TierPricingBundle/composer.json Outdated Show resolved Hide resolved
@solverat solverat mentioned this pull request Jan 28, 2019
Closed
@dpfaffenbauer dpfaffenbauer requested a review from a team January 28, 2019 12:49
@dpfaffenbauer dpfaffenbauer added this to the 2.1.0 milestone Jan 28, 2019
@dpfaffenbauer dpfaffenbauer changed the title Tier Pricing [WIP] Tier Pricing Jan 30, 2019
solverat and others added 20 commits February 7, 2019 10:03
@solverat
implement tier_pricing
ce58f19
@solverat
improve percentage calculation
3731d32
@solverat
refactor tier pricing: use tier pricing rules
f27f852
@solverat
implement tier price calculator
84d4d37
@solverat
improve tier price calculation, fetch extjs ids in rule manager
4d6d03f
@solverat
implement range calculation, range ux improvements
9d50b89
@solverat
fix percentage calculation
031bf11
@solverat
implement clipboard manager to allow copy / paste or ranges
9fdd6dc
@solverat
improve inheritance state
bd5aa09
@solverat
fix condition id mapping
0e44c8e
@solverat
implement pricing behaviour
d07ee7b
@solverat
remove debug comments
85d27d6
@solverat
update migration
127a1eb
@dpfaffenbauer @solverat
refactor tier-pricing to move stuff into core and decouple from product
0c0ff6a
@dpfaffenbauer @solverat
[TierPricing] fix readme
7f3abb9
@solverat
implement currency aware tier range prices
a5d030b
@solverat
copy currency on new tier row addition
c2cfad8
@solverat
remove legacy debug code
f6de4e1
@solverat
implement migration, improve usability
aee93c6
@dpfaffenbauer @solverat
[WIP][TierPricing] decouple from tier-pricing bundle to core and allo…
13109aa 
…w the same UI
@solverat solverat changed the title [WIP] Tier Pricing [WIP] Quantity Price Rules Feb 7, 2019
dpfaffenbauer
dpfaffenbauer requested changes Feb 8, 2019
View reviewed changes
src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/composer.json
"require": {
"coreshop/product-quantity-price-rules": "^2.1",
"coreshop/rule-bundle": "^2.1",
"coreshop/money-bundle": "^2.1",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does it really need 2.1 for these?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2.0 should be sufficient.

...tendBundle/Resources/views/ProductQuantityPriceRanges/quantity_price_ranges_volume.html.twig Show resolved Hide resolved
...esBundle/Resources/public/pimcore/js/coreExtension/tags/coreShopProductQuantityPriceRules.js Outdated Show resolved Hide resolved
...uantityPriceRulesBundle/Resources/public/pimcore/js/productQuantityPriceRules/object/item.js Outdated Show resolved Hide resolved
src/CoreShop/Component/ProductQuantityPriceRules/Calculator/VolumeCalculator.php Outdated Show resolved Hide resolved
src/CoreShop/Component/ProductQuantityPriceRules/Fetcher/QuantityPriceFetcher.php Outdated Show resolved Hide resolved
src/CoreShop/Component/ProductQuantityPriceRules/Fetcher/QuantityPriceFetcher.php Outdated Show resolved Hide resolved
src/CoreShop/Component/ProductQuantityPriceRules/Fetcher/QuantityPriceFetcher.php Outdated Show resolved Hide resolved
src/CoreShop/Component/ProductQuantityPriceRules/Model/ProductQuantityPriceRuleInterface.php
public function getCalculationBehaviour();

/**
* {@inheritdoc}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

inherits from where? ;)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

still not fixed

src/CoreShop/Component/ProductQuantityPriceRules/Model/ProductQuantityPriceRule.php Outdated Show resolved Hide resolved
@dpfaffenbauer
Copy link
Member

is this ready now?

@solverat
Copy link
Contributor Author

@dpfaffenbauer besides the missing tests described here - yes! 👍

@dpfaffenbauer
Copy link
Member

@solverat can you please create the scenarios and also check my comments.

@dpfaffenbauer dpfaffenbauer changed the title [WIP] Quantity Price Rules Quantity Price Rules Feb 13, 2019
@dpfaffenbauer dpfaffenbauer merged commit 1898b75 into coreshop:master Feb 13, 2019
@dpfaffenbauer dpfaffenbauer mentioned this pull request Feb 13, 2019
Merged
@solverat solverat deleted the tier-pricing branch February 20, 2019 10:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dpfaffenbauer dpfaffenbauer dpfaffenbauer approved these changes

Assignees

@solverat solverat

@dpfaffenbauer dpfaffenbauer

Labels
new feature
Projects
None yet
Milestone
2.1.0-RC.2
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@solverat @CLAassistant @dpfaffenbauer