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

feat: shipping discount #6802

Merged
merged 20 commits into from
Mar 3, 2023
Merged

feat: shipping discount #6802

merged 20 commits into from
Mar 3, 2023

Conversation

vanpho93
Copy link
Member

@vanpho93 vanpho93 commented Feb 16, 2023 •
edited

Resolves #6773 #6767
Impact: major
Type: feature

Adding shipping discount with an option to prevent using 2 shipping discounts for one shipment.

Loom: https://www.loom.com/share/0ea5076ca3004ae9b1be6b3880a32e86

@vanpho93
feat: shipping discount method
8da5f07 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
@changeset-bot
Copy link

changeset-bot bot commented Feb 16, 2023 •
edited

⚠️ No Changeset found

Latest commit: 36dd29c

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

This was linked to issues Feb 16, 2023
As an operator I want Shipping Discount promotions to stack unless they are actioned on the same Shipping Method #6767
Closed
Promotions: Add shipping discounts #6773
Closed
zenweasel
zenweasel reviewed Feb 20, 2023
View reviewed changes
...es/api-plugin-promotions-discounts/src/discountTypes/shipping/applyShippingDiscountToCart.js
dateApplied: new Date(),
discountedItemType: "shipping",
discountedAmount: discountedItem.amount,
stackability: promotion.stackability,
Copy link
Collaborator

Choose a reason for hiding this comment

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

Are we applying the shipping discount to items? Not sure that's how we want to do that

Copy link
Member Author

Choose a reason for hiding this comment

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

No, we are applying it to shipping only, as it shows on the Loom demo.

zenweasel
zenweasel reviewed Feb 20, 2023
View reviewed changes
Copy link
Collaborator

@zenweasel zenweasel left a comment

Choose a reason for hiding this comment

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

Seems ok just have some questions:

  1. We are taking the discount on the shipping charge, not items right?
  2. We are taking the discount only on shipping and not on handling, correct?
  3. Have we taken into account when we may have a split shipment (i.e. two items in the shipping array)?

...es/api-plugin-promotions-discounts/src/discountTypes/shipping/applyShippingDiscountToCart.js Outdated Show resolved Hide resolved
@vanpho93
Copy link
Member Author

vanpho93 commented Feb 20, 2023 •
edited

Seems ok just have some questions:

  1. We are taking the discount on the shipping charge, not items right?
  2. We are taking the discount only on shipping and not on handling, correct?
  3. Have we taken into account when we may have a split shipment (i.e. two items in the shipping array)?
  1. => Yes, on the shipping charge
  2. => Do we want to exclude handling? Currently handling get discounted too but I can exclude it
  3. => We have it but we aren't able to demo it with the API because we didn't support split shipment in API level

@zenweasel
Copy link
Collaborator

@vanpho93 Ok, double-checking whether we should discount handling or not, so hold on this.

@vanpho93
feat: add calculate discount amount util
fb551ee 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
@zenweasel
Copy link
Collaborator

@vanpho93 Clarified with @brendan-shea-pm , discounts should only be taken against shipping, not handling

@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>
zenweasel
zenweasel requested changes Feb 22, 2023
View reviewed changes
Copy link
Collaborator

@zenweasel zenweasel left a comment

Choose a reason for hiding this comment

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

Discounts don't display in quotes which is critical

@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>
@zenweasel
Copy link
Collaborator

@vanpho93 Can we add a shipping discount promotion to the sample data as well?

@vanpho93
feat: two shipping promotion test case
070b284 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
zenweasel
zenweasel requested changes Feb 27, 2023
View reviewed changes
Copy link
Collaborator

@zenweasel zenweasel left a comment

Choose a reason for hiding this comment

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

Shipping quotes are not updated when a promotion becomes active after the cart already has quotes on it. Brian has identified the problem already and is working on a fix

@vanpho93 vanpho93 changed the base branch from feat/promotions to feat/coupons March 1, 2023 09:06
@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 vanpho93 requested a review from zenweasel March 2, 2023 02:39
@vanpho93
feat: add check stackability for the shipping discount
c2471d3 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
zenweasel
zenweasel approved these changes Mar 2, 2023
View reviewed changes
Copy link
Collaborator

@zenweasel zenweasel left a comment

Choose a reason for hiding this comment

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

Great work

packages/api-plugin-promotions/src/startup.js Outdated Show resolved Hide resolved
@vanpho93
fix: revert promotion starup file
36dd29c 
Signed-off-by: vanpho93 <vanpho02@gmail.com>
@vanpho93 vanpho93 merged commit e0c0e7c into feat/coupons Mar 3, 2023
@zenweasel
Copy link
Collaborator

@vanpho93 In the future please wait for all reviewers I've assigned to approve before merging

@zenweasel zenweasel deleted the feat/shipping-discounts branch March 3, 2023 02:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zenweasel zenweasel zenweasel approved these changes

@sujithvn sujithvn Awaiting requested review from sujithvn

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@vanpho93 @zenweasel