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.

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

Promotions Feature Branch signed #6842

Merged
merged 230 commits into from
Jun 9, 2023
Merged

Promotions Feature Branch signed #6842

merged 230 commits into from
Jun 9, 2023

Conversation

vanpho93
Copy link
Member

Long standing PR for Promotions Feature

brent-hoover and others added 30 commits May 19, 2023 10:09
Signed-off-by: Brent Hoover <[email protected]>
Signed-off-by: vanpho93 <[email protected]>
Signed-off-by: Brent Hoover <[email protected]>
Signed-off-by: Brian Nguyen <[email protected]>
Signed-off-by: Brent Hoover <[email protected]>
@changeset-bot
Copy link

changeset-bot bot commented May 22, 2023

🦋 Changeset detected

Latest commit: cf8069a

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 2 packages
Name Type
@reactioncommerce/api-plugin-promotions Minor
reaction Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

vanpho93 added 4 commits May 22, 2023 13:59
…bination-of-promotions

feat: stackability resolution strategy
@vanpho93 vanpho93 force-pushed the feat/promotions-signed branch from 909b6f1 to 8ec22b2 Compare May 23, 2023 10:16
sujithvn and others added 10 commits May 24, 2023 16:37
conflict resolved: pnpm-lock

Signed-off-by: Sujith <[email protected]>
Signed-off-by: Sujith <[email protected]>
Conflicts resolved:
	apps/reaction/tests/integration/api/mutations/checkout/checkoutTestsCommon.js
	apps/reaction/tests/util/factory.js
	packages/api-plugin-carts/src/index.js
	packages/api-plugin-carts/src/resolvers/Mutation/index.js
	packages/api-plugin-carts/src/util/addCartItems.js
	packages/api-plugin-carts/src/xforms/xformCartCheckout.js
	packages/api-plugin-orders/src/index.js
	packages/api-plugin-orders/src/mutations/placeOrder.js
	packages/api-plugin-orders/src/util/addShipmentMethodToGroup.js

Signed-off-by: Sujith <[email protected]>
Signed-off-by: Sujith <[email protected]>
@sujithvn sujithvn self-requested a review June 7, 2023 04:19
Copy link
Contributor

@sujithvn sujithvn left a comment

Choose a reason for hiding this comment

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

Initial tests looks fine. Will perform complete testing once more after merging to release-5 branch along with FFT

@sujithvn sujithvn merged commit 5264638 into release-5 Jun 9, 2023
@github-actions github-actions bot mentioned this pull request Jun 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants