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

Release 5 #6778

Merged
merged 432 commits into from
Jun 13, 2023
Merged

Release 5 #6778

merged 432 commits into from
Jun 13, 2023

Conversation

vanpho93
Copy link
Member

@vanpho93 vanpho93 commented Feb 3, 2023

Branch for the Release of version 5

@changeset-bot
Copy link

changeset-bot bot commented Feb 3, 2023 •
edited

🦋 Changeset detected

Latest commit: bf03a7d

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

This PR includes changesets to release 53 packages
Name Type
@reactioncommerce/api-plugin-authorization-simple Major
@reactioncommerce/api-plugin-carts Major
@reactioncommerce/api-plugin-catalogs Major
@reactioncommerce/api-plugin-orders Major
@reactioncommerce/api-plugin-products Major
@reactioncommerce/api-plugin-sample-data Major
@reactioncommerce/api-plugin-simple-schema Major
@reactioncommerce/api-plugin-promotions Minor
reaction Major
@reactioncommerce/api-plugin-accounts Major
@reactioncommerce/api-plugin-address-validation Major
@reactioncommerce/api-plugin-discounts-codes Major
@reactioncommerce/api-plugin-email Major
@reactioncommerce/api-plugin-email-templates Major
@reactioncommerce/api-plugin-files Major
@reactioncommerce/api-plugin-inventory-simple Major
@reactioncommerce/api-plugin-navigation Major
@reactioncommerce/api-plugin-payments Major
@reactioncommerce/api-plugin-payments-stripe-sca Major
@reactioncommerce/api-plugin-pricing-simple Major
@reactioncommerce/api-plugin-settings Major
@reactioncommerce/api-plugin-shipments Major
@reactioncommerce/api-plugin-shipments-flat-rate Major
@reactioncommerce/api-plugin-shops Major
@reactioncommerce/api-plugin-sitemap-generator Major
@reactioncommerce/api-plugin-surcharges Major
@reactioncommerce/api-plugin-system-information Major
@reactioncommerce/api-plugin-tags Major
@reactioncommerce/api-plugin-taxes Major
@reactioncommerce/api-plugin-taxes-flat-rate Major
@reactioncommerce/api-utils Major
@reactioncommerce/api-core Major
@reactioncommerce/api-plugin-address-validation-test Major
@reactioncommerce/api-plugin-authentication Major
@reactioncommerce/api-plugin-discounts Major
@reactioncommerce/api-plugin-email-smtp Major
@reactioncommerce/api-plugin-i18n Major
@reactioncommerce/api-plugin-inventory Major
@reactioncommerce/api-plugin-job-queue Major
@reactioncommerce/api-plugin-notifications Major
@reactioncommerce/api-plugin-payments-example Major
@reactioncommerce/api-plugin-translations Major
@reactioncommerce/api-plugin-fulfillment Patch
@reactioncommerce/api-plugin-bull-queue Patch
@reactioncommerce/api-plugin-fulfillment-method-pickup-store Patch
@reactioncommerce/api-plugin-fulfillment-method-shipping-dynamic-rate Patch
@reactioncommerce/api-plugin-fulfillment-method-shipping-flat-rate Patch
@reactioncommerce/api-plugin-fulfillment-type-pickup Patch
@reactioncommerce/api-plugin-fulfillment-type-shipping Patch
@reactioncommerce/api-plugin-promotions-coupons Patch
@reactioncommerce/api-plugin-promotions-discounts Patch
@reactioncommerce/api-plugin-promotions-offers Patch
@reactioncommerce/api-plugin-sequences 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 vanpho93 marked this pull request as ready for review February 3, 2023 09:18
@zenweasel zenweasel marked this pull request as draft February 7, 2023 01:20
vanpho93 and others added 27 commits May 19, 2023 10:12
@vanpho93
fix: change summary and coupon description
dbdbc91 
Signed-off-by: Brian Nguyen <vanpho02@gmail.com>
@zenweasel @vanpho93
feat: add ability to extend qualifiers
5493dc0 
Signed-off-by: Brent Hoover <brent@thebuddhalodge.com>
@zenweasel @vanpho93
fix: fix extension
eae07a6 
Signed-off-by: Brent Hoover <brent@thebuddhalodge.com>
@zenweasel @vanpho93
Update packages/api-plugin-promotions/src/utils/canBeApplied.js
7e7f974 
Co-authored-by: Brian Nguyen <vanpho02@gmail.com>
Signed-off-by: Brent Hoover <brent@thebuddhalodge.com>
@zenweasel @vanpho93
fix: typo in schema declaration
d436249 
Signed-off-by: Brent Hoover <brent@thebuddhalodge.com>
@vanpho93
fix: fix coupon trigger return value
2e5a31e 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
@vanpho93
feat: add the description for the schema
256e632 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
@vanpho93
feat: using anonynous token on promotion coupons
7aa8aa8 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
@sujithvn
Merge branch 'feat/fulfillment-types' of github.com:reactioncommerce/…
ca155a6 
…reaction into feat/fulfillment-types

Signed-off-by: Sujith <mail.sujithvn@gmail.com>
@vanpho93
feat: add indexes
67cbac7 
Signed-off-by: Brian Nguyen <vanpho02@gmail.com>
@zenweasel @vanpho93
feat: add first graphQL query for single promotion
79b86dd 
Signed-off-by: Brent Hoover <brent@thebuddhalodge.com>
@zenweasel @vanpho93
feat: add list query plus updatePromotion
d22ade7 
Signed-off-by: Brent Hoover <brent@thebuddhalodge.com>
@zenweasel @vanpho93
feat: working createPromotion
e229936 
Signed-off-by: Brent Hoover <brent@thebuddhalodge.com>
@zenweasel @vanpho93
feat: tests plus validate trigger parameters
e4e6927 
Signed-off-by: Brent Hoover <brent@thebuddhalodge.com>
@zenweasel @vanpho93
feat: more tests
ea4436f 
Signed-off-by: Brent Hoover <brent@thebuddhalodge.com>
@zenweasel @vanpho93
feat: remove sample-data plugin
3a38020 
Signed-off-by: Brent Hoover <brent@thebuddhalodge.com>
@zenweasel @vanpho93
feat: adds functionality for creating auto-incrementing ids
f430789 
Signed-off-by: Brent Hoover <brent@thebuddhalodge.com>
@zenweasel @vanpho93
feat: refactoring plus adds setting start sequence via env var
d9339d9 
Signed-off-by: Brent Hoover <brent@thebuddhalodge.com>
@zenweasel @vanpho93
feat: add sequence creation in startup, plus graqhQL for promotions
e1b0a3c 
Signed-off-by: Brent Hoover <brent@thebuddhalodge.com>
@zenweasel @vanpho93
feat: refactoring plus adds setting start sequence via env var
e2ae3f3 
Signed-off-by: Brent Hoover <brent@thebuddhalodge.com>
@zenweasel @vanpho93
feat: adds "promotion type" for stackability and creation purposes
b6d86bb 
Signed-off-by: Brent Hoover <brent@thebuddhalodge.com>
@zenweasel @vanpho93
feat: modify sample-data inserts
2e69ab9 
Signed-off-by: Brent Hoover <brent@thebuddhalodge.com>
@zenweasel @vanpho93
fix: feedback from C/R
8bc37fc 
Signed-off-by: Brent Hoover <brent@thebuddhalodge.com>
@zenweasel @vanpho93
fix: rename from Sequences to sequenceConfigs
2417840 
Signed-off-by: Brent Hoover <brent@thebuddhalodge.com>
@zenweasel @vanpho93
fix: rename from Sequences to sequenceConfigs for README
6c46198 
Signed-off-by: Brent Hoover <brent@thebuddhalodge.com>
@zenweasel @vanpho93
fix: fixes for tests
b091432 
Signed-off-by: Brent Hoover <brent@thebuddhalodge.com>
@zenweasel @vanpho93
fix: change import style to appease Jest
6ce1b05 
Signed-off-by: Brent Hoover <brent@thebuddhalodge.com>
sujithvn and others added 22 commits May 25, 2023 16:05
@sujithvn
Merge pull request #6840 from reactioncommerce/feat/fulfillment-types
db0b1f4 
Feature Fulfillment types
@sujithvn
Merge branch 'release-5' of github.com:reactioncommerce/reaction into…
49bc9a5 
… release-5

Signed-off-by: Sujith <mail.sujithvn@gmail.com>
@sujithvn
Merge branch 'release-5' into feat/promotions-signed
745050d 
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 <mail.sujithvn@gmail.com>
@sujithvn
fix: additional fixes to merge fft promotions
0e6adfe 
Signed-off-by: Sujith <mail.sujithvn@gmail.com>
@sujithvn
fix: linter error
37d1614 
Signed-off-by: Sujith <mail.sujithvn@gmail.com>
@sujithvn
fix: update the promotionsVersion
773ac27 
Signed-off-by: Sujith <mail.sujithvn@gmail.com>
@vanpho93 @sujithvn
fix: expected total mismatch with shipping discount
cf8069a 
Signed-off-by: Brian Nguyen <vanpho02@gmail.com>
@sujithvn
Merge pull request #6842 from reactioncommerce/feat/promotions-signed
5264638 
Promotions Feature Branch signed
@sujithvn
fix: set private false for publish
7e4c530 
Signed-off-by: Sujith <mail.sujithvn@gmail.com>
@sujithvn
fix: initial version 0 for new plugins
6be9487 
Signed-off-by: Sujith <mail.sujithvn@gmail.com>
@sujithvn
fix: pin ubuntu-focal mongo5 issue in ubuntu22
deff95d 
Signed-off-by: Sujith <mail.sujithvn@gmail.com>
@sujithvn
fix: add node minor version
583f309 
Signed-off-by: Sujith <mail.sujithvn@gmail.com>
@sujithvn
fix: migration issues
8f951dc 
Signed-off-by: Sujith <mail.sujithvn@gmail.com>
@sujithvn
fix: heap memory 7168
350f0fc 
Signed-off-by: Sujith <mail.sujithvn@gmail.com>
@sujithvn
fix: encode fix for integration tests
e724029 
Signed-off-by: Sujith <mail.sujithvn@gmail.com>
@sujithvn
fix: create default fft type method startup
4637ccb 
Signed-off-by: Sujith <mail.sujithvn@gmail.com>
@sujithvn
fix: linter
b4ea6d6 
Signed-off-by: Sujith <mail.sujithvn@gmail.com>
@sujithvn
fix: name property for functionsByType
a7f8edc 
Signed-off-by: Sujith <mail.sujithvn@gmail.com>
@sujithvn
Revert "fix: encode fix for integration tests"
84a0320 
This reverts commit e724029.

Signed-off-by: Sujith <mail.sujithvn@gmail.com>
@sujithvn
Merge pull request #6846 from reactioncommerce/pending-fixes
c97ac63 
Pending fixes for Release5
@sujithvn
feat: reaction bump v5
6483b18 
Signed-off-by: Sujith <mail.sujithvn@gmail.com>
@sujithvn
Merge pull request #6847 from reactioncommerce/reaction-bump
335961a 
feat: reaction bump v5
@sujithvn sujithvn marked this pull request as ready for review June 12, 2023 14:24
@sujithvn
fix: version update
3e86d1c 
Signed-off-by: Sujith <mail.sujithvn@gmail.com>
@sujithvn
fix: pnpm-lock.yml update
f88f258 
Signed-off-by: Sujith <mail.sujithvn@gmail.com>
@sujithvn
Merge pull request #6848 from reactioncommerce/plugins-version-update
bf03a7d 
fix: version update
@zenweasel zenweasel merged commit 1675eb3 into trunk Jun 13, 2023
2 checks passed
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

@zenweasel zenweasel Awaiting requested review from zenweasel

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 @zenweasel @vannguyenn