Fix: missing OPC checkout templates

ps_onepagecheckout.php

@@ -78,7 +78,8 @@ public function install()
             && $this->registerHook('actionCheckoutBuildProcess')
             && $this->registerHook('actionFrontControllerSetMedia')
             && $this->registerHook('actionFrontControllerSetVariables')
-            && $this->registerHook('actionModuleUpgradeAfter');
+            && $this->registerHook('actionModuleUpgradeAfter')
+            && $this->registerHook('displayOverrideTemplate');
     }
 
     public function enable($force_all = false)
@@ -152,7 +153,7 @@ public function hookActionCheckoutBuildProcess(array $params = []): CheckoutProc
 
     public function hookActionFrontControllerSetMedia(): void
     {
-        if (!isset($this->context->controller) || $this->context->controller->php_self !== 'order') {
+        if (!isset($this->context->controller) || !$this->context->controller instanceof OrderController) {
             return;
         }
 
@@ -292,7 +293,7 @@ public function hookActionFrontControllerSetMedia(): void
 
     public function hookActionFrontControllerSetVariables(array $params): void
     {
-        if (!isset($this->context->controller) || $this->context->controller->php_self !== 'order') {
+        if (!isset($this->context->controller) || !$this->context->controller instanceof OrderController) {
             return;
         }
 
@@ -303,6 +304,19 @@ public function hookActionFrontControllerSetVariables(array $params): void
         $params['templateVars']['is_one_page_checkout_enabled'] = $this->isOnePageCheckoutEnabled();
     }
 
+    public function hookDisplayOverrideTemplate(array $params)
+    {
+        if (
+            $this->isOnePageCheckoutEnabled()
+            && $params['template_file'] === 'checkout/checkout'
+            && $params['controller'] instanceof OrderController
+        ) {
+            return 'module:ps_onepagecheckout/views/templates/front/checkout/checkout.tpl';
+        }
+
+        return null;
+    }
+
     public function isOnePageCheckoutEnabled(): bool
     {
         return (new OnePageCheckoutAvailability(self::CONFIG_ONE_PAGE_CHECKOUT_ENABLED))->isEnabled();

src/Checkout/CheckoutOnePageStep.php

@@ -277,6 +277,7 @@ public function render(array $extraParams = [])
                 'isGift' => $this->getCheckoutSession()->getGift()['isGift'],
                 'message' => $this->getCheckoutSession()->getGift()['message'],
             ],
+            'opc_urls' => $this->getOpcUrls(),
             'is_virtual_cart' => $this->context->cart->isVirtualCart(),
             'configuration' => $this->getTemplateConfiguration(),
         ] + $this->opcForm->getTemplateVariables();
@@ -302,6 +303,24 @@ private function getSelectedPaymentSelectionKey(): string
         return (string) ($this->context->cookie->__get('opc_selected_payment_selection_key') ?: '');
     }
 
+    /**
+     * @return array{authentication: string, registration: string}
+     */
+    private function getOpcUrls(): array
+    {
+        $backParams = [];
+        $orderPageUrl = $this->context->link->getPageLink('order', true);
+
+        if (is_string($orderPageUrl) && \Tools::urlBelongsToShop($orderPageUrl)) {
+            $backParams = ['back' => $orderPageUrl];
+        }
+
+        return [
+            'authentication' => $this->context->link->getPageLink('authentication', true, null, $backParams),
+            'registration' => $this->context->link->getPageLink('registration', true, null, $backParams),
+        ];
+    }
+
     private function restoreLastFailedSubmitState(): void
     {
         $submitState = $this->submitValidationStateStorage->consume();

src/Form/OnePageCheckoutForm.php

@@ -49,6 +49,9 @@ class OnePageCheckoutForm extends \AbstractForm
      */
     protected $formatter;
 
+    /**
+     * @var \Context
+     */
     private $context;
     private $customerPersister;
     private $addressPersister;

tests/php/Unit/Checkout/CheckoutOnePageStepRenderTest.php

@@ -51,6 +51,18 @@ public function __get(string $name)
                 return '';
             }
         };
+        $link = $this->createMock(\Link::class);
+        $link->method('getPageLink')
+            ->willReturnCallback(static function ($controller, $ssl = null, $idLang = null, $request = null, $requestUrlEncode = false, $idShop = null, $relativeProtocol = false): string {
+                $url = '/' . $controller;
+
+                if (is_array($request) && $request !== []) {
+                    $url .= '?' . http_build_query($request);
+                }
+
+                return $url;
+            });
+        $context->link = $link;
         $context->controller = new class {
             public function getTemplateVarConfiguration(): array
             {
@@ -186,6 +198,8 @@ protected function renderTemplate($template, array $extraParams = [], array $par
         self::assertArrayHasKey('deliveryFields', $step->capturedParams);
         self::assertArrayHasKey('invoiceFields', $step->capturedParams);
         self::assertArrayHasKey('errors', $step->capturedParams);
+        self::assertSame('/authentication?back=%2Forder', $step->capturedParams['opc_urls']['authentication']);
+        self::assertSame('/registration?back=%2Forder', $step->capturedParams['opc_urls']['registration']);
         self::assertArrayHasKey('configuration', $step->capturedParams);
         self::assertArrayHasKey('is_guest_checkout_enabled', $step->capturedParams['configuration']);
         self::assertIsBool($step->capturedParams['configuration']['is_guest_checkout_enabled']);

tests/php/Unit/Module/PsOnepagecheckoutModuleTest.php

@@ -29,6 +29,7 @@ public function testInstallInitializesDisabledFlagRegistersHooksAndCallsParentIn
             'actionFrontControllerSetMedia',
             'actionFrontControllerSetVariables',
             'actionModuleUpgradeAfter',
+            'displayOverrideTemplate',
         ], $module->registerHookCalls);
     }
 
@@ -122,7 +123,7 @@ public function testHookActionFrontControllerSetVariablesInjectsRuntimeFlagOnOrd
         $module = $this->createModule();
         $module->isEnabled = true;
         $module->setModuleContext((object) [
-            'controller' => (object) ['php_self' => 'order'],
+            'controller' => new DummyOrderController(),
         ]);
 
         $templateVars = [];
@@ -139,7 +140,7 @@ public function testHookActionFrontControllerSetMediaAssignsFlagAndRegistersAsse
         $module->name = 'ps_onepagecheckout';
         $module->isEnabled = true;
         $module->setModuleContext((object) [
-            'controller' => (object) ['php_self' => 'order'],
+            'controller' => new DummyOrderController(),
             'smarty' => new DummySmarty(),
             'link' => new DummyLink(),
         ]);
@@ -151,6 +152,7 @@ public function testHookActionFrontControllerSetMediaAssignsFlagAndRegistersAsse
         self::assertTrue($smarty->assigned['is_one_page_checkout_enabled']);
         self::assertCount(1, $module->javascriptDefinitions);
         self::assertSame(1, $module->registeredJavascriptAssetsCalls);
+        self::assertSame(1, $module->registeredStylesheetAssetsCalls);
         self::assertArrayHasKey('ps_onepagecheckout', $module->javascriptDefinitions[0]);
         self::assertNotEmpty($module->javascriptDefinitions[0]['ps_onepagecheckout']['urls']['guestInit']);
         self::assertNotEmpty($module->javascriptDefinitions[0]['ps_onepagecheckout']['urls']['addressForm']);
@@ -171,7 +173,7 @@ public function testHookActionFrontControllerSetMediaAssignsFlagAndSkipsAssetsWh
         $module->name = 'ps_onepagecheckout';
         $module->isEnabled = false;
         $module->setModuleContext((object) [
-            'controller' => (object) ['php_self' => 'order'],
+            'controller' => new DummyOrderController(),
             'smarty' => new DummySmarty(),
             'link' => new DummyLink(),
         ]);
@@ -183,6 +185,7 @@ public function testHookActionFrontControllerSetMediaAssignsFlagAndSkipsAssetsWh
         self::assertFalse($smarty->assigned['is_one_page_checkout_enabled']);
         self::assertCount(0, $module->javascriptDefinitions);
         self::assertSame(0, $module->registeredJavascriptAssetsCalls);
+        self::assertSame(0, $module->registeredStylesheetAssetsCalls);
     }
 
     public function testMainModuleFileDoesNotContainCustomAutoloaderRegistration(): void
@@ -228,6 +231,7 @@ class TestablePsOnepagecheckoutModule extends \Ps_Onepagecheckout
     public array $javascriptDefinitions = [];
 
     public int $registeredJavascriptAssetsCalls = 0;
+    public int $registeredStylesheetAssetsCalls = 0;
     public bool $isEnabled = true;
     public int $disableCurrentContextCalls = 0;
     public bool $disableCurrentContextResult = true;
@@ -294,6 +298,11 @@ protected function registerOpcJavascriptAssets(): void
         ++$this->registeredJavascriptAssetsCalls;
     }
 
+    protected function registerOpcStylesheets(): void
+    {
+        ++$this->registeredStylesheetAssetsCalls;
+    }
+
     protected function disableInParent(bool $forceAll): bool
     {
         $this->disableInParentCalls[] = $forceAll;
@@ -339,6 +348,13 @@ public function assign($key, $value = null): void
     }
 }
 
+class DummyOrderController extends \OrderController
+{
+    public function __construct()
+    {
+    }
+}
+
 class DummyLink
 {
     /**

views/js/events.js

@@ -5,6 +5,7 @@ const OPC_EVENTS = {
   opcCarriersLoading: 'opcCarriersLoading',
   opcPaymentMethodsLoading: 'opcPaymentMethodsLoading',
   opcPaymentMethodsUpdated: 'opcPaymentMethodsUpdated',
+  opcPaymentMethodsRefreshed: 'opcPaymentMethodsRefreshed',
   opcPaymentMethodsFailed: 'opcPaymentMethodsFailed',
   opcPaymentMethodSelected: 'opcPaymentMethodSelected',
   opcGuestInitSuccess: 'opcGuestInitSuccess',

views/js/opc-address-modal.js

@@ -454,7 +454,7 @@ function updateStateFieldUi($modal, response, selectedStateId) {
     $wrapper.hide();
     $select.prop('required', false).val('');
     if ($row.length) {
-      $row.removeClass('form-fields-row--3').addClass('form-fields-row--2');
+      $row.removeClass('opc-form-fields-row--3').addClass('opc-form-fields-row--2');
     }
 
     return;
@@ -476,7 +476,7 @@ function updateStateFieldUi($modal, response, selectedStateId) {
   $wrapper.show();
   $select.prop('required', true);
   if ($row.length) {
-    $row.removeClass('form-fields-row--2').addClass('form-fields-row--3');
+    $row.removeClass('opc-form-fields-row--2').addClass('opc-form-fields-row--3');
   }
 }
 

views/js/opc-carrier-list.js

@@ -133,10 +133,12 @@ function fetchCarriers() {
 
       const checkedCarrier = $container.find(`${OPC_SELECTORS.inputs.deliveryOption}:checked`).get(0);
       if (checkedCarrier) {
-        $container.attr('data-confirmed-delivery-option', String(checkedCarrier.value || ''));
+        const selectedDeliveryOption = String(checkedCarrier.value || '');
+
+        $container.attr('data-confirmed-delivery-option', selectedDeliveryOption);
         prestashop.emit(OPC_EVENTS.opcCarrierSelected, {
-          carrierId: checkedCarrier.value,
-          resp: response,
+          selectedDeliveryOption,
+          response,
         });
       } else {
         $container.removeAttr('data-confirmed-delivery-option');

views/js/opc-carrier-select.js

@@ -17,7 +17,9 @@ if (!$) {
 const CONTAINER_SELECTOR = OPC_SELECTORS.opc.deliveryMethods;
 const URL_KEY = 'selectCarrier';
 const CHECKOUT_FORM_SELECTOR = OPC_SELECTORS.opc.checkout;
+const OPC_FORM_SELECTOR = OPC_SELECTORS.opc.form;
 const DELIVERY_ADDRESS_SECTION_SELECTOR = OPC_SELECTORS.opc.deliverySection;
+const DELIVERY_OPTION_SELECTOR = '.js-delivery-option';
 const CONFIRMED_DELIVERY_OPTION_ATTRIBUTE = 'data-confirmed-delivery-option';
 
 function getDeliveryAddressSection() {
@@ -113,7 +115,16 @@ $(document).on('change', `${CONTAINER_SELECTOR} ${OPC_SELECTORS.inputs.deliveryO
         updateCartSummary(response.preview, response.totals);
       }
       setConfirmedDeliveryOption($container, deliveryOption);
-      prestashop.emit(OPC_EVENTS.opcCarrierSelected, response);
+      // Keep existing themes compatible with the 4-step checkout carrier lifecycle.
+      prestashop.emit('updatedDeliveryForm', {
+        dataForm: $(OPC_FORM_SELECTOR).serializeArray(),
+        deliveryOption: $radio.closest(DELIVERY_OPTION_SELECTOR),
+        resp: response,
+      });
+      prestashop.emit(OPC_EVENTS.opcCarrierSelected, {
+        selectedDeliveryOption: deliveryOption,
+        response,
+      });
     })
     .fail((jqXHR) => {
       restoreConfirmedDeliveryOption($container);