Restore the 2.2.0 delivery option changes that 3.x never received - #235
Draft
boo-code wants to merge 1 commit into
Draft
Restore the 2.2.0 delivery option changes that 3.x never received#235boo-code wants to merge 1 commit into
boo-code wants to merge 1 commit into
Conversation
The 3.0.x line was branched before two commits that shipped in 2.2.0, and both are still absent from develop: c24f837 fix: alignment issue - drops the Bootstrap row class from .delivery-option and .carrier-extra-content, removes the now unused .delivery-options > .row border-right, and gives .carrier-extra-content its own bottom padding acd52d3 feat: improve display of extra block - keeps the extra content box hidden when the selected carrier has none, in the template and in checkout.js templates/checkout/_partials/steps/shipping.tpl on 3.0.0 through 3.0.6 and on develop is byte identical to the 2.1.3 version, and _dev/js/checkout.js still calls slideDown() unguarded while _dev/css/components/checkout.scss still carries the border-right rule the first commit removed. Both commits cherry-pick cleanly. Reported on PrestaShop/PrestaShop#39091.
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
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.
develop.c24f8372("fix: alignment issue") drops the Bootstraprowclass from.delivery-optionand.carrier-extra-content, removes the now unused.delivery-options > .rowborder-right and gives.carrier-extra-contentits own bottom padding.acd52d3e("feat: improve display of extra block") keeps the extra content box hidden when the selected carrier has none, in the template and incheckout.js. Both cherry-pick cleanly ontodevelop.carrier-extra-contentbox is slid open under it, after it nothing is shown. The delivery option rows also regain the alignment fix - therowclass and the.delivery-options > .rowborder-right are gone together, which is how 2.2.x renders them.Measured, against the tags
The reporter suspected
shipping.tplhad been rolled back. It is stronger than that - the file on every3.0.x tag and on
developis byte identical to 2.1.3:And it is not only the template. Both commits had halves outside
templates/, anddevelopis missingthose too:
So re-applying the template alone would have been wrong: the
rowremoval only makes sense together with theSCSS rule that was styling
> .row, and the template'sdisplay:nonecondition is the pair of the JS guard.Answering the reporter's second question
They asked whether other 2.2.0 changes were lost as well. Checked every file changed between
2.1.3and2.2.0undertemplates/, comparing each againstdevelop:shipping.tplis the only one whose currentcontent still equals the 2.1.3 version. So this is the whole of it, and the two commits above are the whole
of that.
Verification
Both commits cherry-pick with no conflict. After them:
shipping.tpl's two lines are identical to the 2.2.0version,
checkout.jscarries thecarrierExtraContent.html().trim() !== ''guard, the stale> .rowruleis gone and
.carrier-extra-contenthas its padding.node --checkpasses oncheckout.jsand the SCSSbraces balance (205/205).
assets/is not in the diff, as the theme requires.Verification limit
I have not rebuilt the theme assets or looked at the checkout in a browser. What is measured is that the two
commits are absent, that they apply cleanly, and that the result matches what 2.2.0 shipped.