Skip to content

Restore the 2.2.0 delivery option changes that 3.x never received - #235

Draft
boo-code wants to merge 1 commit into
PrestaShop:developfrom
boo-code:fix/restore-2-2-0-delivery-option-changes-39091
Draft

Restore the 2.2.0 delivery option changes that 3.x never received#235
boo-code wants to merge 1 commit into
PrestaShop:developfrom
boo-code:fix/restore-2-2-0-delivery-option-changes-39091

Conversation

@boo-code

@boo-code boo-code commented Sep 5, 2026

Copy link
Copy Markdown
Contributor
Questions Answers
Description? The 3.0.x line was branched before two commits that shipped in 2.2.0, and both are still absent from develop. c24f8372 ("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. acd52d3e ("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. Both cherry-pick cleanly onto develop.
Type? bug fix
BC breaks? no
Deprecations? no
Fixed ticket? Fixes PrestaShop/PrestaShop#39091
Sponsor company
How to test? On the checkout shipping step, pick a carrier that has no extra content: before this change an empty carrier-extra-content box is slid open under it, after it nothing is shown. The delivery option rows also regain the alignment fix - the row class and the .delivery-options > .row border-right are gone together, which is how 2.2.x renders them.

Measured, against the tags

The reporter suspected shipping.tpl had been rolled back. It is stronger than that - the file on every
3.0.x tag and on develop is byte identical to 2.1.3:

2.1.3   templates/checkout/_partials/steps/shipping.tpl   blob 837cfc2b
2.2.0                                                     blob 93409880
3.0.2                                                     blob 837cfc2b   <- back to the 2.1.3 blob
develop                                                   same two lines as 2.1.3

And it is not only the template. Both commits had halves outside templates/, and develop is missing
those too:

_dev/js/checkout.js:79            slideDown() still unguarded      (acd52d3e added the emptiness check)
_dev/css/.../checkout.scss:372    > .row { border-right: ... }     (c24f8372 removed it)
                                  .carrier-extra-content { ... }   absent    (c24f8372 added it)

So re-applying the template alone would have been wrong: the row removal only makes sense together with the
SCSS rule that was styling > .row, and the template's display:none condition 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.3 and
2.2.0 under templates/, comparing each against develop: shipping.tpl is the only one whose current
content 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.0
version, checkout.js carries the carrierExtraContent.html().trim() !== '' guard, the stale > .row rule
is gone and .carrier-extra-content has its padding. node --check passes on checkout.js and the SCSS
braces 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.

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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Classic theme v3.0.2 (for PrestaShop v9.0.0) does not include changes from Classic theme v2.2.0 (for PrestaShop v8.2.1)

1 participant