fix(medusa): Applying Discounts (with Conditions) on DraftOrders and Carts #3197

adrien2p · 2023-02-07T14:42:22Z

What

During a draft order creation, if a discount of type FIXED on allocated to total is present, the adjustment can't be calculated and throw an error.
Fixes cart related issues with applying discount

How

Fix the adjustment creation for the draft order creation flow
Fix cart discounts management and discount condition repo

Tests

Add a new integration test for it
Add new tests case

FIXES CORE-1100
FIXES CORE-1109

changeset-bot · 2023-02-07T14:42:25Z

🦋 Changeset detected

Latest commit: 77d005c

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

This PR includes changesets to release 2 packages

Name	Type
@medusajs/medusa	Patch
@medusajs/inventory	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

adrien2p · 2023-02-07T15:58:40Z

/snapshot-this

github-actions · 2023-02-07T16:03:05Z

🚀 A snapshot release has been made for this PR

Test the snapshots by updating your package.json with the newly published versions:

yarn add @medusajs/inventory@2.0.0-snapshot-20230207160201

yarn add @medusajs/medusa@1.8.0-snapshot-20230207160201

yarn add @medusajs/medusa-js@2.0.0-snapshot-20230207160201

yarn add medusa-payment-adyen@1.1.42-snapshot-20230207160201

yarn add medusa-payment-klarna@1.3.7-snapshot-20230207160201

yarn add medusa-payment-manual@1.0.21-snapshot-20230207160201

yarn add medusa-payment-paypal@1.2.9-snapshot-20230207160201

yarn add medusa-payment-stripe@1.1.52-snapshot-20230207160201

yarn add medusa-plugin-restock-notification@3.0.0-snapshot-20230207160201

yarn add medusa-plugin-sendgrid@1.4.0-snapshot-20230207160201

yarn add medusa-react@5.0.0-snapshot-20230207160201

yarn add @medusajs/stock-location@2.0.0-snapshot-20230207160201

Latest commit: 6729f9b

packages/medusa/src/services/draft-order.ts

adrien2p · 2023-02-08T09:47:15Z

/snapshot-this

olivermrbl · 2023-02-08T09:50:07Z

We have a similar issue on carts. Try to apply discount with code heyo in staging in region United Kingdom.

It will throw the following:

invalid input syntax for type integer: \"NaN\""

Is this the same? And if so, do you know if this will fix it?

github-actions · 2023-02-08T09:54:03Z

🚀 A snapshot release has been made for this PR

Test the snapshots by updating your package.json with the newly published versions:

yarn add create-medusa-app@0.0.8-snapshot-20230208095134

yarn add @medusajs/inventory@2.0.0-snapshot-20230208095134

yarn add @medusajs/medusa@1.8.0-snapshot-20230208095134

yarn add @medusajs/medusa-cli@1.3.7-snapshot-20230208095134

yarn add medusa-core-utils@1.1.38-snapshot-20230208095134

yarn add medusa-dev-cli@0.0.29-snapshot-20230208095134

yarn add medusa-file-minio@1.1.4-snapshot-20230208095134

yarn add medusa-file-s3@1.1.10-snapshot-20230208095134

yarn add medusa-file-spaces@1.3.4-snapshot-20230208095134

yarn add medusa-fulfillment-manual@1.1.35-snapshot-20230208095134

yarn add medusa-fulfillment-webshipper@1.3.6-snapshot-20230208095134

yarn add medusa-interfaces@1.3.5-snapshot-20230208095134

yarn add @medusajs/medusa-js@2.0.0-snapshot-20230208095134

yarn add medusa-payment-adyen@1.1.42-snapshot-20230208095134

yarn add medusa-payment-klarna@1.3.7-snapshot-20230208095134

yarn add medusa-payment-manual@1.0.21-snapshot-20230208095134

yarn add medusa-payment-paypal@1.2.9-snapshot-20230208095134

yarn add medusa-payment-stripe@1.1.52-snapshot-20230208095134

yarn add medusa-plugin-algolia@0.2.8-snapshot-20230208095134

yarn add medusa-plugin-brightpearl@1.3.5-snapshot-20230208095134

yarn add medusa-plugin-contentful@1.2.6-snapshot-20230208095134

yarn add medusa-plugin-discount-generator@1.1.23-snapshot-20230208095134

yarn add medusa-plugin-economic@1.1.41-snapshot-20230208095134

yarn add medusa-plugin-ip-lookup@1.2.4-snapshot-20230208095134

yarn add medusa-plugin-mailchimp@1.1.45-snapshot-20230208095134

yarn add medusa-plugin-meilisearch@1.0.3-snapshot-20230208095134

yarn add medusa-plugin-restock-notification@3.0.0-snapshot-20230208095134

yarn add medusa-plugin-segment@1.3.3-snapshot-20230208095134

yarn add medusa-plugin-sendgrid@1.4.0-snapshot-20230208095134

yarn add medusa-plugin-slack-notification@1.3.7-snapshot-20230208095134

yarn add medusa-plugin-twilio-sms@1.2.6-snapshot-20230208095134

yarn add medusa-plugin-wishlist@1.1.40-snapshot-20230208095134

yarn add medusa-react@5.0.0-snapshot-20230208095134

yarn add medusa-source-shopify@1.2.6-snapshot-20230208095134

yarn add @medusajs/stock-location@2.0.0-snapshot-20230208095134

Latest commit: 6729f9b

adrien2p · 2023-02-08T09:55:13Z

We have a similar issue on carts. Try to apply discount with code heyo in staging in region United Kingdom.

It will throw the following:
invalid input syntax for type integer: \"NaN\""
Is this the same? And if so, do you know if this will fix it?

looks exactly the same, totals is an empty array and therefore we divide by 0 = NaN

adrien2p · 2023-02-08T09:55:48Z

@olivermrbl do you want me to look into the cart as well. When is the code applied?

olivermrbl · 2023-02-08T09:59:30Z

That would be great! You should be able to reproduce the error in the staging storefront. Make sure you are in region United Kingdom, add items to your cart, and attempt to apply code heyo in the checkout flow :)

olivermrbl · 2023-02-08T15:55:47Z

packages/medusa/src/repositories/discount-condition.ts

@@ -256,6 +256,10 @@ export class DiscountConditionRepository extends Repository<DiscountCondition> {
    //    if condition operation is `in` and the query for conditions defined for the given type is empty, the discount is invalid
    //    if condition operation is `not_in` and the query for conditions defined for the given type is not empty, the discount is invalid
    for (const condition of discountConditions) {
+      if (condition.type === DiscountConditionType.CUSTOMER_GROUPS) {


comment (for reviewer): This repository method is responsible for checking the validity of a discount in relation to products, types, collections, and tags, which is why we skip the customer groups conditions

packages/medusa/src/services/draft-order.ts

packages/medusa/src/services/discount.ts

olivermrbl

LGTM, but I would like a second pair of eyes on it, as I took part in some of the changes :)

riqwan

LGTM :)

integration-tests/api/__tests__/admin/draft-order/draft-order.js

packages/medusa/src/services/cart.ts

packages/medusa/src/services/discount.ts

olivermrbl

LGTM!

…Carts (#3197)

adrien2p force-pushed the fix/create-draft-order-fixed-discount branch from b0fa973 to ed6c9ce Compare February 7, 2023 14:44

fix(medusa): Creating a draft order with a fixed discount on total fail

3b26228

adrien2p force-pushed the fix/create-draft-order-fixed-discount branch from ed6c9ce to 3b26228 Compare February 7, 2023 14:45

adrien2p added 2 commits February 7, 2023 16:20

tests: Update unit tests

471b1fe

Merge branch 'develop' into fix/create-draft-order-fixed-discount

1d4f54f

adrien2p marked this pull request as ready for review February 7, 2023 15:39

adrien2p requested a review from a team as a code owner February 7, 2023 15:39

adrien2p requested review from pKorsholm, olivermrbl and riqwan February 7, 2023 15:43

olivermrbl reviewed Feb 7, 2023

View reviewed changes

packages/medusa/src/services/draft-order.ts Outdated Show resolved Hide resolved

adrien2p added 2 commits February 8, 2023 10:41

refactoring

b8cb93a

Merge branch 'develop' into fix/create-draft-order-fixed-discount

5a98799

olivermrbl added type: bug version: next labels Feb 8, 2023

adrien2p and others added 6 commits February 8, 2023 13:24

fix create draft order

23235e3

improce cart discounts management

1317081

Merge branch 'develop' into fix/create-draft-order-fixed-discount

c451083

finalise cart fixes

49ad0a5

Merge branch 'develop' into fix/create-draft-order-fixed-discount

7045089

fix unit tests

15c2615

fix discount integration

a0122d3

adrien2p changed the title ~~fix(medusa): Creating a draft order with a fixed discount on total fail~~ fix(medusa): Applying discount upon draft order creation or cart update does not work properly Feb 8, 2023

olivermrbl changed the title ~~fix(medusa): Applying discount upon draft order creation or cart update does not work properly~~ fix(medusa): Applying Discounts (with Conditions) on DraftOrders and Carts Feb 8, 2023

Update chageset

4d0e1e3

olivermrbl reviewed Feb 8, 2023

View reviewed changes

packages/medusa/src/services/draft-order.ts Show resolved Hide resolved

olivermrbl reviewed Feb 8, 2023

View reviewed changes

packages/medusa/src/services/discount.ts Outdated Show resolved Hide resolved

olivermrbl reviewed Feb 8, 2023

View reviewed changes

adrien2p added 2 commits February 8, 2023 17:21

separate retrieveByCode and listByCodes

be2ee35

update constraint to fail listByCodes

2f4046a

adrien2p force-pushed the fix/create-draft-order-fixed-discount branch from 4a1182e to 2f4046a Compare February 8, 2023 16:26

update error messages

927b982

riqwan approved these changes Feb 8, 2023

View reviewed changes

integration-tests/api/__tests__/admin/draft-order/draft-order.js Show resolved Hide resolved

packages/medusa/src/services/cart.ts Outdated Show resolved Hide resolved

adrien2p added 3 commits February 8, 2023 17:46

chore: address feedback

5bd1bb8

Merge branch 'develop' into fix/create-draft-order-fixed-discount

900cd74

update retrieveByCode error message

aad6103

carlos-r-l-rodrigues approved these changes Feb 8, 2023

View reviewed changes

carlos-r-l-rodrigues reviewed Feb 8, 2023

View reviewed changes

packages/medusa/src/services/discount.ts Outdated Show resolved Hide resolved

adrien2p added 5 commits February 8, 2023 18:09

fix draft order tests

59f6d34

cleanup discount methods

df7585f

fix draft order tests

d644709

fix discount tests

aea75d8

Merge branch 'develop' into fix/create-draft-order-fixed-discount

77d005c

olivermrbl approved these changes Feb 8, 2023

View reviewed changes

olivermrbl merged commit bfa33f4 into develop Feb 8, 2023

olivermrbl deleted the fix/create-draft-order-fixed-discount branch February 8, 2023 18:01

adrien2p added a commit that referenced this pull request Feb 13, 2023

fix(medusa): Applying Discounts (with Conditions) on DraftOrders and …

d51ec98

…Carts (#3197)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(medusa): Applying Discounts (with Conditions) on DraftOrders and Carts #3197

fix(medusa): Applying Discounts (with Conditions) on DraftOrders and Carts #3197

adrien2p commented Feb 7, 2023 •

edited

changeset-bot bot commented Feb 7, 2023 •

edited

adrien2p commented Feb 7, 2023

github-actions bot commented Feb 7, 2023

adrien2p commented Feb 8, 2023

olivermrbl commented Feb 8, 2023

github-actions bot commented Feb 8, 2023

adrien2p commented Feb 8, 2023

adrien2p commented Feb 8, 2023

olivermrbl commented Feb 8, 2023

olivermrbl Feb 8, 2023 •

edited

olivermrbl left a comment

riqwan left a comment

olivermrbl left a comment

fix(medusa): Applying Discounts (with Conditions) on DraftOrders and Carts #3197

fix(medusa): Applying Discounts (with Conditions) on DraftOrders and Carts #3197

Conversation

adrien2p commented Feb 7, 2023 • edited

changeset-bot bot commented Feb 7, 2023 • edited

🦋 Changeset detected

adrien2p commented Feb 7, 2023

github-actions bot commented Feb 7, 2023

🚀 A snapshot release has been made for this PR

adrien2p commented Feb 8, 2023

olivermrbl commented Feb 8, 2023

github-actions bot commented Feb 8, 2023

🚀 A snapshot release has been made for this PR

adrien2p commented Feb 8, 2023

adrien2p commented Feb 8, 2023

olivermrbl commented Feb 8, 2023

olivermrbl Feb 8, 2023 • edited

Choose a reason for hiding this comment

olivermrbl left a comment

Choose a reason for hiding this comment

riqwan left a comment

Choose a reason for hiding this comment

olivermrbl left a comment

Choose a reason for hiding this comment

adrien2p commented Feb 7, 2023 •

edited

changeset-bot bot commented Feb 7, 2023 •

edited

olivermrbl Feb 8, 2023 •

edited