Fix: Only show shipping contact if customer contact is defined #33793
Conversation
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
# Conflicts: # htdocs/compta/facture/class/facture.class.php
# Conflicts: # htdocs/hrm/evaluation_list.php # htdocs/product/stock/list.php # htdocs/public/payment/paymentok.php
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
The shipping contact address (SHIPPING) was only displayed if the order also had a customer contact associated with it (CUSTOMER), which caused the $usecontact variable to be true. I don't think this makes much sense, and if a delivery contact is defined, that address should be displayed regardless of whether another contact type exists.
That's why I've made it so that if the shipping address exists, it will always be used regardless of the $usecontact variable.