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

feat(medusa, link-modules): sales channel <> order link #5810

Merged
merged 76 commits into from
Jan 3, 2024

Conversation

fPolic
Copy link
Contributor

@fPolic fPolic commented Dec 5, 2023

What

  • migration for the pivot table
  • joiner config
  • typeorm entities changes
  • updates to the order service

Depends on

fPolic and others added 30 commits October 19, 2023 11:51
# Conflicts:
#	packages/medusa/src/services/product.ts
…r-config' into feat/sales-channel-module--joiner-config
# Conflicts:
#	packages/medusa/src/loaders/index.ts
# Conflicts:
#	packages/medusa/src/loaders/index.ts
# Conflicts:
#	packages/medusa/src/api/routes/admin/products/list-products.ts
#	packages/medusa/src/api/routes/store/products/list-products.ts
#	packages/medusa/src/services/product.ts
Copy link

changeset-bot bot commented Dec 5, 2023

🦋 Changeset detected

Latest commit: 7294108

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

This PR includes changesets to release 4 packages
Name Type
@medusajs/link-modules Patch
@medusajs/core-flows Patch
@medusajs/medusa Patch
@medusajs/utils 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

Copy link

vercel bot commented Dec 5, 2023

The latest updates on your projects. Learn more about Vercel for Git ↗︎

3 Ignored Deployments
Name Status Preview Comments Updated (UTC)
api-reference ⬜️ Ignored (Inspect) Visit Preview Jan 2, 2024 0:21am
docs-ui ⬜️ Ignored (Inspect) Visit Preview Jan 2, 2024 0:21am
medusa-docs ⬜️ Ignored (Inspect) Visit Preview Jan 2, 2024 0:21am

@fPolic fPolic changed the title feat: split sales channels and order feat: split sales channel <> order link Dec 6, 2023
@fPolic fPolic changed the title feat: split sales channel <> order link feat(medusa, link-modules): sales channel <> order link Dec 6, 2023
@fPolic fPolic marked this pull request as ready for review December 6, 2023 11:44
@fPolic fPolic requested a review from a team as a code owner December 6, 2023 11:44
Base automatically changed from feat/sales-channel-module--joiner-config to develop December 15, 2023 12:43
@olivermrbl
Copy link
Contributor

@fPolic can I get you to resolve the conflicts and merge latest from develop?

…onfig

# Conflicts:
#	packages/link-modules/src/definitions/index.ts
#	packages/link-modules/src/links.ts
#	packages/medusa/src/api/routes/admin/products/get-product.ts
#	packages/medusa/src/api/routes/admin/products/list-products.ts
#	packages/medusa/src/models/sales-channel.ts
#	packages/medusa/src/services/order.ts
#	packages/medusa/src/services/product.ts
#	packages/utils/src/feature-flags/utils/flag-router.ts
@fPolic
Copy link
Contributor Author

fPolic commented Jan 2, 2024

@fPolic can I get you to resolve the conflicts and merge latest from develop?

@olivermrbl done!

Copy link
Contributor

@olivermrbl olivermrbl left a comment

Choose a reason for hiding this comment

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

LGTM

@olivermrbl olivermrbl merged commit fe007d0 into develop Jan 3, 2024
15 checks passed
@olivermrbl olivermrbl deleted the feat/sales-channel-module-order--joiner-config branch January 3, 2024 13:07
This was referenced Jan 3, 2024
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.

3 participants