[CartPromotion][API][UI] Apply on discounted flag added #13328
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
AdamKasp
commented
Nov 24, 2021
•
AdamKasp
commented
| Q | A |
|---|---|
| Branch? | master |
| Bug fix? | no |
| New feature? | yes |
| BC breaks? | no |
| License | MIT |
AdamKasp
changed the title
AdamKasp
force-pushed
the
apply-on-discounted-toogle-added-to-cart-promotion-form
branch
from
91469cd
to
18c4f06
Compare
probot-autolabeler
bot
added
Admin
SirDomin
approved these changes
Nov 25, 2021
lchrusciel
reviewed
Nov 25, 2021
src/Sylius/Behat/Context/Api/Admin/ManagingPromotionsContext.php
Outdated
Show resolved
Hide resolved
src/Sylius/Bundle/CoreBundle/Migrations/Version20211124101833.php
Outdated
Show resolved
Hide resolved
| "rules": [], | ||
| "actions": [], | ||
| "applyOnDiscounted": false, | ||
| "createdAt": @string@, |
There was a problem hiding this comment.
Suggested change
| "createdAt": @string@, | |
| "createdAt": @string@.isDateTime(), |
| "actions": [], | ||
| "applyOnDiscounted": false, | ||
| "createdAt": @string@, | ||
| "updatedAt": @string@ |
There was a problem hiding this comment.
Suggested change
| "updatedAt": @string@ | |
| "updatedAt": @string@.isDateTime() |
There was a problem hiding this comment.
it doesn't work in this way, the checker see it as a string @string@.isDateTime()
AdamKasp
force-pushed
the
apply-on-discounted-toogle-added-to-cart-promotion-form
branch
from
18c4f06
to
890948d
Compare
GSadee
reviewed
Dec 1, 2021
src/Sylius/Bundle/PromotionBundle/Resources/config/doctrine/model/Promotion.orm.xml
Outdated
Show resolved
Hide resolved
src/Sylius/Bundle/PromotionBundle/Resources/config/doctrine/model/Promotion.orm.xml
Outdated
Show resolved
Hide resolved
AdamKasp
force-pushed
the
apply-on-discounted-toogle-added-to-cart-promotion-form
branch
from
9dc073e
to
105b62f
Compare
GSadee
reviewed
Dec 1, 2021
src/Sylius/Bundle/PromotionBundle/Resources/config/doctrine/model/Promotion.orm.xml
Outdated
Show resolved
Hide resolved
features/promotion/managing_promotions/adding_promotion.feature
Outdated
Show resolved
Hide resolved
AdamKasp
force-pushed
the
apply-on-discounted-toogle-added-to-cart-promotion-form
branch
from
5af5b6e
to
5d007dc
Compare
CoderMaggie
requested changes
Dec 1, 2021
src/Sylius/Bundle/PromotionBundle/Resources/translations/messages.en.yml
Outdated
Show resolved
Hide resolved
src/Sylius/Bundle/PromotionBundle/Resources/translations/messages.en.yml
Outdated
Show resolved
Hide resolved
AdamKasp
force-pushed
the
apply-on-discounted-toogle-added-to-cart-promotion-form
branch
2 times, most recently
from
629c8b1
to
290c5dd
Compare
AdamKasp
force-pushed
the
apply-on-discounted-toogle-added-to-cart-promotion-form
branch
from
290c5dd
to
81539f5
Compare
GSadee
approved these changes
Dec 2, 2021
|
Thanks, Adam! 🥇 |
AdamKasp
added a commit
that referenced
this pull request
Dec 9, 2021
…nly on non discounted products (GSadee, SirDomin) This PR was merged into the 1.11-dev branch. Discussion ---------- | Q | A | --------------- | ----- | Branch? | master | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Related tickets | based on #13328 | License | MIT <!-- - Bug fixes must be submitted against the 1.10 branch - Features and deprecations must be submitted against the master branch - Make sure that the correct base branch is set To be sure you are not breaking any Backward Compatibilities, check the documentation: https://docs.sylius.com/en/latest/book/organization/backward-compatibility-promise.html --> Commits ------- 4413793 [CartPromotion][CatalogPromotion][Behat] Add scenarios for receiving discount only on non discounted products a65561e [CartPromotion][CatalogPromotion][Behat] Implement scenarios for receiving discount only on non discounted products 3556f47 [CartPromotion][CatalogPromotion][Behat] Fixes after rebase with changing the name of field 1f1e798 [CartPromotion][CatalogPromotion] Receiving discount only on non discounted products for unit cart promotions 372365b [WIP][CartPromotion][CatalogPromotion] Receiving discount only on non discounted products for fixed order cart promotions e735927 [CartPromotion] handle fixed and percentage order discount 9ce4cb8 [MinimumPrice][ApplyOnDiscounted] merge solutions for apply on discount and minimum prices
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.