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

Coupons feature branch #6769

Merged
merged 52 commits into from
May 19, 2023
Merged

Coupons feature branch #6769

merged 52 commits into from
May 19, 2023

Conversation

vanpho93
Copy link
Member

No description provided.

@vanpho93
feat: create standard coupon mutation
e1e82a2 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
@vanpho93
feat: improve apply coupon mutation
f65959b 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
@vanpho93
feat: remove coupon from cart mutation
e1353bd 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
@vanpho93
Merge pull request #6735 from reactioncommerce/feat/improve-apply-cou…
db17285 
…pon-mutation

feat: improve apply coupon mutation
@vanpho93
Merge pull request #6736 from reactioncommerce/feat/add-remove-coupon…
13b876e 
…-from-cart-mutation

feat: remove coupon from cart mutation
@vanpho93
Merge pull request #6734 from reactioncommerce/feat/create-standard-c…
df9de17 
…oupon

feat: create standard coupon
@changeset-bot
Copy link

changeset-bot bot commented Jan 30, 2023 •
edited

⚠️ No Changeset found

Latest commit: e0c0e7c

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

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

vanpho93 and others added 23 commits January 30, 2023 17:02
@vanpho93
feat: update coupon trigger parameter schema
343703a 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
@vanpho93
feat: add name field to coupon
1d83098 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
@vanpho93
Merge pull request #6770 from reactioncommerce/feat/update-coupon-tri…
65e9795 
…gger-parameter-schema

feat: update coupon trigger parameters
@vanpho93
feat: add additional coupon validation
366a11a 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
@vanpho93
feat: update promotion error message
729b4a5 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
@vanpho93
Merge pull request #6771 from reactioncommerce/feat/add-additional-co…
193751c 
…upon-validation

feat: add additional coupon validation
@vannguyenn
fix: add coupon to promotion
da1de62 
Signed-off-by: Chloe <pinkcloudvnn@gmail.com>
@zenweasel
Merge pull request #6785 from reactioncommerce/fix/sample-data
3fd4690 
fix: add coupon sample data to sample data plugin
@vanpho93
feat: create migration for old discoupon
f18b2e8 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
@vanpho93
fix: add migration down method
919caa1 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
@vanpho93
feat: add archive coupon mutation
ce0d117 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
@vanpho93
Merge pull request #6782 from reactioncommerce/feat/archive-coupon-mu…
9db5e13 
…tation

feat: archive coupon mutation
@vanpho93
fix: migration up error
f2a2321 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
@zenweasel
Merge pull request #6784 from reactioncommerce/feat/create-migration-…
93381c5 
…for-old-discount

feat: create migration for old discount
@vanpho93
Merge branch 'feat/promotions' into feat/coupons
58e29f2
@vanpho93
fix: merge issue
4312af6 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
@vanpho93
Merge pull request #6800 from reactioncommerce/fix/merge-issue
94501ed 
fix: merge issue
@vannguyenn
fix: should query un-archived coupon in promotion
4a614a3 
Signed-off-by: Chloe <pinkcloudvnn@gmail.com>
@vanpho93
feat: shipping discount method
8da5f07 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
@zenweasel
Merge pull request #6801 from reactioncommerce/fix/archived-coupon-pr…
7d6032c 
…omotion

fix: should query un-archived coupon in promotion
@vanpho93
fix: prevent applied coupon when is archived
b2297cd 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
@zenweasel
Merge pull request #6804 from reactioncommerce/fix/prevent-applied-co…
d4578d7 
…upon-when-is-archived

fix: prevent applied coupon when is archived
@vanpho93
feat: add calculate discount amount util
fb551ee 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
vanpho93 and others added 23 commits February 21, 2023 14:37
@vanpho93
fix: place order with shipping discount
9e3feec 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
@vanpho93
fix: calculate shipping discount amount
234c47e 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
@vanpho93
feat: estimate discount amount for shipment quotes
7d9b8c1 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
@vanpho93
fix: applyPromotion unit test fail
88b213f 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
@vanpho93
fix: max discount value for shipping discount
3dcde45 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
@vanpho93
feat: add integration test for shipping disocunt
f21dfaa 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
@vanpho93
fix: unit test fail on disocuntAction
7bb460b 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
@vanpho93
feat: add expect discount amount for integraiton test
93a5c47 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
@vanpho93
feat: two shipping promotion test case
070b284 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
@vanpho93
feat: add additional redeemed coupon information
6be616a 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
@vanpho93
fix: revert snyk
dc51fd5 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
@vanpho93
feat: remove usedLogs field on CouponLog schema
c88826b 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
@zenweasel
Merge pull request #6816 from reactioncommerce/feat/add-additional-re…
5c6e241 
…deemed-coupon-information

feat: redeemed coupon information
@vanpho93
fix: temporary promotions
dbb9c88 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
@vanpho93
Merge branch 'feat/coupons' into feat/shipping-discounts
5769600
@vanpho93
fix: pnpm-lock file
dd89dcd 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
@vanpho93
feat: add sample data for shipping promotion
6fbde96 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
@vanpho93
fix: promotion plugin unit test fail
4072436 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
@vanpho93
fix: remove sampleData from plugin file
686d7e2 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
@vanpho93
fix: checkout promotion test fail
490044c 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
@vanpho93
feat: add check stackability for the shipping discount
c2471d3 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
@vanpho93
fix: revert promotion starup file
36dd29c 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
@vanpho93
Merge pull request #6802 from reactioncommerce/feat/shipping-discounts
e0c0e7c 
feat: shipping discounts
@sujithvn sujithvn self-requested a review May 19, 2023 01:55
sujithvn
sujithvn approved these changes May 19, 2023
View reviewed changes
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.

Approving, more testing will be done from promotions branch after merge

@vanpho93 vanpho93 merged commit b49f72a into feat/promotions May 19, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sujithvn sujithvn sujithvn approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@vanpho93 @sujithvn @vannguyenn @zenweasel