From 0c6043616bcfd793e316cd2f84ba41c62e4aa4d6 Mon Sep 17 00:00:00 2001
From: boo-code <boo-code@users.noreply.github.com>
Date: Sat, 5 Sep 2026 12:54:33 +0200
Subject: [PATCH] Restore the 2.2.0 delivery option changes that 3.x never
 received

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

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.
---
 _dev/css/components/checkout.scss               | 8 ++++----
 _dev/js/checkout.js                             | 9 +++++++--
 templates/checkout/_partials/steps/shipping.tpl | 4 ++--
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/_dev/css/components/checkout.scss b/_dev/css/components/checkout.scss
index f82a4123..07be374b 100644
--- a/_dev/css/components/checkout.scss
+++ b/_dev/css/components/checkout.scss
@@ -369,10 +369,6 @@ body#checkout {
     }
 
     .delivery-options {
-      > .row {
-        border-right: 0.1rem solid darken($gray-lighter, 20%);
-      }
-
       .delivery-option {
         min-height: 80px;
         padding: 0.9375rem 0;
@@ -407,6 +403,10 @@ body#checkout {
           width: 3.125rem;
         }
       }
+
+      .carrier-extra-content {
+        padding-block-end: 1rem;
+      }
     }
 
     .carrier-delay,
diff --git a/_dev/js/checkout.js b/_dev/js/checkout.js
index 28032901..d77d9148 100644
--- a/_dev/js/checkout.js
+++ b/_dev/js/checkout.js
@@ -75,7 +75,12 @@ $(document).ready(() => {
     }
     // Hide all carrier extra content ...
     $(prestashop.themeSelectors.checkout.carrierExtraContent).hide();
-    // and show the one related to the selected carrier
-    params.deliveryOption.next(prestashop.themeSelectors.checkout.carrierExtraContent).slideDown();
+
+    // Show the one related to the selected carrier
+    const carrierExtraContent = params.deliveryOption.next(prestashop.themeSelectors.checkout.carrierExtraContent);
+
+    if (carrierExtraContent.html().trim() !== '') {
+      carrierExtraContent.slideDown();
+    }
   });
 });
diff --git a/templates/checkout/_partials/steps/shipping.tpl b/templates/checkout/_partials/steps/shipping.tpl
index 837cfc2b..93409880 100644
--- a/templates/checkout/_partials/steps/shipping.tpl
+++ b/templates/checkout/_partials/steps/shipping.tpl
@@ -41,7 +41,7 @@
           {block name='delivery_options'}
             <div class="delivery-options">
               {foreach from=$delivery_options item=carrier key=carrier_id}
-                  <div class="row delivery-option js-delivery-option">
+                  <div class="delivery-option js-delivery-option">
                     <div class="col-sm-1">
                       <span class="custom-radio float-xs-left">
                         <input type="radio" name="delivery_option[{$id_address}]" id="delivery_option_{$carrier.id}" value="{$carrier_id}"{if $delivery_option == $carrier_id} checked{/if}>
@@ -71,7 +71,7 @@
                       </div>
                     </label>
                   </div>
-                  <div class="row carrier-extra-content js-carrier-extra-content"{if $delivery_option != $carrier_id} style="display:none;"{/if}>
+                  <div class="carrier-extra-content js-carrier-extra-content"{if ($delivery_option != $carrier_id) || ($delivery_option == $carrier_id && empty($carrier.extraContent))} style="display:none;"{/if}>
                     {$carrier.extraContent nofilter}
                   </div>
                   <div class="clearfix"></div>