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

Catalog promotions action #13029

Merged
merged 5 commits into from
Sep 1, 2021
Merged

Catalog promotions action #13029

merged 5 commits into from
Sep 1, 2021

Conversation

SirDomin
Copy link
Contributor

Q A
Branch? master
Bug fix? no
New feature? yes
BC breaks?
Deprecations? no
Related tickets
License MIT

@SirDomin SirDomin added the API APIs related issues and PRs. label Aug 30, 2021
@SirDomin SirDomin requested a review from a team as a code owner August 30, 2021 12:48
GSadee
GSadee reviewed Aug 31, 2021
View reviewed changes
features/promotion/managing_catalog_promotions/creating_catalog_promotion.feature Outdated Show resolved Hide resolved
features/promotion/managing_catalog_promotions/editing_catalog_promotion.feature Outdated Show resolved Hide resolved
src/Sylius/Behat/Context/Api/Admin/ManagingCatalogPromotionsContext.php Outdated Show resolved Hide resolved
src/Sylius/Behat/Context/Api/Admin/ManagingCatalogPromotionsContext.php Outdated Show resolved Hide resolved
src/Sylius/Bundle/ApiBundle/Resources/config/serialization/CatalogPromotion.xml Outdated Show resolved Hide resolved
...Sylius/Bundle/PromotionBundle/Resources/config/doctrine/model/CatalogPromotionAction.orm.xml Outdated Show resolved Hide resolved
src/Sylius/Component/Promotion/Model/CatalogPromotion.php Outdated Show resolved Hide resolved
@SirDomin SirDomin mentioned this pull request Aug 31, 2021
Merged
loevgaard
loevgaard reviewed Aug 31, 2021
View reviewed changes
src/Sylius/Bundle/PromotionBundle/DependencyInjection/Configuration.php
->addDefaultsIfNotSet()
->children()
->scalarNode('model')->defaultValue(CatalogPromotionAction::class)->cannotBeEmpty()->end()
->scalarNode('interface')->defaultValue(CatalogPromotionActionInterface::class)->cannotBeEmpty()->end()
Copy link
Contributor

Choose a reason for hiding this comment

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

Isn't needed anymore

Suggested change
->scalarNode('interface')->defaultValue(CatalogPromotionActionInterface::class)->cannotBeEmpty()->end()

Copy link
Member

Choose a reason for hiding this comment

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

Indeed 👍 but to be consistent with other configurations I would leave it for now and remove altogether later 🖖

@Zales0123 Zales0123 mentioned this pull request Aug 31, 2021
Merged
@Zales0123 Zales0123 mentioned this pull request Aug 31, 2021
Merged
GSadee
GSadee approved these changes Sep 1, 2021
View reviewed changes
src/Sylius/Component/Core/Model/CatalogPromotionInterface.php
@@ -18,4 +18,5 @@

interface CatalogPromotionInterface extends BaseCatalogPromotionInterface, ChannelsAwareInterface
{
public const TYPE_CONTAINS_VARIANTS = 'contains_variants';
Copy link
Member

Choose a reason for hiding this comment

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

This type should be on CatalogPromotionRuleInterface in Core, and it has been already changed to for_variants

@GSadee GSadee merged commit e72f524 into Sylius:master Sep 1, 2021
@GSadee
Copy link
Member

GSadee commented Sep 1, 2021

Thanks, @SirDomin! 🥇

GSadee added a commit that referenced this pull request Sep 1, 2021
@GSadee
feature #13036 [CatalogPromotions] Use actions for discount applicati…
d74cb00 
…on (Zales0123)

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 #13029
| License         | MIT

Commits
-------

7a01498 Use CatalogPromotion actions for discounts application
d0afff7 PR review fixes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@loevgaard loevgaard loevgaard left review comments

@Zales0123 Zales0123 Zales0123 left review comments

@lchrusciel lchrusciel lchrusciel left review comments

@AdamKasp AdamKasp AdamKasp left review comments

@GSadee GSadee GSadee approved these changes

@Arminek Arminek Arminek approved these changes

Assignees
No one assigned
Labels
API APIs related issues and PRs.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@SirDomin @GSadee @loevgaard @Zales0123 @lchrusciel @Arminek @AdamKasp