[BUGFIX] Proper storage of taxes for an order #521
Merged
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
Tax fields were not shown as they were not referenced because they were prefixed with `order_`.
This setting is removed since TYPO3 v7, see https://docs.typo3.org/c/typo3/cms-core/main/en-us/Changelog/7.4/Breaking-67753-DropSecondaryOptions.html#tca
An order has two different taxes: * `tax`: That's the tax for all the products in the cart. * `totalTax`: That's the tax for the whole order which includes the tax from above plus tax on services like shipping and/or payment. Before this bugfix the taxes were not persisted properly because the relation was not correct implemented in TCA. By introducing the `foreign_match_fields` the relations are correctly resolved. Fixes: extcode#312
This adds an EventListener which persists the fields `tax` and `totalTax` for an orderItem so that those values can be used for PDFs and of course also to show them in the BE view. Fixes: extcode#509
During an order the EventListener created tax records. These records are never used and not even configured in the TCA so they are not even related to the orderProduct after there creation (field `item` is `0` after persisting them in the table.)
extcode
reviewed
Jun 6, 2024
| ); | ||
| $orderTax->setPid($this->storagePid); | ||
|
|
||
| $this->taxRepository->add($orderTax); |
There was a problem hiding this comment.
Think the $this->taxRepository isn't needed anymore in this class. Could the property and inject-method can also be removed?
There was a problem hiding this comment.
@extcode I have unfortunately no laptop with me, just a smartphone with the GitHub app. If you want to merge it quick you need to adapt the code yourself. All the proposals look good to me.
|
|
||
| protected function addTaxToRepositoryAndItem( | ||
| PersistOrderEventInterface $event, | ||
| OrderItem $orderItem, |
There was a problem hiding this comment.
Can we remove the extra function parameter $orderItem? We can get it from $event in this method again.
Suggested change
| OrderItem $orderItem, | |
| OrderItem $orderItem, | ||
| string $typeOfTax | ||
| ): OrderItem { | ||
| $cart = $event->getCart(); |
There was a problem hiding this comment.
See comment above.
Suggested change
| $cart = $event->getCart(); | |
| $cart = $event->getCart(); | |
| $orderItem = $event->getOrderItem(); |
|
|
||
| /** @var int $taxClassId */ | ||
| /** @var float $tax */ | ||
| foreach ($taxes as $taxClassId => $tax) { |
There was a problem hiding this comment.
If you change:
Suggested change
| foreach ($taxes as $taxClassId => $tax) { | |
| foreach ($taxes as $taxClassId => $taxValue) { |
you can remove the new variable in line 55.
| foreach ($taxes as $taxClassId => $tax) { | ||
| $taxValue = $tax; | ||
| $taxClass = $taxClasses[$taxClassId]; | ||
| $orderTax = GeneralUtility::makeInstance(OrderTax::class, $taxValue, $taxClass); |
There was a problem hiding this comment.
I think this is also readable:
Suggested change
| $orderTax = GeneralUtility::makeInstance(OrderTax::class, $taxValue, $taxClass); | |
| $orderTax = GeneralUtility::makeInstance(OrderTax::class, $taxValue, $taxClasses[$taxClassId]); |
to we do not need the variable assignment.
| Extcode\Cart\EventListener\Order\Create\PersistOrder\Taxes: | ||
| tags: | ||
| - name: event.listener | ||
| identifier: 'cart--order--create--persist-order--tax' |
There was a problem hiding this comment.
My syntax for the identifier is related to the class name. Can you change this?
Suggested change
| identifier: 'cart--order--create--persist-order--tax' | |
| identifier: 'cart--order--create--persist-order--taxes' |
extcode
merged commit 0af2151
into
extcode:bugfix/312/multiple-tax-entries-v2
9 checks passed
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.
Render fields tax and orderTax in BE List module.
Fixes: #312, #509