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

Implemented: support to display the remaining amount to be collected on the order based on COD payment and the related adjustments(#862) #899

Merged
merged 9 commits into from
Jan 9, 2025
Merged

Implemented: support to display the remaining amount to be collected on the order based on COD payment and the related adjustments(#862) #899

merged 9 commits into from
Jan 9, 2025

Conversation

ymaheshwari1
Copy link
Contributor

@ymaheshwari1 ymaheshwari1 commented Jan 7, 2025 •
edited
Loading

Related Issues

#862

Short Description and Why It's Useful

  • Added support to display the order level adjustments those needs to be charged in current shipment, where billing shipment is not set.

Screenshots of Visual Changes before/after (If There Are Any)

If the order has COD payment:

image

  • When the adjustments are not charged on any other shipment:

image

  • When there are no more pending adjustments to be charged (means all the adjustments are charged on some other shipment):

image

Contribution and Currently Important Rules Acceptance

@ymaheshwari1
Implemented: support to display COD amount helper for order having CO…
b7f87d3 
…D payment pending(hotwax#862)
@ymaheshwari1
Improved: logic to calculate the shipment total and subtotal, and add…
835ae57 
…ed item level adjustments to the shipment total(hotwax#862)
@ymaheshwari1
Improved: the alert to display the tracking code and facility name of…
517ff74 
… shipment which handled the order adjustments(hotwax#862)
@ymaheshwari1
Fixed: issue of undefined when filtering data for shipmentId(hotwax#862)
6683845
@ymaheshwari1
Added: some null checks in the adjustment modal and add static text i…
1dc811b 
…n locale(hotwax#862)
@ymaheshwari1
Added: comment in the code to show that we have not considered adjust…
b21d63c 
…ments at ship group level(hotwax#862)
@ymaheshwari1
Improved: adjustment modal to add static label(hotwax#862)
366e176
@ymaheshwari1
Improved: logic to add missing fieldList param in performFind and add…
7cb783a 
…ed a null check when calculating subtotal(hotwax#862)
@ymaheshwari1
Improved: static text in locale file(hotwax#862)
87dd739
@ymaheshwari1 ymaheshwari1 changed the title Implemented: support to display the remaining amount to be collected on the order and the related adjustments(#862) Implemented: support to display the remaining amount to be collected on the order based on COD payment and the related adjustments(#862) Jan 9, 2025
@ymaheshwari1
Copy link
Contributor Author

Following assumptions are made:

  • Order adjustments are not made on shipGroup level in the current flow.
  • The billingShipmentId will always be set on the adjustment. Currently, the billingShipmentId is only set when the adjustment is of type SHIPPING_CHARGES or SHIPPING_SALES_TAX and if the facility is not part of auto_shipping label group, for any other case the billingShipmentId is not set on adjustments.

@ymaheshwari1 ymaheshwari1 merged commit 8fa8ed2 into hotwax:main Jan 9, 2025
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@ymaheshwari1