[DO NOT MERGE] OD-1192 OD-1996 OD-2370: delivery carrier label paazl: fixconflict #8
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
…paazl module, reworked label method to search format from options that has this type set up.
… reuse delivery_carrier methods.
…els' into OD-1996-enable-dhl-shipping-label-print
dkubiak789
reviewed
Mar 8, 2023
Co-authored-by: Darek Kubiak <dariusz@vanmoof.com>
This was referenced Mar 9, 2023
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.
Merges three conflicting and upstream stale PRs into one branch. Note that OD-1992 and OD-1996 are already on production, but their branches could not be merged into the main delivery-carrier branch because they are not accepted in the OCA (and have become stale). Adding OD-2370 on top of them resulted in conflicts which could not be easily fixed by moving the code around. Hence this solution of merging all three branches into one.
If this is accepted, then we need to remove OD-1996 and OD-1192 (not OD-1802) from buildout.cfg and add a line for this branch.Updating buildout PR.