Unit net price and discounted unit net price on the invoice #287
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
Zales0123
force-pushed
the
original-unit-net-price
branch
from
ead0105 to
e9a42e4
Compare
Zales0123
force-pushed
the
original-unit-net-price
branch
from
80c3296 to
f5e6dc7
Compare
Zales0123
changed the title
AdamKasp
approved these changes
Aug 18, 2022
lchrusciel
approved these changes
Aug 18, 2022
Comment on lines
+64
to
+65
| $unitNetPrice = $grossValue - $taxAmount - $shipment->getAdjustmentsTotal(AdjustmentInterface::ORDER_SHIPPING_PROMOTION_ADJUSTMENT); | ||
| $discountedUnitNetPrice = $grossValue - $taxAmount; |
There was a problem hiding this comment.
Suggested change
| $unitNetPrice = $grossValue - $taxAmount - $shipment->getAdjustmentsTotal(AdjustmentInterface::ORDER_SHIPPING_PROMOTION_ADJUSTMENT); | |
| $discountedUnitNetPrice = $grossValue - $taxAmount; | |
| $discountedUnitNetPrice = $grossValue - $taxAmount; | |
| $unitNetPrice = $discountedUnitNetPrice - $shipment->getAdjustmentsTotal(AdjustmentInterface::ORDER_SHIPPING_PROMOTION_ADJUSTMENT); |
|
|
||
| public function up(Schema $schema): void | ||
| { | ||
| $this->addSql('ALTER TABLE sylius_invoicing_plugin_line_item ADD discounted_unit_net_price INT DEFAULT NULL'); |
There was a problem hiding this comment.
Shouldn't we add checks similar to Sylius? https://github.com/Sylius/Sylius/blob/1.12/src/Sylius/Bundle/CoreBundle/Doctrine/Migrations/AbstractMigration.php#L23
| @@ -59,13 +61,15 @@ private function convertShippingAdjustmentToLineItem(AdjustmentInterface $shippi | |||
| $grossValue = $shipment->getAdjustmentsTotal(); | |||
| $taxAdjustment = $this->getShipmentTaxAdjustment($shipment); | |||
| $taxAmount = $taxAdjustment !== null ? $taxAdjustment->getAmount() : 0; | |||
| $netValue = $grossValue - $taxAmount; | |||
| $unitNetPrice = $grossValue - $taxAmount - $shipment->getAdjustmentsTotal(AdjustmentInterface::ORDER_SHIPPING_PROMOTION_ADJUSTMENT); | |||
There was a problem hiding this comment.
I have the feeling, that it is small de-cohesion, that in the units to line items converter we have dedicated service for net price calculation and here we don't
There was a problem hiding this comment.
Indeed 👍 we could probably refactor (could be done in a separate PR IMO) 🖖
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.
Fixes #273