feat(utils,types): added item/shipping adjustments for order/items/shipping_methods #6050

riqwan · 2024-01-10T12:04:06Z

what:

adds compute actions for the following cases:
- items => each & across
- shipping_method => each & across
- order
adds a remove compute actions when code is no longer present in adjustments array

RESOLVES CORE-1625
RESOLVES CORE-1626
RESOLVES CORE-1627
RESOLVES CORE-1628
RESOLVES CORE-1585

changeset-bot · 2024-01-10T12:04:10Z

🦋 Changeset detected

Latest commit: 82b71aa

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

This PR includes changesets to release 2 packages

Name	Type
@medusajs/types	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

vercel · 2024-01-10T12:04:15Z

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

Name	Status	Preview	Comments	Updated (UTC)
medusa-dashboard	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Jan 12, 2024 0:39am

3 Ignored Deployments

Name	Status	Preview	Updated (UTC)
api-reference	⬜️ Ignored (Inspect)	Visit Preview	Jan 12, 2024 0:39am
docs-ui	⬜️ Ignored (Inspect)	Visit Preview	Jan 12, 2024 0:39am
medusa-docs	⬜️ Ignored (Inspect)	Visit Preview	Jan 12, 2024 0:39am

…plications

riqwan · 2024-01-11T13:52:01Z

@olivermrbl this one is ready for review

riqwan · 2024-01-12T07:42:29Z

@adrien2p @olivermrbl can you guys prioritize this review for today? A pile is beginning atm.

adrien2p · 2024-01-12T07:43:16Z

Yes sure, ill do that 👌

packages/promotion/src/models/promotion-rule.ts

packages/promotion/src/services/promotion-module.ts

packages/promotion/src/utils/compute-actions/items.ts

packages/promotion/src/utils/compute-actions/order.ts

packages/promotion/src/utils/compute-actions/shipping-methods.ts

packages/types/src/promotion/common/promotion-rule-value.ts

packages/types/src/promotion/service.ts

packages/utils/src/common/pick-from-object.ts

adrien2p · 2024-01-12T09:01:59Z

Strong work man 💪 just a few comments and suggestions and small todo's

olivermrbl

Really strong work @riqwan 🔥

packages/types/src/promotion/service.ts

packages/promotion/src/services/promotion-module.ts

olivermrbl · 2024-01-12T09:42:10Z

packages/promotion/src/utils/compute-actions/items.ts

+  if (!itemApplicationContext) {
+    throw new MedusaError(
+      MedusaError.Types.INVALID_DATA,
+      `"items" not found in context`


suggestion: Make error message more specific to method. items and context are props that will be used across all modules

packages/promotion/src/utils/compute-actions/shipping-methods.ts

packages/promotion/src/utils/compute-actions/items.ts

packages/promotion/src/utils/compute-actions/shipping-methods.ts

riqwan · 2024-01-12T12:31:01Z

@olivermrbl @adrien2p made the changes!

olivermrbl

LGTM

olivermrbl · 2024-01-12T12:30:07Z

packages/promotion/src/utils/compute-actions/items.ts

+  if (!itemApplicationContext) {
+    throw new MedusaError(
+      MedusaError.Types.INVALID_DATA,
+      `"items" should be present as an array in the context for computeActions`


packages/promotion/src/utils/compute-actions/shipping-methods.ts

Co-authored-by: Oli Juhl <59018053+olivermrbl@users.noreply.github.com>

riqwan force-pushed the feat/compute-actions branch from 8dd0e35 to a8ee07e Compare January 10, 2024 12:05

vercel bot deployed to Preview – medusa-dashboard January 10, 2024 12:09 View deployment

riqwan marked this pull request as ready for review January 10, 2024 12:10

riqwan requested a review from a team as a code owner January 10, 2024 12:10

riqwan requested review from olivermrbl and srindom January 10, 2024 12:10

chore: added item/shipping adjustments for order/items/shipping_methods

15b8517

riqwan force-pushed the feat/compute-actions branch from a8ee07e to 15b8517 Compare January 10, 2024 12:12

vercel bot deployed to Preview – medusa-dashboard January 10, 2024 12:14 View deployment

riqwan added 2 commits January 10, 2024 13:37

chore: add validation for order type and target rules

ddcaa56

chore: add comment for applied promotions

45429ba

vercel bot deployed to Preview – medusa-dashboard January 10, 2024 12:40 View deployment

chore: add shipping method and item adjustments

cebfe6c

vercel bot deployed to Preview – medusa-dashboard January 11, 2024 11:27 View deployment

chore: include applied promotions to items/shipping_method for each case

98235b2

vercel bot deployed to Preview – medusa-dashboard January 11, 2024 12:53 View deployment

chore: handle case for items across and order to consider existing ap…

de2f2d7

…plications

vercel bot deployed to Preview – medusa-dashboard January 11, 2024 13:16 View deployment

riqwan added 2 commits January 11, 2024 14:39

chore: handle case for applied promo values to shipping => across

ae77b50

Merge branch 'develop' into feat/compute-actions

0720358

vercel bot deployed to Preview – medusa-dashboard January 11, 2024 13:42 View deployment

chore: added changeset

ba8d087

riqwan requested a review from adrien2p January 11, 2024 13:50

vercel bot deployed to Preview – medusa-dashboard January 11, 2024 13:51 View deployment

chore: update return of function

e5616cd

vercel bot deployed to Preview – medusa-dashboard January 11, 2024 21:55 View deployment

riqwan mentioned this pull request Jan 11, 2024

feat(utils,types): campaigns and campaign budgets + services CRUD #6063

Merged

vercel bot deployed to Preview – medusa-dashboard January 11, 2024 22:40 View deployment

riqwan commented Jan 12, 2024

View reviewed changes

packages/promotion/src/models/promotion-rule.ts Outdated Show resolved Hide resolved

riqwan added 2 commits January 12, 2024 08:51

Update packages/promotion/src/models/promotion-rule.ts

a3edd2e

chore: fix types

671f27f

vercel bot deployed to Preview – medusa-dashboard January 12, 2024 07:56 View deployment

riqwan requested a review from pKorsholm January 12, 2024 07:57

adrien2p reviewed Jan 12, 2024

View reviewed changes

olivermrbl reviewed Jan 12, 2024

View reviewed changes

riqwan commented Jan 12, 2024

View reviewed changes

packages/promotion/src/utils/compute-actions/items.ts Outdated Show resolved Hide resolved

riqwan commented Jan 12, 2024

View reviewed changes

packages/promotion/src/utils/compute-actions/shipping-methods.ts Outdated Show resolved Hide resolved

riqwan commented Jan 12, 2024

View reviewed changes

packages/promotion/src/utils/compute-actions/shipping-methods.ts Outdated Show resolved Hide resolved

riqwan added 2 commits January 12, 2024 13:25

chore: review changes

88fbeb1

Merge branch 'develop' into feat/compute-actions

cb6893d

riqwan requested review from adrien2p and olivermrbl January 12, 2024 12:28

vercel bot deployed to Preview – medusa-dashboard January 12, 2024 12:31 View deployment

olivermrbl approved these changes Jan 12, 2024

View reviewed changes

Update packages/promotion/src/utils/compute-actions/shipping-methods.ts

82b71aa

Co-authored-by: Oli Juhl <59018053+olivermrbl@users.noreply.github.com>

vercel bot deployed to Preview – medusa-dashboard January 12, 2024 12:39 View deployment

riqwan added the automerge label Jan 12, 2024

kodiakhq bot merged commit b782d3b into develop Jan 12, 2024
16 checks passed

github-actions bot mentioned this pull request Jan 12, 2024

Version Packages #6039

Merged

riqwan deleted the feat/compute-actions branch January 12, 2024 13:14

This was referenced Jan 16, 2024

Version Packages Avey777/medusa#1

Open

Version Packages aghiulez/medusa#11

Open

github-actions bot mentioned this pull request Jan 24, 2024

Version Packages weMoveOn/moveshop-commerce-core#2

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(utils,types): added item/shipping adjustments for order/items/shipping_methods #6050

feat(utils,types): added item/shipping adjustments for order/items/shipping_methods #6050

riqwan commented Jan 10, 2024 •

edited

Loading

changeset-bot bot commented Jan 10, 2024 •

edited

Loading

vercel bot commented Jan 10, 2024 •

edited

Loading

riqwan commented Jan 11, 2024

riqwan commented Jan 12, 2024

adrien2p commented Jan 12, 2024

adrien2p commented Jan 12, 2024

olivermrbl left a comment

olivermrbl Jan 12, 2024

riqwan commented Jan 12, 2024

olivermrbl left a comment

olivermrbl Jan 12, 2024

feat(utils,types): added item/shipping adjustments for order/items/shipping_methods #6050

feat(utils,types): added item/shipping adjustments for order/items/shipping_methods #6050

Conversation

riqwan commented Jan 10, 2024 • edited Loading

changeset-bot bot commented Jan 10, 2024 • edited Loading

🦋 Changeset detected

vercel bot commented Jan 10, 2024 • edited Loading

riqwan commented Jan 11, 2024

riqwan commented Jan 12, 2024

adrien2p commented Jan 12, 2024

adrien2p commented Jan 12, 2024

olivermrbl left a comment

Choose a reason for hiding this comment

olivermrbl Jan 12, 2024

Choose a reason for hiding this comment

riqwan commented Jan 12, 2024

olivermrbl left a comment

Choose a reason for hiding this comment

olivermrbl Jan 12, 2024

Choose a reason for hiding this comment

riqwan commented Jan 10, 2024 •

edited

Loading

changeset-bot bot commented Jan 10, 2024 •

edited

Loading

vercel bot commented Jan 10, 2024 •

edited

Loading