[API][UI][Behat][Refactor] OriginalUnitPrice property on the OrderItem entity#13563
Merged
GSadee merged 3 commits intoFeb 3, 2022
Conversation
Rafikooo
commented
Jan 28, 2022
GSadee
reviewed
Jan 31, 2022
lchrusciel
reviewed
Jan 31, 2022
vvasiloi
reviewed
Jan 31, 2022
GSadee
reviewed
Jan 31, 2022
GSadee
reviewed
Jan 31, 2022
vvasiloi
reviewed
Jan 31, 2022
Contributor
|
WDYT about adding a method on the Order model to get the items total based on original unit price? Edit: it would also require additional methods on the order item to calculate it's total first, plus a property to store the result and methods to recalculate the total. Just like with the current units and items total. |
cyberkurumin
reviewed
Feb 1, 2022
Zales0123
reviewed
Feb 1, 2022
GSadee
reviewed
Feb 1, 2022
Rafikooo
commented
Feb 2, 2022
| "productName": "Mug", | ||
| "id": @integer@, | ||
| "quantity": 3, | ||
| "originalPrice": null |
Contributor
Author
There was a problem hiding this comment.
TBH I'm not sure about that field. I checked the master demo API endpoint
api/v2/shop/account/orders/{tokenValue}/payments/{paymentId}
and it seems that that field should not be included, but I had one and it broke the tests
Rafikooo
commented
Feb 2, 2022
| "id": @integer@, | ||
| "quantity": 3, | ||
| "unitPrice": 2000, | ||
| "originalUnitPrice": 2000, |
Contributor
Author
There was a problem hiding this comment.
After consultation with @GSadee originalUnitPrice can be included in that response
GSadee
reviewed
Feb 3, 2022
Comment on lines
+31
to
+49
| if ($this->originalUnitPriceIsGreaterThanUnitPriceAndDiscountedUnitPrice($item)) { | ||
| return $item->getOriginalUnitPrice(); | ||
| } elseif($this->originalUnitPriceIsNullAndUnitPriceIsGreaterThanDiscountedUnitPrice($item)) { | ||
| return $item->getUnitPrice(); | ||
| } | ||
|
|
||
| return null; | ||
| } | ||
|
|
||
| private function originalUnitPriceIsGreaterThanUnitPriceAndDiscountedUnitPrice(OrderItem $item): bool | ||
| { | ||
| return ($item->getOriginalUnitPrice() !== null && $item->getOriginalUnitPrice() > $item->getUnitPrice()) || | ||
| ($item->getOriginalUnitPrice() !== null && $item->getOriginalUnitPrice() > $item->getDiscountedUnitPrice()); | ||
| } | ||
|
|
||
| private function originalUnitPriceIsNullAndUnitPriceIsGreaterThanDiscountedUnitPrice(OrderItem $item): bool | ||
| { | ||
| return $item->getOriginalUnitPrice() === null && $item->getUnitPrice() > $item->getDiscountedUnitPrice(); | ||
| } |
Member
There was a problem hiding this comment.
Suggested change
| if ($this->originalUnitPriceIsGreaterThanUnitPriceAndDiscountedUnitPrice($item)) { | |
| return $item->getOriginalUnitPrice(); | |
| } elseif($this->originalUnitPriceIsNullAndUnitPriceIsGreaterThanDiscountedUnitPrice($item)) { | |
| return $item->getUnitPrice(); | |
| } | |
| return null; | |
| } | |
| private function originalUnitPriceIsGreaterThanUnitPriceAndDiscountedUnitPrice(OrderItem $item): bool | |
| { | |
| return ($item->getOriginalUnitPrice() !== null && $item->getOriginalUnitPrice() > $item->getUnitPrice()) || | |
| ($item->getOriginalUnitPrice() !== null && $item->getOriginalUnitPrice() > $item->getDiscountedUnitPrice()); | |
| } | |
| private function originalUnitPriceIsNullAndUnitPriceIsGreaterThanDiscountedUnitPrice(OrderItem $item): bool | |
| { | |
| return $item->getOriginalUnitPrice() === null && $item->getUnitPrice() > $item->getDiscountedUnitPrice(); | |
| } | |
| if ( | |
| $item->getOriginalUnitPrice() !== null && | |
| ($item->getOriginalUnitPrice() > $item->getUnitPrice()) || $item->getOriginalUnitPrice() > $item->getDiscountedUnitPrice()) | |
| ) { | |
| return $item->getOriginalUnitPrice(); | |
| } | |
| if ($item->getOriginalUnitPrice() === null && $item->getUnitPrice() > $item->getDiscountedUnitPrice()) { | |
| return $item->getUnitPrice(); | |
| } | |
| return null; | |
| } |
…is added to the cart
…nalPrice' to 'originalUnitPrice'
GSadee
approved these changes
Feb 3, 2022
Member
|
Thanks, Rafał! 🎉 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
To increase immutability, at the moment of adding an item to the cart, we should save the original price to the
originalUnitPriceof this order item.Using saved
originalUnitPriceinstead of using the prices from ChannelPricing while processing cart each time.