Fix Spree::Shipment#item_cost for split shipments #18
+92
−22
Conversation
This file contains 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
aitbw
reviewed
Oct 19, 2018
| @@ -141,6 +141,26 @@ | |||
| it 'should equal line items final amount with tax' do | |||
| expect(shipment.item_cost).to eql(11.0) | |||
| end | |||
|
|
|||
| context 'whit more shipments for the same line_item' do | |||
There was a problem hiding this comment.
Small typo in here, should be with instead of whit
spaghetticode
approved these changes
Jan 31, 2019
There was a problem hiding this comment.
@DanielePalombo thank you for the fix! 👏 🎉
I left a comment, only a minor suggestion.
core/app/models/spree/shipment.rb
Outdated
| @@ -186,7 +186,7 @@ def inventory_units_for_item(line_item, variant = nil) | |||
| end | |||
|
|
|||
| def item_cost | |||
| line_items.map(&:total).sum | |||
| manifest.map { |m| (m.line_item.price + (m.line_item.adjustment_total / m.line_item.quantity)) * m.quantity }.sum | |||
There was a problem hiding this comment.
I confess it was hard for me to understand this line. I think that expanding the block to multiple lines and adding a temporary variable may improve understandability also for other people that don't have much confidence with this part of Solidus, something like this:
manifest.map do |m|
adjusted_cost = m.line_item.price + m.line_item.adjustment_total / m.line_item.quantity
adjusted_cost * m.quantity
end.sum`manifest` method returns Spree::ShippingManifest#items, this commit is going to rename it to `shipping_manifest_items`. I also refactored it to use the memoize shipping_manifest method.
`manifest` method returns Spree::ShippingManifest#items, this commit is going to rename it to `shipping_manifest_items`. I also refactored it to use the memoize shipping_manifest method.
This commit is going to rename the method `manifest_for_order` to `shipping_manifest_for_order` I also refactored it to use the memoized `shipping_manifest` method.
DanielePalombo
force-pushed
the
nebulab/fix-shipment-item-cost
branch
from
c416047
to
8f7e971
Compare
This commit is going to add `item_cost` calculation, all these item costs will be summed.
DanielePalombo
force-pushed
the
nebulab/fix-shipment-item-cost
branch
from
8f7e971
to
1d321f2
Compare
|
@DanielePalombo what about submitting this PR on Solidus main repo? |
|
I would like to submit it, But there are some failing tests. I'll work on it next Friday! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR is going to fix the bug reported here solidusio#2919.
Now when shipment is split, it creates two shipment but associated
line_item has quantity 2 which is resulting in incorrect item_cost
because it is taken from line_item not from shipment.
Shipment manifest know the right quantity for every shipment, use it to
calculate the item_cost as sum of
(single_line item + weighted adjustment per line item) * quantity