diff --git a/ps_onepagecheckout.php b/ps_onepagecheckout.php
index 69d5784..1000938 100644
--- a/ps_onepagecheckout.php
+++ b/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();
diff --git a/src/Checkout/CheckoutOnePageStep.php b/src/Checkout/CheckoutOnePageStep.php
index 6862e60..284dcea 100644
--- a/src/Checkout/CheckoutOnePageStep.php
+++ b/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();
diff --git a/src/Form/OnePageCheckoutForm.php b/src/Form/OnePageCheckoutForm.php
index bf7c290..ed8bed3 100644
--- a/src/Form/OnePageCheckoutForm.php
+++ b/src/Form/OnePageCheckoutForm.php
@@ -49,6 +49,9 @@ class OnePageCheckoutForm extends \AbstractForm
      */
     protected $formatter;
 
+    /**
+     * @var \Context
+     */
     private $context;
     private $customerPersister;
     private $addressPersister;
diff --git a/tests/php/Unit/Checkout/CheckoutOnePageStepRenderTest.php b/tests/php/Unit/Checkout/CheckoutOnePageStepRenderTest.php
index e0c181b..5345921 100644
--- a/tests/php/Unit/Checkout/CheckoutOnePageStepRenderTest.php
+++ b/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']);
diff --git a/tests/php/Unit/Js/OpcJavascriptContractTest.php b/tests/php/Unit/Js/OpcJavascriptContractTest.php
deleted file mode 100644
index 1e4f35a..0000000
--- a/tests/php/Unit/Js/OpcJavascriptContractTest.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-/**
- * For the full copyright and license information, please view the
- * docs/licenses/LICENSE.txt file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace Tests\Unit\Js;
-
-use PHPUnit\Framework\TestCase;
-
-class OpcJavascriptContractTest extends TestCase
-{
-    public function testSharedOpcContractsExposeCentralizedEventsAndSelectors(): void
-    {
-        $events = (string) file_get_contents(_PS_ROOT_DIR_ . '/modules/ps_onepagecheckout/views/js/events.js');
-        $selectors = (string) file_get_contents(_PS_ROOT_DIR_ . '/modules/ps_onepagecheckout/views/js/selectors.js');
-
-        self::assertStringContainsString("opcCarrierSelected: 'opcCarrierSelected'", $events);
-        self::assertStringContainsString("opcPaymentMethodsUpdated: 'opcPaymentMethodsUpdated'", $events);
-        self::assertStringContainsString("updatedOpcAddressForm: 'updatedOpcAddressForm'", $events);
-        self::assertStringContainsString("opcSubmitFailed: 'opcSubmitFailed'", $events);
-        self::assertStringContainsString("deliveryMethods: '#opc-delivery-methods'", $selectors);
-        self::assertStringContainsString("paymentMethods: '#opc-payment-methods'", $selectors);
-        self::assertStringContainsString("checkoutFooter: '.one-page-checkout__footer'", $selectors);
-        self::assertStringContainsString("address: '#opc-address-modal, #modal-delivery, #modal-invoice'", $selectors);
-    }
-
-    public function testSubmitScriptEmitsHistoricalFinalSubmitEvent(): void
-    {
-        $script = (string) file_get_contents(_PS_ROOT_DIR_ . '/modules/ps_onepagecheckout/views/js/opc-submit.js');
-        self::assertStringContainsString("import OPC_EVENTS from './events';", $script);
-        self::assertStringContainsString("import OPC_SELECTORS from './selectors';", $script);
-        self::assertStringContainsString("import {getConfiguredOpcUrl, normalizeErrorResponse, updatePayAmount} from './runtime/opc-runtime';", $script);
-        self::assertStringContainsString('prestashop.emit(OPC_EVENTS.opcFinalSubmitStarted)', $script);
-        self::assertStringContainsString('const OPC_FORM_ID_SELECTOR = OPC_SELECTORS.opc.form;', $script);
-        self::assertStringContainsString('const PAY_BUTTON_SELECTOR = OPC_SELECTORS.opc.payButton;', $script);
-        self::assertStringContainsString('prestashop.on(OPC_EVENTS.opcPaymentMethodsLoading', $script);
-        self::assertStringContainsString('prestashop.on(OPC_EVENTS.opcPaymentMethodsFailed', $script);
-        self::assertStringContainsString('const OPC_SUBMIT_URL_KEY = \'opcSubmit\';', $script);
-        self::assertStringContainsString('function ajaxCheckCartStillOrderable()', $script);
-        self::assertStringContainsString('HTMLFormElement.prototype.submit.call(innerForm)', $script);
-        self::assertStringContainsString('const optionId = paymentRadio.id;', $script);
-        self::assertStringContainsString('function bindScopedValidationListeners(form)', $script);
-        self::assertStringContainsString('bindChangeValidationListeners(form, DELIVERY_OPTION_SELECTOR', $script);
-        self::assertStringContainsString('bindChangeValidationListeners(paymentContainer, PAYMENT_OPTION_SELECTOR', $script);
-        self::assertStringNotContainsString("document.addEventListener('change'", $script);
-        self::assertStringNotContainsString("payload.set('submitOnePageCheckout', '1')", $script);
-        self::assertStringContainsString('window.location.href = response.checkout_url || window.prestashop.urls.pages.order;', $script);
-    }
-
-    public function testGuestInitScriptUsesModuleRuntimeContract(): void
-    {
-        $script = (string) file_get_contents(_PS_ROOT_DIR_ . '/modules/ps_onepagecheckout/views/js/opc-guest-init.js');
-        self::assertStringContainsString('import {getConfiguredOpcUrl}', $script);
-        self::assertStringContainsString("import OPC_EVENTS from './events';", $script);
-        self::assertStringContainsString("import OPC_SELECTORS from './selectors';", $script);
-        self::assertStringContainsString('getConfiguredOpcUrl(MODULE_GUEST_INIT_URL_KEY)', $script);
-        self::assertStringContainsString('prestashop.on(OPC_EVENTS.opcFinalSubmitStarted', $script);
-        self::assertStringContainsString('const OPC_CONTACT_SECTION_SELECTOR = OPC_SELECTORS.opc.contactSection;', $script);
-        self::assertStringNotContainsString('getOpcAddressContainer', $script);
-    }
-
-    public function testAddressFormScriptUsesModuleRuntimeContract(): void
-    {
-        $script = (string) file_get_contents(_PS_ROOT_DIR_ . '/modules/ps_onepagecheckout/views/js/opc-address.js');
-        self::assertStringContainsString('import {getConfiguredOpcUrl}', $script);
-        self::assertStringContainsString("import OPC_EVENTS from './events';", $script);
-        self::assertStringContainsString("import OPC_SELECTORS from './selectors';", $script);
-        self::assertStringContainsString('getConfiguredOpcUrl(MODULE_ADDRESS_FORM_URL_KEY)', $script);
-        self::assertStringContainsString('prestashop.emit(OPC_EVENTS.opcDeliveryAddressUpdated', $script);
-        self::assertStringContainsString('prestashop.emit(OPC_EVENTS.opcBillingAddressUpdated', $script);
-    }
-
-    public function testPaymentScriptsUseModuleRuntimeContracts(): void
-    {
-        $listScript = (string) file_get_contents(_PS_ROOT_DIR_ . '/modules/ps_onepagecheckout/views/js/opc-payment-list.js');
-        $selectScript = (string) file_get_contents(_PS_ROOT_DIR_ . '/modules/ps_onepagecheckout/views/js/opc-payment-select.js');
-
-        self::assertStringContainsString("import OPC_EVENTS from './events';", $listScript);
-        self::assertStringContainsString("import OPC_SELECTORS from './selectors';", $listScript);
-        self::assertStringContainsString('paymentMethods', $listScript);
-        self::assertStringContainsString("prestashop.emit('handleError'", $listScript);
-        self::assertStringContainsString('prestashop.on(OPC_EVENTS.opcCarrierSelected', $listScript);
-        self::assertStringContainsString('prestashop.on(OPC_EVENTS.opcGuestInitSuccess', $listScript);
-        self::assertStringContainsString('prestashop.on(OPC_EVENTS.opcCarriersLoading', $listScript);
-        self::assertStringContainsString('prestashop.on(OPC_EVENTS.opcCarriersFailed', $listScript);
-        self::assertStringContainsString('fetchGeneration', $listScript);
-        self::assertStringNotContainsString("prestashop.on('opcCarriersUpdated'", $listScript);
-        self::assertStringNotContainsString("prestashop.on('opcDeliveryAddressUpdated'", $listScript);
-        self::assertStringContainsString("import OPC_EVENTS from './events';", $selectScript);
-        self::assertStringContainsString("import OPC_SELECTORS from './selectors';", $selectScript);
-        self::assertStringContainsString('selectPayment', $selectScript);
-        self::assertStringContainsString('payment_selection_key', $selectScript);
-        self::assertStringContainsString('selected_payment_selection_key', $selectScript);
-        self::assertStringContainsString('OPC_EVENTS.opcPaymentMethodSelected', $selectScript);
-    }
-}
diff --git a/tests/php/Unit/Module/PsOnepagecheckoutModuleTest.php b/tests/php/Unit/Module/PsOnepagecheckoutModuleTest.php
index 8bbb8b5..a9f60e9 100644
--- a/tests/php/Unit/Module/PsOnepagecheckoutModuleTest.php
+++ b/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
 {
     /**
diff --git a/views/js/events.js b/views/js/events.js
index 8cc7e25..448cb55 100644
--- a/views/js/events.js
+++ b/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',
diff --git a/views/js/opc-address-modal.js b/views/js/opc-address-modal.js
index d10eea0..6e5f3f4 100644
--- a/views/js/opc-address-modal.js
+++ b/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');
   }
 }
 
diff --git a/views/js/opc-carrier-list.js b/views/js/opc-carrier-list.js
index c42da77..bc9eb09 100644
--- a/views/js/opc-carrier-list.js
+++ b/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');
diff --git a/views/js/opc-carrier-select.js b/views/js/opc-carrier-select.js
index c40de7d..b796beb 100644
--- a/views/js/opc-carrier-select.js
+++ b/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);
diff --git a/views/js/opc-payment-list.js b/views/js/opc-payment-list.js
index d438b13..a6b9dda 100644
--- a/views/js/opc-payment-list.js
+++ b/views/js/opc-payment-list.js
@@ -18,6 +18,7 @@ const CONTAINER_SELECTOR = OPC_SELECTORS.opc.paymentMethods;
 const CHECKOUT_FORM_SELECTOR = OPC_SELECTORS.opc.checkout;
 const URL_KEY = 'paymentMethods';
 let fetchGeneration = 0;
+let lastFetchedPaymentListDom = null;
 
 function getTemplateHtml(templateId) {
   const template = document.querySelector(`#${templateId}`);
@@ -46,16 +47,29 @@ function getSelectedSavedAddressId(listSelector, radioName) {
   return selectedAddressId;
 }
 
-function setLoading() {
-  const $container = getContainer();
-  if (!$container.length) {
+function getLoaderOverlay() {
+  return document.getElementById('opc-payment-methods-loader');
+}
+
+function showLoader() {
+  const overlay = getLoaderOverlay();
+  if (!overlay) {
     return;
   }
-
-  $container.html(getTemplateHtml(OPC_SELECTORS.templates.paymentLoader.replace('#', '')));
+  overlay.classList.remove('d-none');
+  overlay.setAttribute('aria-hidden', 'false');
   prestashop.emit(OPC_EVENTS.opcPaymentMethodsLoading, {});
 }
 
+function hideLoader() {
+  const overlay = getLoaderOverlay();
+  if (!overlay) {
+    return;
+  }
+  overlay.classList.add('d-none');
+  overlay.setAttribute('aria-hidden', 'true');
+}
+
 function buildPaymentMethodsUrl(baseUrl) {
   const form = getCheckoutForm();
 
@@ -103,7 +117,7 @@ function fetchPaymentMethods() {
   }
 
   const generation = ++fetchGeneration;
-  setLoading();
+  showLoader();
 
   $.get(paymentMethodsUrl)
     .done((response) => {
@@ -114,14 +128,25 @@ function fetchPaymentMethods() {
       if (!response || response.success === false) {
         const error = normalizeErrorResponse(response, 'Unable to load payment methods.');
         $container.html(getTemplateHtml(OPC_SELECTORS.templates.paymentError.replace('#', '')));
+        lastFetchedPaymentListDom = null;
+        hideLoader();
         prestashop.emit(OPC_EVENTS.opcPaymentMethodsFailed, {error});
         prestashop.emit('handleError', {eventType: 'opcPaymentMethods', resp: error});
 
         return;
       }
 
-      $container.html(response.payment_html || '');
-      prestashop.emit(OPC_EVENTS.opcPaymentMethodsUpdated, response);
+      const responsePaymentHtml = response.payment_html || '';
+
+      if (lastFetchedPaymentListDom !== responsePaymentHtml) {
+        $container.html(responsePaymentHtml);
+        lastFetchedPaymentListDom = responsePaymentHtml;
+        prestashop.emit(OPC_EVENTS.opcPaymentMethodsUpdated, response);
+      } else {
+        prestashop.emit(OPC_EVENTS.opcPaymentMethodsRefreshed, response);
+      }
+
+      hideLoader();
     })
     .fail((jqXHR) => {
       if (generation !== fetchGeneration) {
@@ -130,6 +155,8 @@ function fetchPaymentMethods() {
 
       const error = getAjaxErrorResponse(jqXHR, 'Unable to load payment methods.');
       $container.html(getTemplateHtml(OPC_SELECTORS.templates.paymentError.replace('#', '')));
+      lastFetchedPaymentListDom = null;
+      hideLoader();
       prestashop.emit(OPC_EVENTS.opcPaymentMethodsFailed, {error});
       prestashop.emit('handleError', {eventType: 'opcPaymentMethods', resp: error});
     });
@@ -147,7 +174,7 @@ prestashop.on(OPC_EVENTS.opcGuestInitSuccess, fetchPaymentMethods);
 prestashop.on(OPC_EVENTS.opcPaymentMethodsRetry, fetchPaymentMethods);
 prestashop.on(OPC_EVENTS.opcCarriersLoading, () => {
   fetchGeneration += 1;
-  setLoading();
+  showLoader();
 });
 
 prestashop.on(OPC_EVENTS.opcCarriersFailed, () => {
@@ -156,7 +183,9 @@ prestashop.on(OPC_EVENTS.opcCarriersFailed, () => {
   fetchGeneration += 1;
   if ($container.length) {
     $container.html(getTemplateHtml(OPC_SELECTORS.templates.paymentError.replace('#', '')));
+    lastFetchedPaymentListDom = null;
   }
+  hideLoader();
 
   prestashop.emit(OPC_EVENTS.opcPaymentMethodsFailed, {error: 'carrier fetch failed'});
 });
diff --git a/views/js/opc-submit.js b/views/js/opc-submit.js
index 7919cff..e032a7e 100644
--- a/views/js/opc-submit.js
+++ b/views/js/opc-submit.js
@@ -453,6 +453,47 @@ async function continueSuccessfulSubmit(response, paymentRadio) {
   window.location.href = response.checkout_url || window.prestashop.urls.pages.order;
 }
 
+  async function submitBeforePayment(form) {
+    if (isFinalSubmitInFlight) {
+      return;
+    }
+
+    const paymentSelection = ensureSubmitPreconditions(form);
+    if (!paymentSelection.isValid) {
+      return;
+    }
+
+    const submitUrl = getOpcSubmitUrl();
+    if (!submitUrl) {
+      return;
+    }
+
+    const payButton = getPayButton();
+    const payload = buildSubmitPayload(form, paymentSelection.paymentRadio);
+
+    isFinalSubmitInFlight = true;
+    if (payButton instanceof HTMLButtonElement) {
+      payButton.disabled = true;
+    }
+
+    try {
+      const response = await fetchOpcSubmitResponse(submitUrl, payload);
+
+      if (!response || response.success !== true) {
+        handleOpcSubmitFailure(response);
+      }
+    } catch (error) {
+      prestashop.emit('handleError', {
+        eventType: 'opcSubmit',
+        resp: {},
+      });
+      prestashop.emit(OPC_EVENTS.opcSubmitFailed, {error});
+    } finally {
+      isFinalSubmitInFlight = false;
+      validateForm();
+    }
+  }
+
 async function submitOpcPay(form) {
   if (isFinalSubmitInFlight) {
     return;
@@ -519,6 +560,7 @@ function bindValidationListeners(form, payButton) {
   if (!payButton.dataset.opcSubmitHandlerBound) {
     payButton.addEventListener('click', (event) => {
       event.preventDefault();
+      event.stopPropagation();
 
       if (isFinalSubmitInFlight || payButton.disabled) {
         return;
@@ -595,6 +637,16 @@ $(document).ready(() => {
   initBillingToggle();
   validateForm();
 
+  window.ps_onepagecheckout.submitBeforePayment = () => {
+    const form = getCheckoutForm();
+
+    if (!(form instanceof HTMLFormElement)) {
+      return Promise.reject(new Error('OPC form not found.'));
+    }
+
+    return submitBeforePayment(form);
+  };
+
   prestashop.on(OPC_EVENTS.opcPaymentMethodsLoading, () => {
     paymentMethodsState = 'loading';
     validateForm();
@@ -609,6 +661,11 @@ $(document).ready(() => {
     bindScopedValidationListeners(form);
     validateForm();
   });
+  prestashop.on(OPC_EVENTS.opcPaymentMethodsRefreshed, () => {
+    paymentMethodsState = 'ready';
+    bindScopedValidationListeners(form);
+    validateForm();
+  });
   prestashop.on(OPC_EVENTS.opcDeliveryAddressUpdated, () => {
     initBillingToggle();
     bindScopedValidationListeners(form);
diff --git a/views/js/selectors.js b/views/js/selectors.js
index 08e64fd..256d956 100644
--- a/views/js/selectors.js
+++ b/views/js/selectors.js
@@ -23,7 +23,6 @@ const OPC_SELECTORS = {
   templates: {
     carrierLoader: '#opc-template-loader',
     carrierError: '#opc-template-carriers-error',
-    paymentLoader: '#opc-template-payment-loader',
     paymentError: '#opc-template-payment-error',
   },
   inputs: {
diff --git a/views/public/one-page-checkout.css b/views/public/one-page-checkout.css
index a581d4f..688821a 100644
--- a/views/public/one-page-checkout.css
+++ b/views/public/one-page-checkout.css
@@ -1 +1 @@
-@media(min-width: 992px){.one-page-checkout{padding-right:2em}}.one-page-checkout__section{padding-top:1em;padding-bottom:1em}.one-page-checkout__section+.one-page-checkout__section,.js-opc-addresses-section+.one-page-checkout__section{padding-top:2em;border-top:1px solid var(--bs-border-color)}.one-page-checkout__links{display:flex;flex-wrap:wrap-reverse;gap:.5rem;justify-content:space-between;margin-bottom:1.5rem}.one-page-checkout__field{margin-bottom:1rem}.one-page-checkout__footer{padding-top:2em}.one-page-checkout__footer .form-check{margin-bottom:1rem}.one-page-checkout .opc-address-item .form-check-input,.one-page-checkout .opc-address-item .form-check-label{cursor:pointer}
+.opc-form-fields-row{display:grid;gap:1rem}@media(min-width: 768px){.opc-form-fields-row--2{grid-template-columns:1fr 1fr}.opc-form-fields-row--3{grid-template-columns:1fr 1fr 1fr}}@media(min-width: 992px){.one-page-checkout{padding-right:2em}}.one-page-checkout__section{padding-top:1em;padding-bottom:1em}.one-page-checkout__section+.one-page-checkout__section,.js-opc-addresses-section+.one-page-checkout__section{padding-top:2em;border-top:1px solid var(--bs-border-color)}.one-page-checkout__links{display:flex;flex-wrap:wrap-reverse;gap:.5rem;justify-content:space-between;margin-bottom:1.5rem}.one-page-checkout__field{margin-bottom:1rem}.one-page-checkout__footer{padding-top:2em}.one-page-checkout__footer .form-check{margin-bottom:1rem}.one-page-checkout .opc-address-item .form-check-input,.one-page-checkout .opc-address-item .form-check-label{cursor:pointer}.opc-payment-methods-wrapper{min-height:6rem}
diff --git a/views/public/opc-address-modal.bundle.js b/views/public/opc-address-modal.bundle.js
index da88340..2b97dcc 100644
--- a/views/public/opc-address-modal.bundle.js
+++ b/views/public/opc-address-modal.bundle.js
@@ -1 +1 @@
-(()=>{"use strict";const e={opcCarrierSelected:"opcCarrierSelected",opcCarriersUpdated:"opcCarriersUpdated",opcCarriersFailed:"opcCarriersFailed",opcCarriersLoading:"opcCarriersLoading",opcPaymentMethodsLoading:"opcPaymentMethodsLoading",opcPaymentMethodsUpdated:"opcPaymentMethodsUpdated",opcPaymentMethodsFailed:"opcPaymentMethodsFailed",opcPaymentMethodSelected:"opcPaymentMethodSelected",opcGuestInitSuccess:"opcGuestInitSuccess",opcFinalSubmitStarted:"opcFinalSubmitStarted",opcFormValidated:"opcFormValidated",opcBillingSectionToggled:"opcBillingSectionToggled",opcSubmitFailed:"opcSubmitFailed",opcDeliveryAddressUpdated:"opcDeliveryAddressUpdated",opcBillingAddressUpdated:"opcBillingAddressUpdated",opcDeliveryAddressSelected:"opcDeliveryAddressSelected",opcBillingAddressSelected:"opcBillingAddressSelected",opcCartSummaryBeforeUpdate:"opcCartSummaryBeforeUpdate",opcCartSummaryUpdated:"opcCartSummaryUpdated",updatedOpcAddressForm:"updatedOpcAddressForm",opcCarriersRetry:"opcCarriersRetry",opcPaymentMethodsRetry:"opcPaymentMethodsRetry"};const t={opc:{checkout:".one-page-checkout",form:"#opc-form",payButton:"#opc-pay-button",payAmount:"#opc-pay-amount",addressesSection:".js-opc-addresses-section",deliveryMethods:"#opc-delivery-methods",paymentMethods:"#opc-payment-methods",deliverySection:"#opc-delivery-address",deliveryFields:"#opc-delivery-address-fields",billingSection:"#opc-billing-section",billingFields:"#opc-billing-address-fields",deliveryList:"#opc-delivery-address-content-list",billingList:"#opc-billing-address-content-list",useSameAddress:'[name="use_same_address"]',checkoutFooter:".one-page-checkout__footer",contactSection:".js-opc-contact-section",addressRadio:".js-opc-address-radio",addressItem:".opc-address-item",addressLabel:".form-check-label"},templates:{carrierLoader:"#opc-template-loader",carrierError:"#opc-template-carriers-error",paymentLoader:"#opc-template-payment-loader",paymentError:"#opc-template-payment-error"},inputs:{deliveryOption:'input[name="delivery_option"]',paymentOption:'input[name="payment-option"]',email:'input[name="email"]',conditions:'.one-page-checkout input[name^="conditions_to_approve["][required]'},modals:{address:"#opc-address-modal, #modal-delivery, #modal-invoice"}};function r(e){return r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},r(e)}function n(e){var t=window&&"object"===r(window.ps_onepagecheckout)&&window.ps_onepagecheckout?window.ps_onepagecheckout:null;return t&&t.urls&&t.urls[e]?String(t.urls[e]):""}function o(e,t){return function(e){if(Array.isArray(e))return e}(e)||function(e,t){var r=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=r){var n,o,i,d,a=[],s=!0,c=!1;try{if(i=(r=r.call(e)).next,0===t){if(Object(r)!==r)return;s=!1}else for(;!(s=(n=i.call(r)).done)&&(a.push(n.value),a.length!==t);s=!0);}catch(e){c=!0,o=e}finally{try{if(!s&&null!=r.return&&(d=r.return(),Object(d)!==d))return}finally{if(c)throw o}}return a}}(e,t)||function(e,t){if(e){if("string"==typeof e)return i(e,t);var r={}.toString.call(e).slice(8,-1);return"Object"===r&&e.constructor&&(r=e.constructor.name),"Map"===r||"Set"===r?Array.from(e):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?i(e,t):void 0}}(e,t)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function i(e,t){(null==t||t>e.length)&&(t=e.length);for(var r=0,n=Array(t);r<t;r++)n[r]=e[r];return n}function d(e){return d="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},d(e)}!function(){var r=window.$||window.jQuery,i=window.prestashop||{};if(r){var a=t.modals.address,s="#submit-address-modal, .js-opc-save-address",c=a.split(",").map(function(e){return e.trim()}),l=s.split(",").map(function(e){return e.trim()}),p='[name="id_country"], [name$="id_country"]'.split(",").map(function(e){return e.trim()}),u=c.flatMap(function(e){return l.map(function(t){return"".concat(e," ").concat(t)})}).join(", "),f=c.flatMap(function(e){return p.map(function(t){return"".concat(e," ").concat(t)})}).join(", "),m=c.flatMap(function(e){return["input","select","textarea"].map(function(t){return"".concat(e," ").concat(t)})}).join(", "),v="addressesList",g="states",y="saveAddress",h="deleteAddress",S="addressForm",b=t.opc.addressesSection,_=t.opc.deliverySection,w=t.opc.deliveryFields,A=t.opc.billingSection,C=t.opc.billingFields,k="data-opc-disabled-by-same-address",L=new Set(["id_country","invoice_id_country","id_state","invoice_id_state","use_same_address"]),T=new Set(["hidden","file","submit","button","image","reset"]),M=["id_address","alias","firstname","lastname","company","vat_number","address1","address2","city","postcode","id_state","id_country","phone"],E="js-opc-field-error",x="js-opc-address-modal-error",j="data-opc-restore-address-id",D="data-opc-restore-radio-name",F="data-opc-skip-restore-selection";r(document).on("show.bs.modal",a,function(e){var t=r(e.currentTarget),n=r(e.relatedTarget),o=function(e){return String(e.attr("data-type")||"create")}(n),i=null;t.removeAttr(F),"create"!==o&&(t.removeAttr(j),t.removeAttr(D)),function(e,t){var r=e.find(".modal-header h2").first();if(r.length){var n=String("edit"===t?e.attr("data-title-edit")||"":e.attr("data-title-new")||"");""!==n&&r.text(n)}}(t,o),z(t),function(e){M.forEach(function(t){if("id_address"!==t){var r=H(e,t);r.length&&(r.is("select"),r.val(""))}else H(e,t).val("")})}(t),"edit"===o&&(i=function(e){var t={};return M.forEach(function(r){var n=e.attr("data-".concat(r));void 0!==n&&(t[r]=n)}),t}(n),function(e,t){t&&"object"===d(t)&&M.forEach(function(r){var n=void 0===t[r]?"":t[r],o=H(e,r);o.length&&o.val(n)})}(t,i));var a=String("edit"===o&&i?i.id_country||"":H(t,"id_country").val()||""),s=String("edit"===o&&i?i.id_state||"":H(t,"id_state").val()||"");R(t,!1),X(t,a,s)}),r(document).on("shown.bs.modal",a,function(e){var t=r(e.currentTarget);R(t,!1),K(t)}),r(document).on("hidden.bs.modal",a,function(e){var n=r(e.currentTarget);!function(e){if("1"!==e.attr(F)){var n=String(e.attr(D)||""),o=String(e.attr(j)||""),i=ee(n);if(te(e),n&&o&&i){var d=r(i).find("".concat(t.opc.addressRadio,'[name="').concat(n,'"][value="').concat(o,'"]')).first();d.length&&(d.is(":checked")||d.prop("checked",!0),de(d.closest(t.opc.addressItem).parent()))}}else te(e)}(n),z(n),R(n,!0),K(n)}),r(document).on("change",f,function(e){X(r(e.currentTarget).closest(a),String(r(e.currentTarget).val()||""),"")}),r(document).on("input change",m,function(e){K(r(e.currentTarget).closest(a))}),r(document).on("click",t.opc.addressItem,function(e){var n=r(e.target),o=n.closest(t.opc.addressItem);if(o.length&&!n.closest(".opc-address-card__actions").length){var i=o.find(t.opc.addressRadio).first();if(i.length)return i.is(":checked")?void de(o.parent()):("new_address"===String(i.val()||"")&&re(String(i.attr("name")||"")),void i.prop("checked",!0).trigger("change"))}}),r(document).on("change",t.opc.addressRadio,function(n){var o=r(n.currentTarget),d=o.closest(t.opc.addressItem),a=d.parent(),s=String(o.val()||""),c=String(o.attr("name")||"");de(a),""!==s&&"new_address"!==s&&("id_address_delivery"!==c?"id_address_invoice"===c&&i.emit(e.opcBillingAddressSelected,{idAddress:s,target:d.get(0)}):i.emit(e.opcDeliveryAddressSelected,{idAddress:s,target:d.get(0)}))}),r(document).on("click",u,function(e){e.preventDefault();var t=n(y),o=r(e.currentTarget),d=o.closest(a);if(t&&d.length){R(d,!1);var s=String(o.attr("data-text")||o.text()),c=String(o.attr("data-loading-text")||s),l=function(e){var t=[];return e.find("input, select, textarea").each(function(e,n){var o=r(n),i=String(o.attr("name")||"");""===i||o.prop("disabled")||(!o.is(":checkbox")&&!o.is(":radio")||o.is(":checked"))&&t.push({name:i,value:String(o.val()||"")})}),t.push({name:"use_same_address",value:G(r(b).first())?"1":"0"}),r.param(t)}(d),p=new URLSearchParams(l),u=String(p.get("address_type")||(d.is("#modal-invoice")?"invoice":"delivery"));o.prop("disabled",!0).text(c),r.post(t,l).done(function(e){if(!e||!1===e.success)return Z(d,e&&e.errors?e.errors:{}),void i.emit("handleError",{eventType:"opcSaveAddress",resp:e||{}});z(d),d.attr(F,"1"),oe(d),se({refreshDeliverySelection:"delivery"===u,refreshBillingSelection:"invoice"===u}),ne(e.message||"")}).fail(function(e){i.emit("handleError",{eventType:"opcSaveAddress",resp:e.responseJSON||{}})}).always(function(){o.prop("disabled",!1).text(s)})}else i.emit("handleError",{eventType:"opcSaveAddress",resp:{errors:{"":["Missing OPC save address URL."]}}})}),r(document).on("click",".js-delete-address",function(e){e.preventDefault();var t=n(h),o=r(e.currentTarget);t&&o.length?Y().then(function(e){e&&(o.prop("disabled",!0),r.post(t,{id_address:String(o.attr("data-id-address")||"")}).done(function(e){if(!e||!1===e.success)return i.emit("handleError",{eventType:"opcDeleteAddress",resp:e||{}}),void o.prop("disabled",!1);se({resetInlineAddressState:!0}),ne(e.message||"")}).fail(function(e){i.emit("handleError",{eventType:"opcDeleteAddress",resp:e.responseJSON||{}}),o.prop("disabled",!1)}))}):i.emit("handleError",{eventType:"opcDeleteAddress",resp:{errors:{"":["Missing OPC delete address URL."]}}})}),r(function(){P(),r(a).each(function(e,t){return K(r(t))}),ae(),$()}),i.on(e.updatedOpcAddressForm,function(){P(),r(a).each(function(e,t){return K(r(t))}),$()})}function B(e){return String(e.prop("type")||"").toLowerCase()}function I(e,t){return!function(e){return!e||L.has(e)}(e)&&!T.has(B(t))}function U(e){var t=Object.create(null);return e.find("input, select, textarea").each(function(e,n){var o=r(n),i=String(o.prop("name")||"");I(i,o)&&function(e,t,r){var n=B(r);if("checkbox"===n)return Array.isArray(e[t])||(e[t]=[]),void(r.is(":checked")&&e[t].push(String(r.val())));"radio"!==n?e[t]=r.val():r.is(":checked")&&(e[t]=String(r.val()))}(t,i,o)}),t}function O(e,t){e.find("input, select, textarea").each(function(e,n){var o=r(n),i=String(o.prop("name")||"");I(i,o)&&function(e,t){var r=B(e);if(void 0!==t)if("checkbox"!==r)"radio"!==r?e.val(t):e.prop("checked",String(e.val())===String(t));else{var n=Array.isArray(t)?t:[];e.prop("checked",n.includes(String(e.val())))}}(o,t[i])})}function R(e,t){e.find("input, select, textarea").each(function(e,n){var o=r(n);o.is('[type="hidden"]')||function(e){return e.is(':button, [type="button"], [type="submit"], [type="reset"], [type="image"], [type="file"]')}(o)||o.prop("disabled",t)})}function P(){r(a).each(function(e,t){var n=r(t);n.hasClass("show")||R(n,!0)})}function $(){var e=document.querySelector(t.opc.checkout);e&&e.dispatchEvent(new Event("change",{bubbles:!0}))}function H(e,t){var r=e.find('[name="'.concat(t,'"]')).first();return r.length?r:e.find('[name$="'.concat(t,'"]')).first()}function q(e,t,r){var n=e.find(r).first();return n.length?n:e.find(t).first()}function J(e,t,r,n){var o=q(e,t,r);if(!o.length)return"";var i=o.find('[name="'.concat(n,'"]')).first();return i.length?String(i.val()||""):""}function N(e,t,r,n,o){if(null!=o&&""!==String(o)){var i=q(e,t,r);if(i.length){var d=i.find('[name="'.concat(n,'"]')).first();d.length&&d.val(String(o))}}}function V(e){return e.find(t.opc.useSameAddress).first()}function G(e){var t=V(e);return!!t.length&&t.is(":checked")}function z(e){e.find(".".concat(E)).remove(),e.find(".".concat(x)).remove(),e.find(".is-invalid").removeClass("is-invalid")}function Q(e){return!(e instanceof HTMLInputElement||e instanceof HTMLSelectElement||e instanceof HTMLTextAreaElement)||(!(!e.disabled&&function(e){if(!(e instanceof HTMLElement))return!1;var t=window.getComputedStyle(e);return"none"!==t.display&&"hidden"!==t.visibility&&e.getClientRects().length>0}(e))||e.checkValidity())}function K(e){var t=e.find(s);if(t.length)if(e.get(0)instanceof HTMLElement&&e.hasClass("show")){var r=e.find("input, select, textarea").toArray().every(function(e){return Q(e)});t.prop("disabled",!r)}else t.prop("disabled",!0)}function W(e,t,n){var o=function(e){return{$wrapper:e.find(".state-field-wrapper, #state-field-wrapper").first(),$select:e.find('[name="id_state"], [name$="id_state"]').first(),$row:e.find(".address-country-row, #address-country-row").first()}}(e),i=o.$wrapper,d=o.$select,a=o.$row;if(i.length&&d.length){var s=t&&Array.isArray(t.states)?t.states:[];if(!(Boolean(t&&t.hasStates)||s.length>0))return i.hide(),d.prop("required",!1).val(""),void(a.length&&a.removeClass("form-fields-row--3").addClass("form-fields-row--2"));var c=String(d.attr("data-select-placeholder")||"");d.empty(),d.append(r("<option>",{value:"",text:c})),s.forEach(function(e){var t=String(e.id_state||"");d.append(r("<option>",{value:t,text:String(e.name||""),selected:""!==n&&t===n}))}),i.show(),d.prop("required",!0),a.length&&a.removeClass("form-fields-row--2").addClass("form-fields-row--3")}}function X(e,t,o){var d=n(g);return d&&""!==t?r.get(d,{id_country:t}).done(function(t){W(e,t||{},o),K(e)}).fail(function(t){W(e,{hasStates:!1,states:[]},""),K(e),i.emit("handleError",{eventType:"opcAddressStates",resp:t.responseJSON||{errors:{"":["Unable to load states."]}}})}):(W(e,{hasStates:!1,states:[]},""),r.Deferred().resolve().promise())}function Y(){var e=r.Deferred(),t=r("#".concat("opc-delete-address-confirm-modal")),n=!1;if(!t.length)return e.resolve(!1),e.promise();return t.on("click.opcDeleteConfirm",".js-opc-delete-address-confirm",function(){n=!0,oe(t)}),t.on("hidden.bs.modal.opcDeleteConfirm",function(){t.off(".opcDeleteConfirm"),e.resolve(n)}),function(e){if(!e.length)return;if(window.bootstrap&&"function"==typeof window.bootstrap.Modal)return void window.bootstrap.Modal.getOrCreateInstance(e.get(0)).show();"function"==typeof e.modal&&e.modal("show")}(t),e.promise()}function Z(e,t){z(e),t&&"object"===d(t)&&Object.entries(t).forEach(function(t){var n,i,d=o(t,2),a=d[0],s=d[1],c=Array.isArray(s)?s.filter(Boolean):[];0!==c.length&&(""!==a?(n=H(e,a),i=c[0],n.length&&i&&(n.addClass("is-invalid"),(n.closest(".form-group").length?n.closest(".form-group"):n.parent()).append(r("<div>",{class:"invalid-feedback d-block ".concat(E),text:i})))):e.find(".modal-body").first().prepend(r("<div>",{class:"alert alert-danger ".concat(x),text:c.join(" ")})))})}function ee(e){return"id_address_delivery"===e?t.opc.deliveryList:"id_address_invoice"===e?t.opc.billingList:""}function te(e){e.removeAttr(j),e.removeAttr(D),e.removeAttr(F)}function re(e){var t=ee(e),n=function(e){return"id_address_delivery"===e?r("#modal-delivery"):"id_address_invoice"===e?r("#modal-invoice"):r()}(e);if(t&&n.length){var o=ce(t,e);te(n),o.idAddress&&(n.attr(j,o.idAddress),n.attr(D,e))}}function ne(e){var t=String(e||"").trim();if(""!==t)if(window.Theme&&window.Theme.components&&"function"==typeof window.Theme.components.useToast){var n=window.Theme.components.useToast(t,{type:"success"});n&&"function"==typeof n.show&&n.show()}else r("body").append(r("<div>",{class:"alert alert-success",text:t}))}function oe(e){if(e.length){if(window.bootstrap&&"function"==typeof window.bootstrap.Modal){var t=window.bootstrap.Modal.getInstance(e.get(0));if(t)return void t.hide()}"function"==typeof e.modal&&e.modal("hide")}}function ie(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},o=n(S),d=r(b).first(),a=Boolean(t.resetInlineAddressState);if(!o||!d.length)return r.Deferred().resolve().promise();var s={use_same_address:G(d)?"1":"0"};a||(s.id_address_delivery=J(d,_,w,"id_address_delivery"),s.id_address_invoice=J(d,A,C,"id_address_invoice"),s.id_country=J(d,_,w,"id_country"),s.invoice_id_country=J(d,A,C,"invoice_id_country"));var c="0"!==s.use_same_address,l=U(d);return r.post(o,s).done(function(t){t&&"string"==typeof t.addresses_section&&(d.html(t.addresses_section),O(d,l),function(e,t){V(e).prop("checked",t)}(d,c),function(e,t){var n=e.find(A).first();n.length&&(n.toggle(!t),n.find("input, select, textarea").each(function(e,n){var o=r(n);t?o.prop("disabled")||(o.attr(k,"1"),o.prop("disabled",!0)):"1"===o.attr(k)&&(o.prop("disabled",!1),o.removeAttr(k))}))}(d,c),a||(N(d,_,w,"id_country",s.id_country),N(d,A,C,"invoice_id_country",s.invoice_id_country)),ae(),i.emit(e.updatedOpcAddressForm,{target:d,resp:t}),i.emit(e.opcDeliveryAddressUpdated,{resp:t}),i.emit(e.opcBillingAddressUpdated,{resp:t}))})}function de(e){e.length&&e.find(t.opc.addressItem).each(function(e,n){var o=r(n),i=o.find(t.opc.addressRadio).first().is(":checked");o.toggleClass("border-primary selected z-1",i),o.find(t.opc.addressLabel).first().toggleClass("fw-semibold",i)})}function ae(){de(r(t.opc.deliveryList)),de(r(t.opc.billingList))}function se(){var d=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},a=n(v);return a?([[t.opc.deliveryList,"#opc-delivery-address-loader"],[t.opc.billingList,"#opc-billing-address-loader"]].forEach(function(e){var t=o(e,2),n=t[0],i=t[1],d=r(n),a=r(i).html();d.length&&a&&d.html(a)}),r.post(a).then(function(n){return n&&!1!==n.success&&void 0!==n.address_count?(parseInt(n.address_count,10)||0)<=0?ie(d):(function(n){var o=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},i=ce(t.opc.deliveryList,"id_address_delivery"),d=ce(t.opc.billingList,"id_address_invoice"),a=parseInt(n.address_count,10)||0,s=r(t.opc.deliveryList),c=r(w),l=r(t.opc.billingList),p=r(C);s.length&&"string"==typeof n.delivery_html&&s.html(n.delivery_html),l.length&&"string"==typeof n.billing_html&&l.html(n.billing_html),s.toggleClass("d-none",a<=0),c.toggleClass("d-none",a>0),l.toggleClass("d-none",a<=1),p.toggleClass("d-none",a>1),ae(),le(e.opcDeliveryAddressSelected,i,ce(t.opc.deliveryList,"id_address_delivery"),Boolean(o.refreshDeliverySelection)),le(e.opcBillingAddressSelected,d,ce(t.opc.billingList,"id_address_invoice"),Boolean(o.refreshBillingSelection))}(n,d),n):ie(d)}).fail(function(e){return i.emit("handleError",{eventType:"opcAddressesList",resp:e.responseJSON||{}}),ie(d)})):ie(d)}function ce(e,n){var o=r(e).find("".concat(t.opc.addressRadio,'[name="').concat(n,'"]:checked')).first(),i=String(o.val()||"");if(!o.length||""===i||"new_address"===i)return{idAddress:"",target:null};var d=o.closest(t.opc.addressItem);return{idAddress:i,target:d.length?d.get(0):o.get(0)}}function le(e,t,r){var n=arguments.length>3&&void 0!==arguments[3]&&arguments[3];r.idAddress&&(n||t.idAddress!==r.idAddress)&&i.emit(e,r)}}()})();
\ No newline at end of file
+(()=>{"use strict";const e={opcCarrierSelected:"opcCarrierSelected",opcCarriersUpdated:"opcCarriersUpdated",opcCarriersFailed:"opcCarriersFailed",opcCarriersLoading:"opcCarriersLoading",opcPaymentMethodsLoading:"opcPaymentMethodsLoading",opcPaymentMethodsUpdated:"opcPaymentMethodsUpdated",opcPaymentMethodsRefreshed:"opcPaymentMethodsRefreshed",opcPaymentMethodsFailed:"opcPaymentMethodsFailed",opcPaymentMethodSelected:"opcPaymentMethodSelected",opcGuestInitSuccess:"opcGuestInitSuccess",opcFinalSubmitStarted:"opcFinalSubmitStarted",opcFormValidated:"opcFormValidated",opcBillingSectionToggled:"opcBillingSectionToggled",opcSubmitFailed:"opcSubmitFailed",opcDeliveryAddressUpdated:"opcDeliveryAddressUpdated",opcBillingAddressUpdated:"opcBillingAddressUpdated",opcDeliveryAddressSelected:"opcDeliveryAddressSelected",opcBillingAddressSelected:"opcBillingAddressSelected",opcCartSummaryBeforeUpdate:"opcCartSummaryBeforeUpdate",opcCartSummaryUpdated:"opcCartSummaryUpdated",updatedOpcAddressForm:"updatedOpcAddressForm",opcCarriersRetry:"opcCarriersRetry",opcPaymentMethodsRetry:"opcPaymentMethodsRetry"};const t={opc:{checkout:".one-page-checkout",form:"#opc-form",payButton:"#opc-pay-button",payAmount:"#opc-pay-amount",addressesSection:".js-opc-addresses-section",deliveryMethods:"#opc-delivery-methods",paymentMethods:"#opc-payment-methods",deliverySection:"#opc-delivery-address",deliveryFields:"#opc-delivery-address-fields",billingSection:"#opc-billing-section",billingFields:"#opc-billing-address-fields",deliveryList:"#opc-delivery-address-content-list",billingList:"#opc-billing-address-content-list",useSameAddress:'[name="use_same_address"]',checkoutFooter:".one-page-checkout__footer",contactSection:".js-opc-contact-section",addressRadio:".js-opc-address-radio",addressItem:".opc-address-item",addressLabel:".form-check-label"},templates:{carrierLoader:"#opc-template-loader",carrierError:"#opc-template-carriers-error",paymentError:"#opc-template-payment-error"},inputs:{deliveryOption:'input[name="delivery_option"]',paymentOption:'input[name="payment-option"]',email:'input[name="email"]',conditions:'.one-page-checkout input[name^="conditions_to_approve["][required]'},modals:{address:"#opc-address-modal, #modal-delivery, #modal-invoice"}};function r(e){return r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},r(e)}function n(e){var t=window&&"object"===r(window.ps_onepagecheckout)&&window.ps_onepagecheckout?window.ps_onepagecheckout:null;return t&&t.urls&&t.urls[e]?String(t.urls[e]):""}function o(e,t){return function(e){if(Array.isArray(e))return e}(e)||function(e,t){var r=null==e?null:"undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(null!=r){var n,o,i,d,a=[],s=!0,c=!1;try{if(i=(r=r.call(e)).next,0===t){if(Object(r)!==r)return;s=!1}else for(;!(s=(n=i.call(r)).done)&&(a.push(n.value),a.length!==t);s=!0);}catch(e){c=!0,o=e}finally{try{if(!s&&null!=r.return&&(d=r.return(),Object(d)!==d))return}finally{if(c)throw o}}return a}}(e,t)||function(e,t){if(e){if("string"==typeof e)return i(e,t);var r={}.toString.call(e).slice(8,-1);return"Object"===r&&e.constructor&&(r=e.constructor.name),"Map"===r||"Set"===r?Array.from(e):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?i(e,t):void 0}}(e,t)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function i(e,t){(null==t||t>e.length)&&(t=e.length);for(var r=0,n=Array(t);r<t;r++)n[r]=e[r];return n}function d(e){return d="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},d(e)}!function(){var r=window.$||window.jQuery,i=window.prestashop||{};if(r){var a=t.modals.address,s="#submit-address-modal, .js-opc-save-address",c=a.split(",").map(function(e){return e.trim()}),l=s.split(",").map(function(e){return e.trim()}),p='[name="id_country"], [name$="id_country"]'.split(",").map(function(e){return e.trim()}),u=c.flatMap(function(e){return l.map(function(t){return"".concat(e," ").concat(t)})}).join(", "),f=c.flatMap(function(e){return p.map(function(t){return"".concat(e," ").concat(t)})}).join(", "),m=c.flatMap(function(e){return["input","select","textarea"].map(function(t){return"".concat(e," ").concat(t)})}).join(", "),v="addressesList",g="states",y="saveAddress",h="deleteAddress",S="addressForm",b=t.opc.addressesSection,_=t.opc.deliverySection,w=t.opc.deliveryFields,A=t.opc.billingSection,C=t.opc.billingFields,k="data-opc-disabled-by-same-address",T=new Set(["id_country","invoice_id_country","id_state","invoice_id_state","use_same_address"]),L=new Set(["hidden","file","submit","button","image","reset"]),M=["id_address","alias","firstname","lastname","company","vat_number","address1","address2","city","postcode","id_state","id_country","phone"],E="js-opc-field-error",x="js-opc-address-modal-error",j="data-opc-restore-address-id",D="data-opc-restore-radio-name",F="data-opc-skip-restore-selection";r(document).on("show.bs.modal",a,function(e){var t=r(e.currentTarget),n=r(e.relatedTarget),o=function(e){return String(e.attr("data-type")||"create")}(n),i=null;t.removeAttr(F),"create"!==o&&(t.removeAttr(j),t.removeAttr(D)),function(e,t){var r=e.find(".modal-header h2").first();if(r.length){var n=String("edit"===t?e.attr("data-title-edit")||"":e.attr("data-title-new")||"");""!==n&&r.text(n)}}(t,o),z(t),function(e){M.forEach(function(t){if("id_address"!==t){var r=H(e,t);r.length&&(r.is("select"),r.val(""))}else H(e,t).val("")})}(t),"edit"===o&&(i=function(e){var t={};return M.forEach(function(r){var n=e.attr("data-".concat(r));void 0!==n&&(t[r]=n)}),t}(n),function(e,t){t&&"object"===d(t)&&M.forEach(function(r){var n=void 0===t[r]?"":t[r],o=H(e,r);o.length&&o.val(n)})}(t,i));var a=String("edit"===o&&i?i.id_country||"":H(t,"id_country").val()||""),s=String("edit"===o&&i?i.id_state||"":H(t,"id_state").val()||"");R(t,!1),X(t,a,s)}),r(document).on("shown.bs.modal",a,function(e){var t=r(e.currentTarget);R(t,!1),K(t)}),r(document).on("hidden.bs.modal",a,function(e){var n=r(e.currentTarget);!function(e){if("1"!==e.attr(F)){var n=String(e.attr(D)||""),o=String(e.attr(j)||""),i=ee(n);if(te(e),n&&o&&i){var d=r(i).find("".concat(t.opc.addressRadio,'[name="').concat(n,'"][value="').concat(o,'"]')).first();d.length&&(d.is(":checked")||d.prop("checked",!0),de(d.closest(t.opc.addressItem).parent()))}}else te(e)}(n),z(n),R(n,!0),K(n)}),r(document).on("change",f,function(e){X(r(e.currentTarget).closest(a),String(r(e.currentTarget).val()||""),"")}),r(document).on("input change",m,function(e){K(r(e.currentTarget).closest(a))}),r(document).on("click",t.opc.addressItem,function(e){var n=r(e.target),o=n.closest(t.opc.addressItem);if(o.length&&!n.closest(".opc-address-card__actions").length){var i=o.find(t.opc.addressRadio).first();if(i.length)return i.is(":checked")?void de(o.parent()):("new_address"===String(i.val()||"")&&re(String(i.attr("name")||"")),void i.prop("checked",!0).trigger("change"))}}),r(document).on("change",t.opc.addressRadio,function(n){var o=r(n.currentTarget),d=o.closest(t.opc.addressItem),a=d.parent(),s=String(o.val()||""),c=String(o.attr("name")||"");de(a),""!==s&&"new_address"!==s&&("id_address_delivery"!==c?"id_address_invoice"===c&&i.emit(e.opcBillingAddressSelected,{idAddress:s,target:d.get(0)}):i.emit(e.opcDeliveryAddressSelected,{idAddress:s,target:d.get(0)}))}),r(document).on("click",u,function(e){e.preventDefault();var t=n(y),o=r(e.currentTarget),d=o.closest(a);if(t&&d.length){R(d,!1);var s=String(o.attr("data-text")||o.text()),c=String(o.attr("data-loading-text")||s),l=function(e){var t=[];return e.find("input, select, textarea").each(function(e,n){var o=r(n),i=String(o.attr("name")||"");""===i||o.prop("disabled")||(!o.is(":checkbox")&&!o.is(":radio")||o.is(":checked"))&&t.push({name:i,value:String(o.val()||"")})}),t.push({name:"use_same_address",value:G(r(b).first())?"1":"0"}),r.param(t)}(d),p=new URLSearchParams(l),u=String(p.get("address_type")||(d.is("#modal-invoice")?"invoice":"delivery"));o.prop("disabled",!0).text(c),r.post(t,l).done(function(e){if(!e||!1===e.success)return Z(d,e&&e.errors?e.errors:{}),void i.emit("handleError",{eventType:"opcSaveAddress",resp:e||{}});z(d),d.attr(F,"1"),oe(d),se({refreshDeliverySelection:"delivery"===u,refreshBillingSelection:"invoice"===u}),ne(e.message||"")}).fail(function(e){i.emit("handleError",{eventType:"opcSaveAddress",resp:e.responseJSON||{}})}).always(function(){o.prop("disabled",!1).text(s)})}else i.emit("handleError",{eventType:"opcSaveAddress",resp:{errors:{"":["Missing OPC save address URL."]}}})}),r(document).on("click",".js-delete-address",function(e){e.preventDefault();var t=n(h),o=r(e.currentTarget);t&&o.length?Y().then(function(e){e&&(o.prop("disabled",!0),r.post(t,{id_address:String(o.attr("data-id-address")||"")}).done(function(e){if(!e||!1===e.success)return i.emit("handleError",{eventType:"opcDeleteAddress",resp:e||{}}),void o.prop("disabled",!1);se({resetInlineAddressState:!0}),ne(e.message||"")}).fail(function(e){i.emit("handleError",{eventType:"opcDeleteAddress",resp:e.responseJSON||{}}),o.prop("disabled",!1)}))}):i.emit("handleError",{eventType:"opcDeleteAddress",resp:{errors:{"":["Missing OPC delete address URL."]}}})}),r(function(){P(),r(a).each(function(e,t){return K(r(t))}),ae(),$()}),i.on(e.updatedOpcAddressForm,function(){P(),r(a).each(function(e,t){return K(r(t))}),$()})}function B(e){return String(e.prop("type")||"").toLowerCase()}function I(e,t){return!function(e){return!e||T.has(e)}(e)&&!L.has(B(t))}function U(e){var t=Object.create(null);return e.find("input, select, textarea").each(function(e,n){var o=r(n),i=String(o.prop("name")||"");I(i,o)&&function(e,t,r){var n=B(r);if("checkbox"===n)return Array.isArray(e[t])||(e[t]=[]),void(r.is(":checked")&&e[t].push(String(r.val())));"radio"!==n?e[t]=r.val():r.is(":checked")&&(e[t]=String(r.val()))}(t,i,o)}),t}function O(e,t){e.find("input, select, textarea").each(function(e,n){var o=r(n),i=String(o.prop("name")||"");I(i,o)&&function(e,t){var r=B(e);if(void 0!==t)if("checkbox"!==r)"radio"!==r?e.val(t):e.prop("checked",String(e.val())===String(t));else{var n=Array.isArray(t)?t:[];e.prop("checked",n.includes(String(e.val())))}}(o,t[i])})}function R(e,t){e.find("input, select, textarea").each(function(e,n){var o=r(n);o.is('[type="hidden"]')||function(e){return e.is(':button, [type="button"], [type="submit"], [type="reset"], [type="image"], [type="file"]')}(o)||o.prop("disabled",t)})}function P(){r(a).each(function(e,t){var n=r(t);n.hasClass("show")||R(n,!0)})}function $(){var e=document.querySelector(t.opc.checkout);e&&e.dispatchEvent(new Event("change",{bubbles:!0}))}function H(e,t){var r=e.find('[name="'.concat(t,'"]')).first();return r.length?r:e.find('[name$="'.concat(t,'"]')).first()}function q(e,t,r){var n=e.find(r).first();return n.length?n:e.find(t).first()}function J(e,t,r,n){var o=q(e,t,r);if(!o.length)return"";var i=o.find('[name="'.concat(n,'"]')).first();return i.length?String(i.val()||""):""}function N(e,t,r,n,o){if(null!=o&&""!==String(o)){var i=q(e,t,r);if(i.length){var d=i.find('[name="'.concat(n,'"]')).first();d.length&&d.val(String(o))}}}function V(e){return e.find(t.opc.useSameAddress).first()}function G(e){var t=V(e);return!!t.length&&t.is(":checked")}function z(e){e.find(".".concat(E)).remove(),e.find(".".concat(x)).remove(),e.find(".is-invalid").removeClass("is-invalid")}function Q(e){return!(e instanceof HTMLInputElement||e instanceof HTMLSelectElement||e instanceof HTMLTextAreaElement)||(!(!e.disabled&&function(e){if(!(e instanceof HTMLElement))return!1;var t=window.getComputedStyle(e);return"none"!==t.display&&"hidden"!==t.visibility&&e.getClientRects().length>0}(e))||e.checkValidity())}function K(e){var t=e.find(s);if(t.length)if(e.get(0)instanceof HTMLElement&&e.hasClass("show")){var r=e.find("input, select, textarea").toArray().every(function(e){return Q(e)});t.prop("disabled",!r)}else t.prop("disabled",!0)}function W(e,t,n){var o=function(e){return{$wrapper:e.find(".state-field-wrapper, #state-field-wrapper").first(),$select:e.find('[name="id_state"], [name$="id_state"]').first(),$row:e.find(".address-country-row, #address-country-row").first()}}(e),i=o.$wrapper,d=o.$select,a=o.$row;if(i.length&&d.length){var s=t&&Array.isArray(t.states)?t.states:[];if(!(Boolean(t&&t.hasStates)||s.length>0))return i.hide(),d.prop("required",!1).val(""),void(a.length&&a.removeClass("opc-form-fields-row--3").addClass("opc-form-fields-row--2"));var c=String(d.attr("data-select-placeholder")||"");d.empty(),d.append(r("<option>",{value:"",text:c})),s.forEach(function(e){var t=String(e.id_state||"");d.append(r("<option>",{value:t,text:String(e.name||""),selected:""!==n&&t===n}))}),i.show(),d.prop("required",!0),a.length&&a.removeClass("opc-form-fields-row--2").addClass("opc-form-fields-row--3")}}function X(e,t,o){var d=n(g);return d&&""!==t?r.get(d,{id_country:t}).done(function(t){W(e,t||{},o),K(e)}).fail(function(t){W(e,{hasStates:!1,states:[]},""),K(e),i.emit("handleError",{eventType:"opcAddressStates",resp:t.responseJSON||{errors:{"":["Unable to load states."]}}})}):(W(e,{hasStates:!1,states:[]},""),r.Deferred().resolve().promise())}function Y(){var e=r.Deferred(),t=r("#".concat("opc-delete-address-confirm-modal")),n=!1;if(!t.length)return e.resolve(!1),e.promise();return t.on("click.opcDeleteConfirm",".js-opc-delete-address-confirm",function(){n=!0,oe(t)}),t.on("hidden.bs.modal.opcDeleteConfirm",function(){t.off(".opcDeleteConfirm"),e.resolve(n)}),function(e){if(!e.length)return;if(window.bootstrap&&"function"==typeof window.bootstrap.Modal)return void window.bootstrap.Modal.getOrCreateInstance(e.get(0)).show();"function"==typeof e.modal&&e.modal("show")}(t),e.promise()}function Z(e,t){z(e),t&&"object"===d(t)&&Object.entries(t).forEach(function(t){var n,i,d=o(t,2),a=d[0],s=d[1],c=Array.isArray(s)?s.filter(Boolean):[];0!==c.length&&(""!==a?(n=H(e,a),i=c[0],n.length&&i&&(n.addClass("is-invalid"),(n.closest(".form-group").length?n.closest(".form-group"):n.parent()).append(r("<div>",{class:"invalid-feedback d-block ".concat(E),text:i})))):e.find(".modal-body").first().prepend(r("<div>",{class:"alert alert-danger ".concat(x),text:c.join(" ")})))})}function ee(e){return"id_address_delivery"===e?t.opc.deliveryList:"id_address_invoice"===e?t.opc.billingList:""}function te(e){e.removeAttr(j),e.removeAttr(D),e.removeAttr(F)}function re(e){var t=ee(e),n=function(e){return"id_address_delivery"===e?r("#modal-delivery"):"id_address_invoice"===e?r("#modal-invoice"):r()}(e);if(t&&n.length){var o=ce(t,e);te(n),o.idAddress&&(n.attr(j,o.idAddress),n.attr(D,e))}}function ne(e){var t=String(e||"").trim();if(""!==t)if(window.Theme&&window.Theme.components&&"function"==typeof window.Theme.components.useToast){var n=window.Theme.components.useToast(t,{type:"success"});n&&"function"==typeof n.show&&n.show()}else r("body").append(r("<div>",{class:"alert alert-success",text:t}))}function oe(e){if(e.length){if(window.bootstrap&&"function"==typeof window.bootstrap.Modal){var t=window.bootstrap.Modal.getInstance(e.get(0));if(t)return void t.hide()}"function"==typeof e.modal&&e.modal("hide")}}function ie(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},o=n(S),d=r(b).first(),a=Boolean(t.resetInlineAddressState);if(!o||!d.length)return r.Deferred().resolve().promise();var s={use_same_address:G(d)?"1":"0"};a||(s.id_address_delivery=J(d,_,w,"id_address_delivery"),s.id_address_invoice=J(d,A,C,"id_address_invoice"),s.id_country=J(d,_,w,"id_country"),s.invoice_id_country=J(d,A,C,"invoice_id_country"));var c="0"!==s.use_same_address,l=U(d);return r.post(o,s).done(function(t){t&&"string"==typeof t.addresses_section&&(d.html(t.addresses_section),O(d,l),function(e,t){V(e).prop("checked",t)}(d,c),function(e,t){var n=e.find(A).first();n.length&&(n.toggle(!t),n.find("input, select, textarea").each(function(e,n){var o=r(n);t?o.prop("disabled")||(o.attr(k,"1"),o.prop("disabled",!0)):"1"===o.attr(k)&&(o.prop("disabled",!1),o.removeAttr(k))}))}(d,c),a||(N(d,_,w,"id_country",s.id_country),N(d,A,C,"invoice_id_country",s.invoice_id_country)),ae(),i.emit(e.updatedOpcAddressForm,{target:d,resp:t}),i.emit(e.opcDeliveryAddressUpdated,{resp:t}),i.emit(e.opcBillingAddressUpdated,{resp:t}))})}function de(e){e.length&&e.find(t.opc.addressItem).each(function(e,n){var o=r(n),i=o.find(t.opc.addressRadio).first().is(":checked");o.toggleClass("border-primary selected z-1",i),o.find(t.opc.addressLabel).first().toggleClass("fw-semibold",i)})}function ae(){de(r(t.opc.deliveryList)),de(r(t.opc.billingList))}function se(){var d=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},a=n(v);return a?([[t.opc.deliveryList,"#opc-delivery-address-loader"],[t.opc.billingList,"#opc-billing-address-loader"]].forEach(function(e){var t=o(e,2),n=t[0],i=t[1],d=r(n),a=r(i).html();d.length&&a&&d.html(a)}),r.post(a).then(function(n){return n&&!1!==n.success&&void 0!==n.address_count?(parseInt(n.address_count,10)||0)<=0?ie(d):(function(n){var o=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},i=ce(t.opc.deliveryList,"id_address_delivery"),d=ce(t.opc.billingList,"id_address_invoice"),a=parseInt(n.address_count,10)||0,s=r(t.opc.deliveryList),c=r(w),l=r(t.opc.billingList),p=r(C);s.length&&"string"==typeof n.delivery_html&&s.html(n.delivery_html),l.length&&"string"==typeof n.billing_html&&l.html(n.billing_html),s.toggleClass("d-none",a<=0),c.toggleClass("d-none",a>0),l.toggleClass("d-none",a<=1),p.toggleClass("d-none",a>1),ae(),le(e.opcDeliveryAddressSelected,i,ce(t.opc.deliveryList,"id_address_delivery"),Boolean(o.refreshDeliverySelection)),le(e.opcBillingAddressSelected,d,ce(t.opc.billingList,"id_address_invoice"),Boolean(o.refreshBillingSelection))}(n,d),n):ie(d)}).fail(function(e){return i.emit("handleError",{eventType:"opcAddressesList",resp:e.responseJSON||{}}),ie(d)})):ie(d)}function ce(e,n){var o=r(e).find("".concat(t.opc.addressRadio,'[name="').concat(n,'"]:checked')).first(),i=String(o.val()||"");if(!o.length||""===i||"new_address"===i)return{idAddress:"",target:null};var d=o.closest(t.opc.addressItem);return{idAddress:i,target:d.length?d.get(0):o.get(0)}}function le(e,t,r){var n=arguments.length>3&&void 0!==arguments[3]&&arguments[3];r.idAddress&&(n||t.idAddress!==r.idAddress)&&i.emit(e,r)}}()})();
\ No newline at end of file
diff --git a/views/public/opc-address.bundle.js b/views/public/opc-address.bundle.js
index ee1c9ee..f0cf919 100644
--- a/views/public/opc-address.bundle.js
+++ b/views/public/opc-address.bundle.js
@@ -1,2 +1,2 @@
 /*! For license information please see opc-address.bundle.js.LICENSE.txt */
-(()=>{"use strict";const e={opcCarrierSelected:"opcCarrierSelected",opcCarriersUpdated:"opcCarriersUpdated",opcCarriersFailed:"opcCarriersFailed",opcCarriersLoading:"opcCarriersLoading",opcPaymentMethodsLoading:"opcPaymentMethodsLoading",opcPaymentMethodsUpdated:"opcPaymentMethodsUpdated",opcPaymentMethodsFailed:"opcPaymentMethodsFailed",opcPaymentMethodSelected:"opcPaymentMethodSelected",opcGuestInitSuccess:"opcGuestInitSuccess",opcFinalSubmitStarted:"opcFinalSubmitStarted",opcFormValidated:"opcFormValidated",opcBillingSectionToggled:"opcBillingSectionToggled",opcSubmitFailed:"opcSubmitFailed",opcDeliveryAddressUpdated:"opcDeliveryAddressUpdated",opcBillingAddressUpdated:"opcBillingAddressUpdated",opcDeliveryAddressSelected:"opcDeliveryAddressSelected",opcBillingAddressSelected:"opcBillingAddressSelected",opcCartSummaryBeforeUpdate:"opcCartSummaryBeforeUpdate",opcCartSummaryUpdated:"opcCartSummaryUpdated",updatedOpcAddressForm:"updatedOpcAddressForm",opcCarriersRetry:"opcCarriersRetry",opcPaymentMethodsRetry:"opcPaymentMethodsRetry"};const t={opc:{checkout:".one-page-checkout",form:"#opc-form",payButton:"#opc-pay-button",payAmount:"#opc-pay-amount",addressesSection:".js-opc-addresses-section",deliveryMethods:"#opc-delivery-methods",paymentMethods:"#opc-payment-methods",deliverySection:"#opc-delivery-address",deliveryFields:"#opc-delivery-address-fields",billingSection:"#opc-billing-section",billingFields:"#opc-billing-address-fields",deliveryList:"#opc-delivery-address-content-list",billingList:"#opc-billing-address-content-list",useSameAddress:'[name="use_same_address"]',checkoutFooter:".one-page-checkout__footer",contactSection:".js-opc-contact-section",addressRadio:".js-opc-address-radio",addressItem:".opc-address-item",addressLabel:".form-check-label"},templates:{carrierLoader:"#opc-template-loader",carrierError:"#opc-template-carriers-error",paymentLoader:"#opc-template-payment-loader",paymentError:"#opc-template-payment-error"},inputs:{deliveryOption:'input[name="delivery_option"]',paymentOption:'input[name="payment-option"]',email:'input[name="email"]',conditions:'.one-page-checkout input[name^="conditions_to_approve["][required]'},modals:{address:"#opc-address-modal, #modal-delivery, #modal-invoice"}};function r(e){return r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},r(e)}function o(e){var t=window&&"object"===r(window.ps_onepagecheckout)&&window.ps_onepagecheckout?window.ps_onepagecheckout:null;return t&&t.urls&&t.urls[e]?String(t.urls[e]):""}!function(){var r=window.$||window.jQuery,i=window.prestashop||{},n=t.opc.addressesSection,d=t.opc.billingSection,a=t.opc.deliverySection,c=t.opc.deliveryFields,s=t.opc.billingFields,p=t.modals.address,l='[name="use_same_address"]',u="data-opc-disabled-by-same-address",m=new Set(["id_country","invoice_id_country","id_state","invoice_id_state","use_same_address"]);function y(e){return String(e.prop("type")||"").toLowerCase()}var f=new Set(["hidden","file","submit","button","image","reset"]);function v(e,t){return!function(e){return!e||m.has(e)}(e)&&(!(t.closest(p).length>0)&&!f.has(y(t)))}function g(e){var t=Object.create(null);return r(e).each(function(){var e=r(this),o=e.prop("name");v(o,e)&&function(e,t,r){var o=y(r);if("checkbox"===o)return Array.isArray(e[t])||(e[t]=[]),void(r.is(":checked")&&e[t].push(String(r.val())));"radio"!==o?e[t]=r.val():r.is(":checked")&&(e[t]=String(r.val()))}(t,o,e)}),t}function h(e,t){r(e).each(function(){var e=r(this),o=e.prop("name");v(o,e)&&function(e,t){var r=y(e);if(void 0!==t)if("checkbox"!==r)"radio"!==r?e.val(t):e.prop("checked",String(e.val())===String(t));else{var o=Array.isArray(t)?t:[];e.prop("checked",o.includes(String(e.val())))}}(e,t[o])})}function _(e,t){var o=e.find(d);o.length&&(o.toggle(!t),o.find("input, select, textarea").each(function(e,o){var i=r(o);t?i.prop("disabled")||(i.attr(u,"1"),i.prop("disabled",!0)):"1"===i.attr(u)&&(i.prop("disabled",!1),i.removeAttr(u))}))}function S(e){return e.find(l).first().is(":checked")}function b(e,t,r){var o=e.find(r).first();return o.length?o:e.find(t).first()}function F(e,t,r,o){var i=b(e,t,r);if(!i.length)return"";var n=i.find('[name="'.concat(o,'"]')).first();return n.length?String(n.val()||""):""}function A(e,t,r,o,i){if(null!=i&&""!==String(i)){var n=b(e,t,r);if(n.length){var d=n.find('[name="'.concat(o,'"]')).first();d.length&&d.val(String(i))}}}function k(e){if(""!==F(e,d,s,"id_address_invoice"))return!0;var t=b(e,d,s);if(!t.length)return!1;var o=!1;return t.find("input, select, textarea").each(function(){var e=r(this);if(v(String(e.prop("name")||""),e)&&function(e){var t=y(e);return"checkbox"===t||"radio"===t?e.is(":checked"):""!==String(e.val()||"").trim()}(e))return o=!0,!1}),o}function w(e){r("body").on("change","".concat(e.address," ").concat(l),function(t){var o=r(t.target).closest(e.address);if(o.length){var i=S(o);_(o,i),i||k(o)||function(e){var t=F(e,a,c,"id_country"),r=F(e,a,c,"id_state"),o=b(e,d,s).find('[name="invoice_id_country"]').first(),i=o.length?String(o.val()||""):"";A(e,d,s,"invoice_id_country",t),o.length&&""!==t&&i!==t?o.val(t).trigger("change"):A(e,d,s,"invoice_id_state",r)}(o)}})}function C(t,n){if(t.length&&!(t.closest(p).length>0||r(p).filter(".show").length>0)){var u=t.closest(n.address);if(u.length){var m=String(t.attr("name")||""),y="id_country"===m?String(t.val()||""):F(u,a,c,"id_country"),f="invoice_id_country"===m?String(t.val()||""):F(u,d,s,"invoice_id_country"),v={id_address_delivery:F(u,a,c,"id_address_delivery"),id_address_invoice:F(u,d,s,"id_address_invoice"),id_country:y,invoice_id_country:f,use_same_address:S(u)?"1":"0"},b="".concat(n.address," input, ").concat(n.address," select, ").concat(n.address," textarea"),A=o("addressForm");""!==A?r.post(A,v).then(function(t){if(t&&"string"==typeof t.addresses_section){var r=g(b);u.html(t.addresses_section),h(b,r);var o="0"!==v.use_same_address;!function(e,t){e.find(l).first().prop("checked",t)}(u,o),_(u,o),i.emit(e.updatedOpcAddressForm,{target:u,resp:t}),i.emit(e.opcDeliveryAddressUpdated,{target:u,resp:t}),i.emit(e.opcBillingAddressUpdated,{target:u,resp:t})}else i.emit("handleError",{eventType:"updateOpcAddressForm",resp:t})}).fail(function(e){i.emit("handleError",{eventType:"updateOpcAddressForm",resp:e})}):i.emit("handleError",{eventType:"updateOpcAddressForm",resp:{errors:{"":["Missing OPC address form URL."]}}})}}}r(function(){var e={address:n};!function(e){r("body").on("change","".concat(t.opc.deliveryFields,' select[name="id_country"], ').concat(t.opc.billingFields,' select[name="invoice_id_country"]'),function(t){C(r(t.target),e)})}(e),w(e),function(e){var t=r(e.address).first();t.length&&_(t,S(t))}(e)})}()})();
\ No newline at end of file
+(()=>{"use strict";const e={opcCarrierSelected:"opcCarrierSelected",opcCarriersUpdated:"opcCarriersUpdated",opcCarriersFailed:"opcCarriersFailed",opcCarriersLoading:"opcCarriersLoading",opcPaymentMethodsLoading:"opcPaymentMethodsLoading",opcPaymentMethodsUpdated:"opcPaymentMethodsUpdated",opcPaymentMethodsRefreshed:"opcPaymentMethodsRefreshed",opcPaymentMethodsFailed:"opcPaymentMethodsFailed",opcPaymentMethodSelected:"opcPaymentMethodSelected",opcGuestInitSuccess:"opcGuestInitSuccess",opcFinalSubmitStarted:"opcFinalSubmitStarted",opcFormValidated:"opcFormValidated",opcBillingSectionToggled:"opcBillingSectionToggled",opcSubmitFailed:"opcSubmitFailed",opcDeliveryAddressUpdated:"opcDeliveryAddressUpdated",opcBillingAddressUpdated:"opcBillingAddressUpdated",opcDeliveryAddressSelected:"opcDeliveryAddressSelected",opcBillingAddressSelected:"opcBillingAddressSelected",opcCartSummaryBeforeUpdate:"opcCartSummaryBeforeUpdate",opcCartSummaryUpdated:"opcCartSummaryUpdated",updatedOpcAddressForm:"updatedOpcAddressForm",opcCarriersRetry:"opcCarriersRetry",opcPaymentMethodsRetry:"opcPaymentMethodsRetry"};const t={opc:{checkout:".one-page-checkout",form:"#opc-form",payButton:"#opc-pay-button",payAmount:"#opc-pay-amount",addressesSection:".js-opc-addresses-section",deliveryMethods:"#opc-delivery-methods",paymentMethods:"#opc-payment-methods",deliverySection:"#opc-delivery-address",deliveryFields:"#opc-delivery-address-fields",billingSection:"#opc-billing-section",billingFields:"#opc-billing-address-fields",deliveryList:"#opc-delivery-address-content-list",billingList:"#opc-billing-address-content-list",useSameAddress:'[name="use_same_address"]',checkoutFooter:".one-page-checkout__footer",contactSection:".js-opc-contact-section",addressRadio:".js-opc-address-radio",addressItem:".opc-address-item",addressLabel:".form-check-label"},templates:{carrierLoader:"#opc-template-loader",carrierError:"#opc-template-carriers-error",paymentError:"#opc-template-payment-error"},inputs:{deliveryOption:'input[name="delivery_option"]',paymentOption:'input[name="payment-option"]',email:'input[name="email"]',conditions:'.one-page-checkout input[name^="conditions_to_approve["][required]'},modals:{address:"#opc-address-modal, #modal-delivery, #modal-invoice"}};function r(e){return r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},r(e)}function o(e){var t=window&&"object"===r(window.ps_onepagecheckout)&&window.ps_onepagecheckout?window.ps_onepagecheckout:null;return t&&t.urls&&t.urls[e]?String(t.urls[e]):""}!function(){var r=window.$||window.jQuery,i=window.prestashop||{},n=t.opc.addressesSection,d=t.opc.billingSection,a=t.opc.deliverySection,c=t.opc.deliveryFields,s=t.opc.billingFields,p=t.modals.address,l='[name="use_same_address"]',u="data-opc-disabled-by-same-address",m=new Set(["id_country","invoice_id_country","id_state","invoice_id_state","use_same_address"]);function y(e){return String(e.prop("type")||"").toLowerCase()}var f=new Set(["hidden","file","submit","button","image","reset"]);function v(e,t){return!function(e){return!e||m.has(e)}(e)&&(!(t.closest(p).length>0)&&!f.has(y(t)))}function g(e){var t=Object.create(null);return r(e).each(function(){var e=r(this),o=e.prop("name");v(o,e)&&function(e,t,r){var o=y(r);if("checkbox"===o)return Array.isArray(e[t])||(e[t]=[]),void(r.is(":checked")&&e[t].push(String(r.val())));"radio"!==o?e[t]=r.val():r.is(":checked")&&(e[t]=String(r.val()))}(t,o,e)}),t}function h(e,t){r(e).each(function(){var e=r(this),o=e.prop("name");v(o,e)&&function(e,t){var r=y(e);if(void 0!==t)if("checkbox"!==r)"radio"!==r?e.val(t):e.prop("checked",String(e.val())===String(t));else{var o=Array.isArray(t)?t:[];e.prop("checked",o.includes(String(e.val())))}}(e,t[o])})}function _(e,t){var o=e.find(d);o.length&&(o.toggle(!t),o.find("input, select, textarea").each(function(e,o){var i=r(o);t?i.prop("disabled")||(i.attr(u,"1"),i.prop("disabled",!0)):"1"===i.attr(u)&&(i.prop("disabled",!1),i.removeAttr(u))}))}function S(e){return e.find(l).first().is(":checked")}function b(e,t,r){var o=e.find(r).first();return o.length?o:e.find(t).first()}function F(e,t,r,o){var i=b(e,t,r);if(!i.length)return"";var n=i.find('[name="'.concat(o,'"]')).first();return n.length?String(n.val()||""):""}function A(e,t,r,o,i){if(null!=i&&""!==String(i)){var n=b(e,t,r);if(n.length){var d=n.find('[name="'.concat(o,'"]')).first();d.length&&d.val(String(i))}}}function k(e){if(""!==F(e,d,s,"id_address_invoice"))return!0;var t=b(e,d,s);if(!t.length)return!1;var o=!1;return t.find("input, select, textarea").each(function(){var e=r(this);if(v(String(e.prop("name")||""),e)&&function(e){var t=y(e);return"checkbox"===t||"radio"===t?e.is(":checked"):""!==String(e.val()||"").trim()}(e))return o=!0,!1}),o}function w(e){r("body").on("change","".concat(e.address," ").concat(l),function(t){var o=r(t.target).closest(e.address);if(o.length){var i=S(o);_(o,i),i||k(o)||function(e){var t=F(e,a,c,"id_country"),r=F(e,a,c,"id_state"),o=b(e,d,s).find('[name="invoice_id_country"]').first(),i=o.length?String(o.val()||""):"";A(e,d,s,"invoice_id_country",t),o.length&&""!==t&&i!==t?o.val(t).trigger("change"):A(e,d,s,"invoice_id_state",r)}(o)}})}function C(t,n){if(t.length&&!(t.closest(p).length>0||r(p).filter(".show").length>0)){var u=t.closest(n.address);if(u.length){var m=String(t.attr("name")||""),y="id_country"===m?String(t.val()||""):F(u,a,c,"id_country"),f="invoice_id_country"===m?String(t.val()||""):F(u,d,s,"invoice_id_country"),v={id_address_delivery:F(u,a,c,"id_address_delivery"),id_address_invoice:F(u,d,s,"id_address_invoice"),id_country:y,invoice_id_country:f,use_same_address:S(u)?"1":"0"},b="".concat(n.address," input, ").concat(n.address," select, ").concat(n.address," textarea"),A=o("addressForm");""!==A?r.post(A,v).then(function(t){if(t&&"string"==typeof t.addresses_section){var r=g(b);u.html(t.addresses_section),h(b,r);var o="0"!==v.use_same_address;!function(e,t){e.find(l).first().prop("checked",t)}(u,o),_(u,o),i.emit(e.updatedOpcAddressForm,{target:u,resp:t}),i.emit(e.opcDeliveryAddressUpdated,{target:u,resp:t}),i.emit(e.opcBillingAddressUpdated,{target:u,resp:t})}else i.emit("handleError",{eventType:"updateOpcAddressForm",resp:t})}).fail(function(e){i.emit("handleError",{eventType:"updateOpcAddressForm",resp:e})}):i.emit("handleError",{eventType:"updateOpcAddressForm",resp:{errors:{"":["Missing OPC address form URL."]}}})}}}r(function(){var e={address:n};!function(e){r("body").on("change","".concat(t.opc.deliveryFields,' select[name="id_country"], ').concat(t.opc.billingFields,' select[name="invoice_id_country"]'),function(t){C(r(t.target),e)})}(e),w(e),function(e){var t=r(e.address).first();t.length&&_(t,S(t))}(e)})}()})();
\ No newline at end of file
diff --git a/views/public/opc-carrier-list.bundle.js b/views/public/opc-carrier-list.bundle.js
index f423ff5..8320214 100644
--- a/views/public/opc-carrier-list.bundle.js
+++ b/views/public/opc-carrier-list.bundle.js
@@ -1 +1 @@
-(()=>{"use strict";const e={opcCarrierSelected:"opcCarrierSelected",opcCarriersUpdated:"opcCarriersUpdated",opcCarriersFailed:"opcCarriersFailed",opcCarriersLoading:"opcCarriersLoading",opcPaymentMethodsLoading:"opcPaymentMethodsLoading",opcPaymentMethodsUpdated:"opcPaymentMethodsUpdated",opcPaymentMethodsFailed:"opcPaymentMethodsFailed",opcPaymentMethodSelected:"opcPaymentMethodSelected",opcGuestInitSuccess:"opcGuestInitSuccess",opcFinalSubmitStarted:"opcFinalSubmitStarted",opcFormValidated:"opcFormValidated",opcBillingSectionToggled:"opcBillingSectionToggled",opcSubmitFailed:"opcSubmitFailed",opcDeliveryAddressUpdated:"opcDeliveryAddressUpdated",opcBillingAddressUpdated:"opcBillingAddressUpdated",opcDeliveryAddressSelected:"opcDeliveryAddressSelected",opcBillingAddressSelected:"opcBillingAddressSelected",opcCartSummaryBeforeUpdate:"opcCartSummaryBeforeUpdate",opcCartSummaryUpdated:"opcCartSummaryUpdated",updatedOpcAddressForm:"updatedOpcAddressForm",opcCarriersRetry:"opcCarriersRetry",opcPaymentMethodsRetry:"opcPaymentMethodsRetry"};const r={opc:{checkout:".one-page-checkout",form:"#opc-form",payButton:"#opc-pay-button",payAmount:"#opc-pay-amount",addressesSection:".js-opc-addresses-section",deliveryMethods:"#opc-delivery-methods",paymentMethods:"#opc-payment-methods",deliverySection:"#opc-delivery-address",deliveryFields:"#opc-delivery-address-fields",billingSection:"#opc-billing-section",billingFields:"#opc-billing-address-fields",deliveryList:"#opc-delivery-address-content-list",billingList:"#opc-billing-address-content-list",useSameAddress:'[name="use_same_address"]',checkoutFooter:".one-page-checkout__footer",contactSection:".js-opc-contact-section",addressRadio:".js-opc-address-radio",addressItem:".opc-address-item",addressLabel:".form-check-label"},templates:{carrierLoader:"#opc-template-loader",carrierError:"#opc-template-carriers-error",paymentLoader:"#opc-template-payment-loader",paymentError:"#opc-template-payment-error"},inputs:{deliveryOption:'input[name="delivery_option"]',paymentOption:'input[name="payment-option"]',email:'input[name="email"]',conditions:'.one-page-checkout input[name^="conditions_to_approve["][required]'},modals:{address:"#opc-address-modal, #modal-delivery, #modal-invoice"}};function t(e){return t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},t(e)}function o(e,r){return null===(o=e)||"object"!==t(o)||Array.isArray(o)?{errors:{"":[r]}}:e;var o}function a(e){var r=window&&"object"===t(window.ps_onepagecheckout)&&window.ps_onepagecheckout?window.ps_onepagecheckout:null;return r&&r.urls&&r.urls[e]?String(r.urls[e]):""}function d(o,a){if("string"==typeof o&&""!==o){var d=window.prestashop||null,i=d&&d.selectors&&d.selectors.checkout&&d.selectors.checkout.summarySelector?String(d.selectors.checkout.summarySelector):"";if(i){d&&"function"==typeof d.emit&&d.emit(e.opcCartSummaryBeforeUpdate,{selector:i});var c=document.querySelector(i);c instanceof HTMLElement&&(c.outerHTML=o),d&&"function"==typeof d.emit&&d.emit(e.opcCartSummaryUpdated,{selector:i}),function(e){var o=window.prestashop||null,a=e&&"object"===t(e)&&(e.total&&e.total.value||e.total_including_tax&&e.total_including_tax.value)||"",d=o&&o.selectors&&o.selectors.opc&&o.selectors.opc.payAmount?String(o.selectors.opc.payAmount):"",i=d||r.opc.payAmount;if(!a||!i)return;var c=document.querySelector(i);c instanceof HTMLElement&&(c.textContent=String(a))}(a)}}}!function(){var t=window.$||window.jQuery,i=window.prestashop||{};if(t){var c=r.opc.deliveryMethods,n=r.opc.checkout,s=e.opcCarriersFailed,l=null;t(function(){y()&&f()}),t(document).on("click",'[data-opc-action="retry-carriers"]',function(e){e.preventDefault(),f()}),i.on(e.opcCarriersRetry,f),i.on(e.opcDeliveryAddressUpdated,function(){var e=document.querySelector(c),r=v();if(r)return l=r,e&&e.setAttribute("data-id-address",r),void f();l=null,e&&e.removeAttribute("data-id-address"),f()}),i.on(e.opcDeliveryAddressSelected,function(e){var r=e.idAddress;l=String(r||""),f()});var p=document.querySelector(c),u=v();p&&u&&(l=u)}function m(e){var r=document.querySelector("#".concat(e));return r?r.innerHTML:""}function y(){return document.querySelector(n)}function v(){var e=document.querySelector("".concat(r.opc.deliveryList," ").concat(r.opc.addressRadio,'[name="id_address_delivery"]:checked')),t=e?String(e.getAttribute("value")||""):"";return t&&"new_address"!==t?t:""}function S(e,r){var t=e.querySelector('[name="'.concat(r,'"]')),o=e.querySelector('[name="delivery_'.concat(r,'"]'));return(t&&t.value||o&&o.value||"").trim()}function f(){var n=function(e){var r=y();if(!r||!e)return"";if(l){var t=new URL(e,window.location.origin);return t.searchParams.set("id_address_delivery",l),t.toString()}document.querySelector(c);var o=S(r,"id_country");if(!o)return"";var a=new URL(e,window.location.origin),d=v();a.searchParams.set("id_country",o),d&&a.searchParams.set("id_address_delivery",d);var i=S(r,"postcode"),n=S(r,"id_state"),s=S(r,"city");return i&&a.searchParams.set("postcode",i),n&&a.searchParams.set("id_state",n),s&&a.searchParams.set("city",s),a.toString()}(a("carriers")),p=t(c);n&&p.length&&(p.html(m(r.templates.carrierLoader.replace("#",""))),i.emit(e.opcCarriersLoading,{}),t.get(n).done(function(t){if(!t||!1===t.success){var a=o(t,"Unable to load delivery methods.");return p.html(m(r.templates.carrierError.replace("#",""))),i.emit(s,{resp:a}),void i.emit("handleError",{eventType:"opcCarriers",resp:a})}p.html(t.carriers_html||""),void 0!==t.id_address_delivery&&(t.id_address_delivery?p.attr("data-id-address",String(t.id_address_delivery)):p.removeAttr("data-id-address")),t.preview&&d(t.preview,t.totals),i.emit(e.opcCarriersUpdated,t);var c=p.find("".concat(r.inputs.deliveryOption,":checked")).get(0);c?(p.attr("data-confirmed-delivery-option",String(c.value||"")),i.emit(e.opcCarrierSelected,{carrierId:c.value,resp:t})):p.removeAttr("data-confirmed-delivery-option")}).fail(function(e){var t=function(e,r){return o(e&&e.responseJSON,r)}(e,"Unable to load delivery methods.");p.html(m(r.templates.carrierError.replace("#",""))),i.emit(s,{resp:t}),i.emit("handleError",{eventType:"opcCarriers",resp:t})}))}}()})();
\ No newline at end of file
+(()=>{"use strict";const e={opcCarrierSelected:"opcCarrierSelected",opcCarriersUpdated:"opcCarriersUpdated",opcCarriersFailed:"opcCarriersFailed",opcCarriersLoading:"opcCarriersLoading",opcPaymentMethodsLoading:"opcPaymentMethodsLoading",opcPaymentMethodsUpdated:"opcPaymentMethodsUpdated",opcPaymentMethodsRefreshed:"opcPaymentMethodsRefreshed",opcPaymentMethodsFailed:"opcPaymentMethodsFailed",opcPaymentMethodSelected:"opcPaymentMethodSelected",opcGuestInitSuccess:"opcGuestInitSuccess",opcFinalSubmitStarted:"opcFinalSubmitStarted",opcFormValidated:"opcFormValidated",opcBillingSectionToggled:"opcBillingSectionToggled",opcSubmitFailed:"opcSubmitFailed",opcDeliveryAddressUpdated:"opcDeliveryAddressUpdated",opcBillingAddressUpdated:"opcBillingAddressUpdated",opcDeliveryAddressSelected:"opcDeliveryAddressSelected",opcBillingAddressSelected:"opcBillingAddressSelected",opcCartSummaryBeforeUpdate:"opcCartSummaryBeforeUpdate",opcCartSummaryUpdated:"opcCartSummaryUpdated",updatedOpcAddressForm:"updatedOpcAddressForm",opcCarriersRetry:"opcCarriersRetry",opcPaymentMethodsRetry:"opcPaymentMethodsRetry"};const r={opc:{checkout:".one-page-checkout",form:"#opc-form",payButton:"#opc-pay-button",payAmount:"#opc-pay-amount",addressesSection:".js-opc-addresses-section",deliveryMethods:"#opc-delivery-methods",paymentMethods:"#opc-payment-methods",deliverySection:"#opc-delivery-address",deliveryFields:"#opc-delivery-address-fields",billingSection:"#opc-billing-section",billingFields:"#opc-billing-address-fields",deliveryList:"#opc-delivery-address-content-list",billingList:"#opc-billing-address-content-list",useSameAddress:'[name="use_same_address"]',checkoutFooter:".one-page-checkout__footer",contactSection:".js-opc-contact-section",addressRadio:".js-opc-address-radio",addressItem:".opc-address-item",addressLabel:".form-check-label"},templates:{carrierLoader:"#opc-template-loader",carrierError:"#opc-template-carriers-error",paymentError:"#opc-template-payment-error"},inputs:{deliveryOption:'input[name="delivery_option"]',paymentOption:'input[name="payment-option"]',email:'input[name="email"]',conditions:'.one-page-checkout input[name^="conditions_to_approve["][required]'},modals:{address:"#opc-address-modal, #modal-delivery, #modal-invoice"}};function t(e){return t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},t(e)}function o(e,r){return null===(o=e)||"object"!==t(o)||Array.isArray(o)?{errors:{"":[r]}}:e;var o}function a(e){var r=window&&"object"===t(window.ps_onepagecheckout)&&window.ps_onepagecheckout?window.ps_onepagecheckout:null;return r&&r.urls&&r.urls[e]?String(r.urls[e]):""}function d(o,a){if("string"==typeof o&&""!==o){var d=window.prestashop||null,i=d&&d.selectors&&d.selectors.checkout&&d.selectors.checkout.summarySelector?String(d.selectors.checkout.summarySelector):"";if(i){d&&"function"==typeof d.emit&&d.emit(e.opcCartSummaryBeforeUpdate,{selector:i});var c=document.querySelector(i);c instanceof HTMLElement&&(c.outerHTML=o),d&&"function"==typeof d.emit&&d.emit(e.opcCartSummaryUpdated,{selector:i}),function(e){var o=window.prestashop||null,a=e&&"object"===t(e)&&(e.total&&e.total.value||e.total_including_tax&&e.total_including_tax.value)||"",d=o&&o.selectors&&o.selectors.opc&&o.selectors.opc.payAmount?String(o.selectors.opc.payAmount):"",i=d||r.opc.payAmount;if(!a||!i)return;var c=document.querySelector(i);c instanceof HTMLElement&&(c.textContent=String(a))}(a)}}}!function(){var t=window.$||window.jQuery,i=window.prestashop||{};if(t){var c=r.opc.deliveryMethods,n=r.opc.checkout,s=e.opcCarriersFailed,l=null;t(function(){y()&&S()}),t(document).on("click",'[data-opc-action="retry-carriers"]',function(e){e.preventDefault(),S()}),i.on(e.opcCarriersRetry,S),i.on(e.opcDeliveryAddressUpdated,function(){var e=document.querySelector(c),r=v();if(r)return l=r,e&&e.setAttribute("data-id-address",r),void S();l=null,e&&e.removeAttribute("data-id-address"),S()}),i.on(e.opcDeliveryAddressSelected,function(e){var r=e.idAddress;l=String(r||""),S()});var p=document.querySelector(c),u=v();p&&u&&(l=u)}function m(e){var r=document.querySelector("#".concat(e));return r?r.innerHTML:""}function y(){return document.querySelector(n)}function v(){var e=document.querySelector("".concat(r.opc.deliveryList," ").concat(r.opc.addressRadio,'[name="id_address_delivery"]:checked')),t=e?String(e.getAttribute("value")||""):"";return t&&"new_address"!==t?t:""}function f(e,r){var t=e.querySelector('[name="'.concat(r,'"]')),o=e.querySelector('[name="delivery_'.concat(r,'"]'));return(t&&t.value||o&&o.value||"").trim()}function S(){var n=function(e){var r=y();if(!r||!e)return"";if(l){var t=new URL(e,window.location.origin);return t.searchParams.set("id_address_delivery",l),t.toString()}document.querySelector(c);var o=f(r,"id_country");if(!o)return"";var a=new URL(e,window.location.origin),d=v();a.searchParams.set("id_country",o),d&&a.searchParams.set("id_address_delivery",d);var i=f(r,"postcode"),n=f(r,"id_state"),s=f(r,"city");return i&&a.searchParams.set("postcode",i),n&&a.searchParams.set("id_state",n),s&&a.searchParams.set("city",s),a.toString()}(a("carriers")),p=t(c);n&&p.length&&(p.html(m(r.templates.carrierLoader.replace("#",""))),i.emit(e.opcCarriersLoading,{}),t.get(n).done(function(t){if(!t||!1===t.success){var a=o(t,"Unable to load delivery methods.");return p.html(m(r.templates.carrierError.replace("#",""))),i.emit(s,{resp:a}),void i.emit("handleError",{eventType:"opcCarriers",resp:a})}p.html(t.carriers_html||""),void 0!==t.id_address_delivery&&(t.id_address_delivery?p.attr("data-id-address",String(t.id_address_delivery)):p.removeAttr("data-id-address")),t.preview&&d(t.preview,t.totals),i.emit(e.opcCarriersUpdated,t);var c=p.find("".concat(r.inputs.deliveryOption,":checked")).get(0);if(c){var n=String(c.value||"");p.attr("data-confirmed-delivery-option",n),i.emit(e.opcCarrierSelected,{selectedDeliveryOption:n,response:t})}else p.removeAttr("data-confirmed-delivery-option")}).fail(function(e){var t=function(e,r){return o(e&&e.responseJSON,r)}(e,"Unable to load delivery methods.");p.html(m(r.templates.carrierError.replace("#",""))),i.emit(s,{resp:t}),i.emit("handleError",{eventType:"opcCarriers",resp:t})}))}}()})();
\ No newline at end of file
diff --git a/views/public/opc-carrier-select.bundle.js b/views/public/opc-carrier-select.bundle.js
index 626d297..e7f358f 100644
--- a/views/public/opc-carrier-select.bundle.js
+++ b/views/public/opc-carrier-select.bundle.js
@@ -1 +1 @@
-(()=>{"use strict";const e={opcCarrierSelected:"opcCarrierSelected",opcCarriersUpdated:"opcCarriersUpdated",opcCarriersFailed:"opcCarriersFailed",opcCarriersLoading:"opcCarriersLoading",opcPaymentMethodsLoading:"opcPaymentMethodsLoading",opcPaymentMethodsUpdated:"opcPaymentMethodsUpdated",opcPaymentMethodsFailed:"opcPaymentMethodsFailed",opcPaymentMethodSelected:"opcPaymentMethodSelected",opcGuestInitSuccess:"opcGuestInitSuccess",opcFinalSubmitStarted:"opcFinalSubmitStarted",opcFormValidated:"opcFormValidated",opcBillingSectionToggled:"opcBillingSectionToggled",opcSubmitFailed:"opcSubmitFailed",opcDeliveryAddressUpdated:"opcDeliveryAddressUpdated",opcBillingAddressUpdated:"opcBillingAddressUpdated",opcDeliveryAddressSelected:"opcDeliveryAddressSelected",opcBillingAddressSelected:"opcBillingAddressSelected",opcCartSummaryBeforeUpdate:"opcCartSummaryBeforeUpdate",opcCartSummaryUpdated:"opcCartSummaryUpdated",updatedOpcAddressForm:"updatedOpcAddressForm",opcCarriersRetry:"opcCarriersRetry",opcPaymentMethodsRetry:"opcPaymentMethodsRetry"};const t={opc:{checkout:".one-page-checkout",form:"#opc-form",payButton:"#opc-pay-button",payAmount:"#opc-pay-amount",addressesSection:".js-opc-addresses-section",deliveryMethods:"#opc-delivery-methods",paymentMethods:"#opc-payment-methods",deliverySection:"#opc-delivery-address",deliveryFields:"#opc-delivery-address-fields",billingSection:"#opc-billing-section",billingFields:"#opc-billing-address-fields",deliveryList:"#opc-delivery-address-content-list",billingList:"#opc-billing-address-content-list",useSameAddress:'[name="use_same_address"]',checkoutFooter:".one-page-checkout__footer",contactSection:".js-opc-contact-section",addressRadio:".js-opc-address-radio",addressItem:".opc-address-item",addressLabel:".form-check-label"},templates:{carrierLoader:"#opc-template-loader",carrierError:"#opc-template-carriers-error",paymentLoader:"#opc-template-payment-loader",paymentError:"#opc-template-payment-error"},inputs:{deliveryOption:'input[name="delivery_option"]',paymentOption:'input[name="payment-option"]',email:'input[name="email"]',conditions:'.one-page-checkout input[name^="conditions_to_approve["][required]'},modals:{address:"#opc-address-modal, #modal-delivery, #modal-invoice"}};function r(e){return r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},r(e)}function o(e,t){return null===(o=e)||"object"!==r(o)||Array.isArray(o)?{errors:{"":[t]}}:e;var o}function n(e,t){return o(e&&e.responseJSON,t)}function c(e){var t=window&&"object"===r(window.ps_onepagecheckout)&&window.ps_onepagecheckout?window.ps_onepagecheckout:null;return t&&t.urls&&t.urls[e]?String(t.urls[e]):""}function i(o,n){if("string"==typeof o&&""!==o){var c=window.prestashop||null,i=c&&c.selectors&&c.selectors.checkout&&c.selectors.checkout.summarySelector?String(c.selectors.checkout.summarySelector):"";if(i){c&&"function"==typeof c.emit&&c.emit(e.opcCartSummaryBeforeUpdate,{selector:i});var a=document.querySelector(i);a instanceof HTMLElement&&(a.outerHTML=o),c&&"function"==typeof c.emit&&c.emit(e.opcCartSummaryUpdated,{selector:i}),function(e){var o=window.prestashop||null,n=e&&"object"===r(e)&&(e.total&&e.total.value||e.total_including_tax&&e.total_including_tax.value)||"",c=o&&o.selectors&&o.selectors.opc&&o.selectors.opc.payAmount?String(o.selectors.opc.payAmount):"",i=c||t.opc.payAmount;if(!n||!i)return;var a=document.querySelector(i);a instanceof HTMLElement&&(a.textContent=String(n))}(n)}}}function a(e){return a="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},a(e)}function d(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var o=Object.getOwnPropertySymbols(e);t&&(o=o.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),r.push.apply(r,o)}return r}function p(e){for(var t=1;t<arguments.length;t++){var r=null!=arguments[t]?arguments[t]:{};t%2?d(Object(r),!0).forEach(function(t){s(e,t,r[t])}):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):d(Object(r)).forEach(function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(r,t))})}return e}function s(e,t,r){return(t=function(e){var t=function(e,t){if("object"!=a(e)||!e)return e;var r=e[Symbol.toPrimitive];if(void 0!==r){var o=r.call(e,t||"default");if("object"!=a(o))return o;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===t?String:Number)(e)}(e,"string");return"symbol"==a(t)?t:t+""}(t))in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}!function(){var r=window.$||window.jQuery,a=window.prestashop||{};if(r){var d=t.opc.deliveryMethods,l=t.opc.checkout,u=t.opc.deliverySection,y="data-confirmed-delivery-option";r(document).on("change","".concat(d," ").concat(t.inputs.deliveryOption),function(t){var s=r(t.currentTarget),l=r(d),u=c("selectCarrier"),v=String(s.val()||"");if(u&&v){var S=p({delivery_option:v},l.attr("data-id-address")?{}:m());r.post(u,S).done(function(t){if(!t||!1===t.success)return f(l),void a.emit("handleError",{eventType:"opcSelectCarrier",resp:o(t,"Unable to select the delivery method.")});t.preview&&i(t.preview,t.totals),function(e,t){t?e.attr(y,t):e.removeAttr(y)}(l,v),a.emit(e.opcCarrierSelected,t)}).fail(function(e){f(l),a.emit("handleError",{eventType:"opcSelectCarrier",resp:n(e,"Unable to select the delivery method.")})})}else a.emit("handleError",{eventType:"opcSelectCarrier",resp:o(null,"Missing OPC carrier selection payload.")})})}function m(){var e=document.querySelector(l);if(!e)return{};var t=document.querySelector(u)||e;return["id_country","postcode","id_state","city"].reduce(function(e,r){var o=t.querySelector('[name="'.concat(r,'"]')),n=t.querySelector('[name="delivery_'.concat(r,'"]')),c=(o&&o.value||n&&n.value||"").trim();return""===c?e:p(p({},e),{},s({},r,c))},{})}function f(e){var o=String(e.attr(y)||"");if(o){var n=function(e,o){return e.find(t.inputs.deliveryOption).filter(function(e,t){return String(r(t).val()||"")===o}).first()}(e,o);n.length&&n.prop("checked",!0)}}}()})();
\ No newline at end of file
+(()=>{"use strict";const e={opcCarrierSelected:"opcCarrierSelected",opcCarriersUpdated:"opcCarriersUpdated",opcCarriersFailed:"opcCarriersFailed",opcCarriersLoading:"opcCarriersLoading",opcPaymentMethodsLoading:"opcPaymentMethodsLoading",opcPaymentMethodsUpdated:"opcPaymentMethodsUpdated",opcPaymentMethodsRefreshed:"opcPaymentMethodsRefreshed",opcPaymentMethodsFailed:"opcPaymentMethodsFailed",opcPaymentMethodSelected:"opcPaymentMethodSelected",opcGuestInitSuccess:"opcGuestInitSuccess",opcFinalSubmitStarted:"opcFinalSubmitStarted",opcFormValidated:"opcFormValidated",opcBillingSectionToggled:"opcBillingSectionToggled",opcSubmitFailed:"opcSubmitFailed",opcDeliveryAddressUpdated:"opcDeliveryAddressUpdated",opcBillingAddressUpdated:"opcBillingAddressUpdated",opcDeliveryAddressSelected:"opcDeliveryAddressSelected",opcBillingAddressSelected:"opcBillingAddressSelected",opcCartSummaryBeforeUpdate:"opcCartSummaryBeforeUpdate",opcCartSummaryUpdated:"opcCartSummaryUpdated",updatedOpcAddressForm:"updatedOpcAddressForm",opcCarriersRetry:"opcCarriersRetry",opcPaymentMethodsRetry:"opcPaymentMethodsRetry"};const t={opc:{checkout:".one-page-checkout",form:"#opc-form",payButton:"#opc-pay-button",payAmount:"#opc-pay-amount",addressesSection:".js-opc-addresses-section",deliveryMethods:"#opc-delivery-methods",paymentMethods:"#opc-payment-methods",deliverySection:"#opc-delivery-address",deliveryFields:"#opc-delivery-address-fields",billingSection:"#opc-billing-section",billingFields:"#opc-billing-address-fields",deliveryList:"#opc-delivery-address-content-list",billingList:"#opc-billing-address-content-list",useSameAddress:'[name="use_same_address"]',checkoutFooter:".one-page-checkout__footer",contactSection:".js-opc-contact-section",addressRadio:".js-opc-address-radio",addressItem:".opc-address-item",addressLabel:".form-check-label"},templates:{carrierLoader:"#opc-template-loader",carrierError:"#opc-template-carriers-error",paymentError:"#opc-template-payment-error"},inputs:{deliveryOption:'input[name="delivery_option"]',paymentOption:'input[name="payment-option"]',email:'input[name="email"]',conditions:'.one-page-checkout input[name^="conditions_to_approve["][required]'},modals:{address:"#opc-address-modal, #modal-delivery, #modal-invoice"}};function r(e){return r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},r(e)}function o(e,t){return null===(o=e)||"object"!==r(o)||Array.isArray(o)?{errors:{"":[t]}}:e;var o}function n(e,t){return o(e&&e.responseJSON,t)}function i(e){var t=window&&"object"===r(window.ps_onepagecheckout)&&window.ps_onepagecheckout?window.ps_onepagecheckout:null;return t&&t.urls&&t.urls[e]?String(t.urls[e]):""}function c(o,n){if("string"==typeof o&&""!==o){var i=window.prestashop||null,c=i&&i.selectors&&i.selectors.checkout&&i.selectors.checkout.summarySelector?String(i.selectors.checkout.summarySelector):"";if(c){i&&"function"==typeof i.emit&&i.emit(e.opcCartSummaryBeforeUpdate,{selector:c});var a=document.querySelector(c);a instanceof HTMLElement&&(a.outerHTML=o),i&&"function"==typeof i.emit&&i.emit(e.opcCartSummaryUpdated,{selector:c}),function(e){var o=window.prestashop||null,n=e&&"object"===r(e)&&(e.total&&e.total.value||e.total_including_tax&&e.total_including_tax.value)||"",i=o&&o.selectors&&o.selectors.opc&&o.selectors.opc.payAmount?String(o.selectors.opc.payAmount):"",c=i||t.opc.payAmount;if(!n||!c)return;var a=document.querySelector(c);a instanceof HTMLElement&&(a.textContent=String(n))}(n)}}}function a(e){return a="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},a(e)}function d(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var o=Object.getOwnPropertySymbols(e);t&&(o=o.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),r.push.apply(r,o)}return r}function s(e){for(var t=1;t<arguments.length;t++){var r=null!=arguments[t]?arguments[t]:{};t%2?d(Object(r),!0).forEach(function(t){p(e,t,r[t])}):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):d(Object(r)).forEach(function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(r,t))})}return e}function p(e,t,r){return(t=function(e){var t=function(e,t){if("object"!=a(e)||!e)return e;var r=e[Symbol.toPrimitive];if(void 0!==r){var o=r.call(e,t||"default");if("object"!=a(o))return o;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===t?String:Number)(e)}(e,"string");return"symbol"==a(t)?t:t+""}(t))in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}!function(){var r=window.$||window.jQuery,a=window.prestashop||{};if(r){var d=t.opc.deliveryMethods,l=t.opc.checkout,u=t.opc.form,y=t.opc.deliverySection,m="data-confirmed-delivery-option";r(document).on("change","".concat(d," ").concat(t.inputs.deliveryOption),function(t){var p=r(t.currentTarget),l=r(d),y=i("selectCarrier"),S=String(p.val()||"");if(y&&S){var b=s({delivery_option:S},l.attr("data-id-address")?{}:f());r.post(y,b).done(function(t){if(!t||!1===t.success)return v(l),void a.emit("handleError",{eventType:"opcSelectCarrier",resp:o(t,"Unable to select the delivery method.")});t.preview&&c(t.preview,t.totals),function(e,t){t?e.attr(m,t):e.removeAttr(m)}(l,S),a.emit("updatedDeliveryForm",{dataForm:r(u).serializeArray(),deliveryOption:p.closest(".js-delivery-option"),resp:t}),a.emit(e.opcCarrierSelected,{selectedDeliveryOption:S,response:t})}).fail(function(e){v(l),a.emit("handleError",{eventType:"opcSelectCarrier",resp:n(e,"Unable to select the delivery method.")})})}else a.emit("handleError",{eventType:"opcSelectCarrier",resp:o(null,"Missing OPC carrier selection payload.")})})}function f(){var e=document.querySelector(l);if(!e)return{};var t=document.querySelector(y)||e;return["id_country","postcode","id_state","city"].reduce(function(e,r){var o=t.querySelector('[name="'.concat(r,'"]')),n=t.querySelector('[name="delivery_'.concat(r,'"]')),i=(o&&o.value||n&&n.value||"").trim();return""===i?e:s(s({},e),{},p({},r,i))},{})}function v(e){var o=String(e.attr(m)||"");if(o){var n=function(e,o){return e.find(t.inputs.deliveryOption).filter(function(e,t){return String(r(t).val()||"")===o}).first()}(e,o);n.length&&n.prop("checked",!0)}}}()})();
\ No newline at end of file
diff --git a/views/public/opc-cart-summary-state.bundle.js b/views/public/opc-cart-summary-state.bundle.js
index 5ebb300..5c7b66b 100644
--- a/views/public/opc-cart-summary-state.bundle.js
+++ b/views/public/opc-cart-summary-state.bundle.js
@@ -1,2 +1,2 @@
 /*! For license information please see opc-cart-summary-state.bundle.js.LICENSE.txt */
-(()=>{"use strict";const e={opcCarrierSelected:"opcCarrierSelected",opcCarriersUpdated:"opcCarriersUpdated",opcCarriersFailed:"opcCarriersFailed",opcCarriersLoading:"opcCarriersLoading",opcPaymentMethodsLoading:"opcPaymentMethodsLoading",opcPaymentMethodsUpdated:"opcPaymentMethodsUpdated",opcPaymentMethodsFailed:"opcPaymentMethodsFailed",opcPaymentMethodSelected:"opcPaymentMethodSelected",opcGuestInitSuccess:"opcGuestInitSuccess",opcFinalSubmitStarted:"opcFinalSubmitStarted",opcFormValidated:"opcFormValidated",opcBillingSectionToggled:"opcBillingSectionToggled",opcSubmitFailed:"opcSubmitFailed",opcDeliveryAddressUpdated:"opcDeliveryAddressUpdated",opcBillingAddressUpdated:"opcBillingAddressUpdated",opcDeliveryAddressSelected:"opcDeliveryAddressSelected",opcBillingAddressSelected:"opcBillingAddressSelected",opcCartSummaryBeforeUpdate:"opcCartSummaryBeforeUpdate",opcCartSummaryUpdated:"opcCartSummaryUpdated",updatedOpcAddressForm:"updatedOpcAddressForm",opcCarriersRetry:"opcCarriersRetry",opcPaymentMethodsRetry:"opcPaymentMethodsRetry"};!function(){var t=window.prestashop||null;if(t&&"function"==typeof t.on){var o=[];t.on(e.opcCartSummaryBeforeUpdate,function(e){var t=e.selector;"string"==typeof t&&""!==t&&(o=Array.from(document.querySelectorAll("".concat(t," .accordion-collapse.show"))).map(function(e){return e.id}).filter(Boolean))}),t.on(e.opcCartSummaryUpdated,function(){o.forEach(function(e){var t=document.getElementById(e);if(t){t.classList.add("show");var o=document.querySelector('[data-bs-target="#'.concat(e,'"]'));o&&(o.classList.remove("collapsed"),o.setAttribute("aria-expanded","true"))}}),o=[]})}}()})();
\ No newline at end of file
+(()=>{"use strict";const e={opcCarrierSelected:"opcCarrierSelected",opcCarriersUpdated:"opcCarriersUpdated",opcCarriersFailed:"opcCarriersFailed",opcCarriersLoading:"opcCarriersLoading",opcPaymentMethodsLoading:"opcPaymentMethodsLoading",opcPaymentMethodsUpdated:"opcPaymentMethodsUpdated",opcPaymentMethodsRefreshed:"opcPaymentMethodsRefreshed",opcPaymentMethodsFailed:"opcPaymentMethodsFailed",opcPaymentMethodSelected:"opcPaymentMethodSelected",opcGuestInitSuccess:"opcGuestInitSuccess",opcFinalSubmitStarted:"opcFinalSubmitStarted",opcFormValidated:"opcFormValidated",opcBillingSectionToggled:"opcBillingSectionToggled",opcSubmitFailed:"opcSubmitFailed",opcDeliveryAddressUpdated:"opcDeliveryAddressUpdated",opcBillingAddressUpdated:"opcBillingAddressUpdated",opcDeliveryAddressSelected:"opcDeliveryAddressSelected",opcBillingAddressSelected:"opcBillingAddressSelected",opcCartSummaryBeforeUpdate:"opcCartSummaryBeforeUpdate",opcCartSummaryUpdated:"opcCartSummaryUpdated",updatedOpcAddressForm:"updatedOpcAddressForm",opcCarriersRetry:"opcCarriersRetry",opcPaymentMethodsRetry:"opcPaymentMethodsRetry"};!function(){var t=window.prestashop||null;if(t&&"function"==typeof t.on){var o=[];t.on(e.opcCartSummaryBeforeUpdate,function(e){var t=e.selector;"string"==typeof t&&""!==t&&(o=Array.from(document.querySelectorAll("".concat(t," .accordion-collapse.show"))).map(function(e){return e.id}).filter(Boolean))}),t.on(e.opcCartSummaryUpdated,function(){o.forEach(function(e){var t=document.getElementById(e);if(t){t.classList.add("show");var o=document.querySelector('[data-bs-target="#'.concat(e,'"]'));o&&(o.classList.remove("collapsed"),o.setAttribute("aria-expanded","true"))}}),o=[]})}}()})();
\ No newline at end of file
diff --git a/views/public/opc-guest-init.bundle.js b/views/public/opc-guest-init.bundle.js
index 2a9fb03..62491b5 100644
--- a/views/public/opc-guest-init.bundle.js
+++ b/views/public/opc-guest-init.bundle.js
@@ -1,2 +1,2 @@
 /*! For license information please see opc-guest-init.bundle.js.LICENSE.txt */
-(()=>{"use strict";const e={opcCarrierSelected:"opcCarrierSelected",opcCarriersUpdated:"opcCarriersUpdated",opcCarriersFailed:"opcCarriersFailed",opcCarriersLoading:"opcCarriersLoading",opcPaymentMethodsLoading:"opcPaymentMethodsLoading",opcPaymentMethodsUpdated:"opcPaymentMethodsUpdated",opcPaymentMethodsFailed:"opcPaymentMethodsFailed",opcPaymentMethodSelected:"opcPaymentMethodSelected",opcGuestInitSuccess:"opcGuestInitSuccess",opcFinalSubmitStarted:"opcFinalSubmitStarted",opcFormValidated:"opcFormValidated",opcBillingSectionToggled:"opcBillingSectionToggled",opcSubmitFailed:"opcSubmitFailed",opcDeliveryAddressUpdated:"opcDeliveryAddressUpdated",opcBillingAddressUpdated:"opcBillingAddressUpdated",opcDeliveryAddressSelected:"opcDeliveryAddressSelected",opcBillingAddressSelected:"opcBillingAddressSelected",opcCartSummaryBeforeUpdate:"opcCartSummaryBeforeUpdate",opcCartSummaryUpdated:"opcCartSummaryUpdated",updatedOpcAddressForm:"updatedOpcAddressForm",opcCarriersRetry:"opcCarriersRetry",opcPaymentMethodsRetry:"opcPaymentMethodsRetry"};const t={opc:{checkout:".one-page-checkout",form:"#opc-form",payButton:"#opc-pay-button",payAmount:"#opc-pay-amount",addressesSection:".js-opc-addresses-section",deliveryMethods:"#opc-delivery-methods",paymentMethods:"#opc-payment-methods",deliverySection:"#opc-delivery-address",deliveryFields:"#opc-delivery-address-fields",billingSection:"#opc-billing-section",billingFields:"#opc-billing-address-fields",deliveryList:"#opc-delivery-address-content-list",billingList:"#opc-billing-address-content-list",useSameAddress:'[name="use_same_address"]',checkoutFooter:".one-page-checkout__footer",contactSection:".js-opc-contact-section",addressRadio:".js-opc-address-radio",addressItem:".opc-address-item",addressLabel:".form-check-label"},templates:{carrierLoader:"#opc-template-loader",carrierError:"#opc-template-carriers-error",paymentLoader:"#opc-template-payment-loader",paymentError:"#opc-template-payment-error"},inputs:{deliveryOption:'input[name="delivery_option"]',paymentOption:'input[name="payment-option"]',email:'input[name="email"]',conditions:'.one-page-checkout input[name^="conditions_to_approve["][required]'},modals:{address:"#opc-address-modal, #modal-delivery, #modal-invoice"}};function o(e){return o="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},o(e)}function r(e){var t=window&&"object"===o(window.ps_onepagecheckout)&&window.ps_onepagecheckout?window.ps_onepagecheckout:null;return t&&t.urls&&t.urls[e]?String(t.urls[e]):""}function n(e){return n="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},n(e)}function i(e,t){var o=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),o.push.apply(o,r)}return o}function c(e,t,o){return(t=function(e){var t=function(e,t){if("object"!=n(e)||!e)return e;var o=e[Symbol.toPrimitive];if(void 0!==o){var r=o.call(e,t||"default");if("object"!=n(r))return r;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===t?String:Number)(e)}(e,"string");return"symbol"==n(t)?t:t+""}(t))in e?Object.defineProperty(e,t,{value:o,enumerable:!0,configurable:!0,writable:!0}):e[t]=o,e}!function(){var o=window.$||window.jQuery,n=window.prestashop||{},a=t.opc.checkout,s=t.opc.contactSection,d=t.inputs.email,p="input, select, textarea",u=t.modals.address,l=null,m=null,y="",f="",b=h(),g=!1;function h(){var e,t=(e=n.customer)?Number(e.id||0):0;return!Number.isInteger(t)||t<=0||j()?0:t}function S(){if(j())return!1;var e,t,o=(e=n.cart)?Number(e.id_customer||0):0;return!!(Number.isInteger(o)&&o>0)||""!==((t=n.customer)?String(t.email||"").trim():"")}function v(){return(b=b||h())>0||S()}function w(){return o(s).first()}function k(e){return o(e).closest(u).length>0}function O(e){return e.find(d).first()}function j(){var e=n.customer;return Boolean(e&&e.is_logged)}function P(){return!j()&&(o(a).length>0&&w().length>0)}function _(e){return!!e.length&&(!!String(e.val()||"").trim()&&e.get(0).checkValidity())}function C(e){return Object.keys(e).sort().map(function(t){return"".concat(t,":").concat(e[t])}).join("|")}function F(){f="",m&&4!==m.readyState&&m.abort()}function A(){if(!g&&P()){var t=w();if(_(O(t))){var a=function(e){var t={email:String(O(e).val()||"").trim()},r=window&&window.prestashop?window.prestashop:n,i="";return r&&r.static_token?i=String(r.static_token):r&&r.token&&(i=String(r.token)),""!==i&&(t.token=i,t.static_token=i),e.find(p).each(function(e,r){var n=r.name,i=String(r.type||"").toLowerCase();!n||"email"===n||r.disabled||k(r)||["hidden","submit","button","image","reset","file"].includes(i)||("checkbox"!==i?"radio"!==i?t[n]=String(o(r).val()||"").trim():r.checked&&(t[n]=String(r.value||"")):t[n]=r.checked?"1":"0")}),t}(t),s=function(e){var t={};return e.find("".concat('input[type="checkbox"]',"[required]")).each(function(e,o){var r=o.name;r&&!k(o)&&(t[r]=o.checked?"1":"0")}),t}(t),d=v();if(d||!function(e){return Object.values(e).includes("0")}(s)){var u=C(d?{email:a.email}:function(e){for(var t=1;t<arguments.length;t++){var o=null!=arguments[t]?arguments[t]:{};t%2?i(Object(o),!0).forEach(function(t){c(e,t,o[t])}):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(o)):i(Object(o)).forEach(function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(o,t))})}return e}({email:a.email},s));if(u!==y&&u!==f){f=u,m&&4!==m.readyState&&m.abort();var l=r("guestInit");""!==l?m=o.post(l,a).done(function(t){if(t&&(t.token||t.static_token)&&window&&window.prestashop){var o=String(t.static_token||t.token||"");""!==o&&(window.prestashop.token=o,window.prestashop.static_token=o,n.token=o,n.static_token=o)}if(t&&t.success){var r=Number(t.id_customer||0);r>0?(b=r,window.prestashop&&(window.prestashop.customer=window.prestashop.customer||{},window.prestashop.customer.id=r,n.customer=window.prestashop.customer),y=C({email:a.email})):y=u,n.emit(e.opcGuestInitSuccess,{resp:t})}else t&&t.errors&&Array.isArray(t.errors.token)&&t.errors.token.length>0?y=u:t&&!1===t.success&&n.emit("handleError",{eventType:"opcGuestInit",resp:t})}).fail(function(e){e&&"abort"===e.statusText||n.emit("handleError",{eventType:"opcGuestInit",resp:e})}).always(function(){f=""}):n.emit("handleError",{eventType:"opcGuestInit",resp:{errors:{"":["Missing OPC guest init URL."]}}})}}else F()}else F()}}function M(){if(!g){var e=v()?900:250;window.clearTimeout(l),l=window.setTimeout(A,e)}}o(function(){P()&&(!function(){if(v()){var e=O(w());_(e)&&(y=C({email:String(e.val()||"").trim()}))}}(),o("body").on("input change","".concat(s," ").concat(d),function(){M()}),o("body").on("change","".concat(s," ").concat(p),function(e){k(e.currentTarget)||M()}),n.on(e.opcFinalSubmitStarted,function(){g||(g=!0,window.clearTimeout(l),f="",m&&4!==m.readyState&&m.abort())}),M())})}()})();
\ No newline at end of file
+(()=>{"use strict";const e={opcCarrierSelected:"opcCarrierSelected",opcCarriersUpdated:"opcCarriersUpdated",opcCarriersFailed:"opcCarriersFailed",opcCarriersLoading:"opcCarriersLoading",opcPaymentMethodsLoading:"opcPaymentMethodsLoading",opcPaymentMethodsUpdated:"opcPaymentMethodsUpdated",opcPaymentMethodsRefreshed:"opcPaymentMethodsRefreshed",opcPaymentMethodsFailed:"opcPaymentMethodsFailed",opcPaymentMethodSelected:"opcPaymentMethodSelected",opcGuestInitSuccess:"opcGuestInitSuccess",opcFinalSubmitStarted:"opcFinalSubmitStarted",opcFormValidated:"opcFormValidated",opcBillingSectionToggled:"opcBillingSectionToggled",opcSubmitFailed:"opcSubmitFailed",opcDeliveryAddressUpdated:"opcDeliveryAddressUpdated",opcBillingAddressUpdated:"opcBillingAddressUpdated",opcDeliveryAddressSelected:"opcDeliveryAddressSelected",opcBillingAddressSelected:"opcBillingAddressSelected",opcCartSummaryBeforeUpdate:"opcCartSummaryBeforeUpdate",opcCartSummaryUpdated:"opcCartSummaryUpdated",updatedOpcAddressForm:"updatedOpcAddressForm",opcCarriersRetry:"opcCarriersRetry",opcPaymentMethodsRetry:"opcPaymentMethodsRetry"};const t={opc:{checkout:".one-page-checkout",form:"#opc-form",payButton:"#opc-pay-button",payAmount:"#opc-pay-amount",addressesSection:".js-opc-addresses-section",deliveryMethods:"#opc-delivery-methods",paymentMethods:"#opc-payment-methods",deliverySection:"#opc-delivery-address",deliveryFields:"#opc-delivery-address-fields",billingSection:"#opc-billing-section",billingFields:"#opc-billing-address-fields",deliveryList:"#opc-delivery-address-content-list",billingList:"#opc-billing-address-content-list",useSameAddress:'[name="use_same_address"]',checkoutFooter:".one-page-checkout__footer",contactSection:".js-opc-contact-section",addressRadio:".js-opc-address-radio",addressItem:".opc-address-item",addressLabel:".form-check-label"},templates:{carrierLoader:"#opc-template-loader",carrierError:"#opc-template-carriers-error",paymentError:"#opc-template-payment-error"},inputs:{deliveryOption:'input[name="delivery_option"]',paymentOption:'input[name="payment-option"]',email:'input[name="email"]',conditions:'.one-page-checkout input[name^="conditions_to_approve["][required]'},modals:{address:"#opc-address-modal, #modal-delivery, #modal-invoice"}};function o(e){return o="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},o(e)}function r(e){var t=window&&"object"===o(window.ps_onepagecheckout)&&window.ps_onepagecheckout?window.ps_onepagecheckout:null;return t&&t.urls&&t.urls[e]?String(t.urls[e]):""}function n(e){return n="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},n(e)}function i(e,t){var o=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),o.push.apply(o,r)}return o}function c(e,t,o){return(t=function(e){var t=function(e,t){if("object"!=n(e)||!e)return e;var o=e[Symbol.toPrimitive];if(void 0!==o){var r=o.call(e,t||"default");if("object"!=n(r))return r;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===t?String:Number)(e)}(e,"string");return"symbol"==n(t)?t:t+""}(t))in e?Object.defineProperty(e,t,{value:o,enumerable:!0,configurable:!0,writable:!0}):e[t]=o,e}!function(){var o=window.$||window.jQuery,n=window.prestashop||{},a=t.opc.checkout,s=t.opc.contactSection,d=t.inputs.email,p="input, select, textarea",u=t.modals.address,l=null,m=null,y="",f="",b=h(),g=!1;function h(){var e,t=(e=n.customer)?Number(e.id||0):0;return!Number.isInteger(t)||t<=0||P()?0:t}function S(){if(P())return!1;var e,t,o=(e=n.cart)?Number(e.id_customer||0):0;return!!(Number.isInteger(o)&&o>0)||""!==((t=n.customer)?String(t.email||"").trim():"")}function v(){return(b=b||h())>0||S()}function w(){return o(s).first()}function k(e){return o(e).closest(u).length>0}function O(e){return e.find(d).first()}function P(){var e=n.customer;return Boolean(e&&e.is_logged)}function j(){return!P()&&(o(a).length>0&&w().length>0)}function _(e){return!!e.length&&(!!String(e.val()||"").trim()&&e.get(0).checkValidity())}function C(e){return Object.keys(e).sort().map(function(t){return"".concat(t,":").concat(e[t])}).join("|")}function F(){f="",m&&4!==m.readyState&&m.abort()}function M(){if(!g&&j()){var t=w();if(_(O(t))){var a=function(e){var t={email:String(O(e).val()||"").trim()},r=window&&window.prestashop?window.prestashop:n,i="";return r&&r.static_token?i=String(r.static_token):r&&r.token&&(i=String(r.token)),""!==i&&(t.token=i,t.static_token=i),e.find(p).each(function(e,r){var n=r.name,i=String(r.type||"").toLowerCase();!n||"email"===n||r.disabled||k(r)||["hidden","submit","button","image","reset","file"].includes(i)||("checkbox"!==i?"radio"!==i?t[n]=String(o(r).val()||"").trim():r.checked&&(t[n]=String(r.value||"")):t[n]=r.checked?"1":"0")}),t}(t),s=function(e){var t={};return e.find("".concat('input[type="checkbox"]',"[required]")).each(function(e,o){var r=o.name;r&&!k(o)&&(t[r]=o.checked?"1":"0")}),t}(t),d=v();if(d||!function(e){return Object.values(e).includes("0")}(s)){var u=C(d?{email:a.email}:function(e){for(var t=1;t<arguments.length;t++){var o=null!=arguments[t]?arguments[t]:{};t%2?i(Object(o),!0).forEach(function(t){c(e,t,o[t])}):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(o)):i(Object(o)).forEach(function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(o,t))})}return e}({email:a.email},s));if(u!==y&&u!==f){f=u,m&&4!==m.readyState&&m.abort();var l=r("guestInit");""!==l?m=o.post(l,a).done(function(t){if(t&&(t.token||t.static_token)&&window&&window.prestashop){var o=String(t.static_token||t.token||"");""!==o&&(window.prestashop.token=o,window.prestashop.static_token=o,n.token=o,n.static_token=o)}if(t&&t.success){var r=Number(t.id_customer||0);r>0?(b=r,window.prestashop&&(window.prestashop.customer=window.prestashop.customer||{},window.prestashop.customer.id=r,n.customer=window.prestashop.customer),y=C({email:a.email})):y=u,n.emit(e.opcGuestInitSuccess,{resp:t})}else t&&t.errors&&Array.isArray(t.errors.token)&&t.errors.token.length>0?y=u:t&&!1===t.success&&n.emit("handleError",{eventType:"opcGuestInit",resp:t})}).fail(function(e){e&&"abort"===e.statusText||n.emit("handleError",{eventType:"opcGuestInit",resp:e})}).always(function(){f=""}):n.emit("handleError",{eventType:"opcGuestInit",resp:{errors:{"":["Missing OPC guest init URL."]}}})}}else F()}else F()}}function A(){if(!g){var e=v()?900:250;window.clearTimeout(l),l=window.setTimeout(M,e)}}o(function(){j()&&(!function(){if(v()){var e=O(w());_(e)&&(y=C({email:String(e.val()||"").trim()}))}}(),o("body").on("input change","".concat(s," ").concat(d),function(){A()}),o("body").on("change","".concat(s," ").concat(p),function(e){k(e.currentTarget)||A()}),n.on(e.opcFinalSubmitStarted,function(){g||(g=!0,window.clearTimeout(l),f="",m&&4!==m.readyState&&m.abort())}),A())})}()})();
\ No newline at end of file
diff --git a/views/public/opc-payment-list.bundle.js b/views/public/opc-payment-list.bundle.js
index 7cde58c..da8e605 100644
--- a/views/public/opc-payment-list.bundle.js
+++ b/views/public/opc-payment-list.bundle.js
@@ -1 +1 @@
-(()=>{"use strict";const e={opcCarrierSelected:"opcCarrierSelected",opcCarriersUpdated:"opcCarriersUpdated",opcCarriersFailed:"opcCarriersFailed",opcCarriersLoading:"opcCarriersLoading",opcPaymentMethodsLoading:"opcPaymentMethodsLoading",opcPaymentMethodsUpdated:"opcPaymentMethodsUpdated",opcPaymentMethodsFailed:"opcPaymentMethodsFailed",opcPaymentMethodSelected:"opcPaymentMethodSelected",opcGuestInitSuccess:"opcGuestInitSuccess",opcFinalSubmitStarted:"opcFinalSubmitStarted",opcFormValidated:"opcFormValidated",opcBillingSectionToggled:"opcBillingSectionToggled",opcSubmitFailed:"opcSubmitFailed",opcDeliveryAddressUpdated:"opcDeliveryAddressUpdated",opcBillingAddressUpdated:"opcBillingAddressUpdated",opcDeliveryAddressSelected:"opcDeliveryAddressSelected",opcBillingAddressSelected:"opcBillingAddressSelected",opcCartSummaryBeforeUpdate:"opcCartSummaryBeforeUpdate",opcCartSummaryUpdated:"opcCartSummaryUpdated",updatedOpcAddressForm:"updatedOpcAddressForm",opcCarriersRetry:"opcCarriersRetry",opcPaymentMethodsRetry:"opcPaymentMethodsRetry"};const o={opc:{checkout:".one-page-checkout",form:"#opc-form",payButton:"#opc-pay-button",payAmount:"#opc-pay-amount",addressesSection:".js-opc-addresses-section",deliveryMethods:"#opc-delivery-methods",paymentMethods:"#opc-payment-methods",deliverySection:"#opc-delivery-address",deliveryFields:"#opc-delivery-address-fields",billingSection:"#opc-billing-section",billingFields:"#opc-billing-address-fields",deliveryList:"#opc-delivery-address-content-list",billingList:"#opc-billing-address-content-list",useSameAddress:'[name="use_same_address"]',checkoutFooter:".one-page-checkout__footer",contactSection:".js-opc-contact-section",addressRadio:".js-opc-address-radio",addressItem:".opc-address-item",addressLabel:".form-check-label"},templates:{carrierLoader:"#opc-template-loader",carrierError:"#opc-template-carriers-error",paymentLoader:"#opc-template-payment-loader",paymentError:"#opc-template-payment-error"},inputs:{deliveryOption:'input[name="delivery_option"]',paymentOption:'input[name="payment-option"]',email:'input[name="email"]',conditions:'.one-page-checkout input[name^="conditions_to_approve["][required]'},modals:{address:"#opc-address-modal, #modal-delivery, #modal-invoice"}};function t(e){return t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},t(e)}function r(e,o){return null===(r=e)||"object"!==t(r)||Array.isArray(r)?{errors:{"":[o]}}:e;var r}function d(e){var o=window&&"object"===t(window.ps_onepagecheckout)&&window.ps_onepagecheckout?window.ps_onepagecheckout:null;return o&&o.urls&&o.urls[e]?String(o.urls[e]):""}!function(){var t=window.$||window.jQuery,a=window.prestashop||{};if(t){var n=o.opc.paymentMethods,i=o.opc.checkout,c=0;t(y),t(document).on("click",'[data-opc-action="retry-payment"]',function(e){e.preventDefault(),y()}),a.on(e.opcCarrierSelected,y),a.on(e.opcBillingAddressUpdated,y),a.on(e.opcGuestInitSuccess,y),a.on(e.opcPaymentMethodsRetry,y),a.on(e.opcCarriersLoading,function(){c+=1,m()}),a.on(e.opcCarriersFailed,function(){var t=p();c+=1,t.length&&t.html(s(o.templates.paymentError.replace("#",""))),a.emit(e.opcPaymentMethodsFailed,{error:"carrier fetch failed"})})}function s(e){var o=document.querySelector("#".concat(e));return o?o.innerHTML:""}function p(){return t(n)}function l(e,t){var r=document.querySelector("".concat(e," ").concat(o.opc.addressRadio,'[name="').concat(t,'"]:checked')),d=r?String(r.getAttribute("value")||""):"";return d&&"new_address"!==d?d:""}function m(){var t=p();t.length&&(t.html(s(o.templates.paymentLoader.replace("#",""))),a.emit(e.opcPaymentMethodsLoading,{}))}function u(e){var t,r,d,a,n,c=document.querySelector(i);if(!c||!e)return"";var s=new URL(e,window.location.origin),p=(null===(t=c.querySelector('[name="id_country"]'))||void 0===t?void 0:t.value)||(null===(r=c.querySelector('[name="delivery_id_country"]'))||void 0===r?void 0:r.value)||"",m=(null===(d=c.querySelector('[name="invoice_id_country"]'))||void 0===d?void 0:d.value)||"",u=l(o.opc.deliveryList,"id_address_delivery")||(null===(a=c.querySelector('[name="id_address_delivery"]'))||void 0===a?void 0:a.value)||"",y=l(o.opc.billingList,"id_address_invoice")||(null===(n=c.querySelector('[name="id_address_invoice"]'))||void 0===n?void 0:n.value)||"";return p&&s.searchParams.set("id_country",p),m&&s.searchParams.set("invoice_id_country",m),u&&s.searchParams.set("id_address_delivery",u),y&&s.searchParams.set("id_address_invoice",y),s.toString()}function y(){var n=p(),i=u(d("paymentMethods"));if(n.length&&i){var l=++c;m(),t.get(i).done(function(t){if(l===c){if(!t||!1===t.success){var d=r(t,"Unable to load payment methods.");return n.html(s(o.templates.paymentError.replace("#",""))),a.emit(e.opcPaymentMethodsFailed,{error:d}),void a.emit("handleError",{eventType:"opcPaymentMethods",resp:d})}n.html(t.payment_html||""),a.emit(e.opcPaymentMethodsUpdated,t)}}).fail(function(t){if(l===c){var d=function(e,o){return r(e&&e.responseJSON,o)}(t,"Unable to load payment methods.");n.html(s(o.templates.paymentError.replace("#",""))),a.emit(e.opcPaymentMethodsFailed,{error:d}),a.emit("handleError",{eventType:"opcPaymentMethods",resp:d})}})}}}()})();
\ No newline at end of file
+(()=>{"use strict";const e={opcCarrierSelected:"opcCarrierSelected",opcCarriersUpdated:"opcCarriersUpdated",opcCarriersFailed:"opcCarriersFailed",opcCarriersLoading:"opcCarriersLoading",opcPaymentMethodsLoading:"opcPaymentMethodsLoading",opcPaymentMethodsUpdated:"opcPaymentMethodsUpdated",opcPaymentMethodsRefreshed:"opcPaymentMethodsRefreshed",opcPaymentMethodsFailed:"opcPaymentMethodsFailed",opcPaymentMethodSelected:"opcPaymentMethodSelected",opcGuestInitSuccess:"opcGuestInitSuccess",opcFinalSubmitStarted:"opcFinalSubmitStarted",opcFormValidated:"opcFormValidated",opcBillingSectionToggled:"opcBillingSectionToggled",opcSubmitFailed:"opcSubmitFailed",opcDeliveryAddressUpdated:"opcDeliveryAddressUpdated",opcBillingAddressUpdated:"opcBillingAddressUpdated",opcDeliveryAddressSelected:"opcDeliveryAddressSelected",opcBillingAddressSelected:"opcBillingAddressSelected",opcCartSummaryBeforeUpdate:"opcCartSummaryBeforeUpdate",opcCartSummaryUpdated:"opcCartSummaryUpdated",updatedOpcAddressForm:"updatedOpcAddressForm",opcCarriersRetry:"opcCarriersRetry",opcPaymentMethodsRetry:"opcPaymentMethodsRetry"};const o={opc:{checkout:".one-page-checkout",form:"#opc-form",payButton:"#opc-pay-button",payAmount:"#opc-pay-amount",addressesSection:".js-opc-addresses-section",deliveryMethods:"#opc-delivery-methods",paymentMethods:"#opc-payment-methods",deliverySection:"#opc-delivery-address",deliveryFields:"#opc-delivery-address-fields",billingSection:"#opc-billing-section",billingFields:"#opc-billing-address-fields",deliveryList:"#opc-delivery-address-content-list",billingList:"#opc-billing-address-content-list",useSameAddress:'[name="use_same_address"]',checkoutFooter:".one-page-checkout__footer",contactSection:".js-opc-contact-section",addressRadio:".js-opc-address-radio",addressItem:".opc-address-item",addressLabel:".form-check-label"},templates:{carrierLoader:"#opc-template-loader",carrierError:"#opc-template-carriers-error",paymentError:"#opc-template-payment-error"},inputs:{deliveryOption:'input[name="delivery_option"]',paymentOption:'input[name="payment-option"]',email:'input[name="email"]',conditions:'.one-page-checkout input[name^="conditions_to_approve["][required]'},modals:{address:"#opc-address-modal, #modal-delivery, #modal-invoice"}};function t(e){return t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},t(e)}function r(e,o){return null===(r=e)||"object"!==t(r)||Array.isArray(r)?{errors:{"":[o]}}:e;var r}function d(e){var o=window&&"object"===t(window.ps_onepagecheckout)&&window.ps_onepagecheckout?window.ps_onepagecheckout:null;return o&&o.urls&&o.urls[e]?String(o.urls[e]):""}!function(){var t=window.$||window.jQuery,n=window.prestashop||{};if(t){var a=o.opc.paymentMethods,i=o.opc.checkout,c=0,s=null;t(f),t(document).on("click",'[data-opc-action="retry-payment"]',function(e){e.preventDefault(),f()}),n.on(e.opcCarrierSelected,f),n.on(e.opcBillingAddressUpdated,f),n.on(e.opcGuestInitSuccess,f),n.on(e.opcPaymentMethodsRetry,f),n.on(e.opcCarriersLoading,function(){c+=1,y()}),n.on(e.opcCarriersFailed,function(){var t=p();c+=1,t.length&&(t.html(l(o.templates.paymentError.replace("#",""))),s=null),v(),n.emit(e.opcPaymentMethodsFailed,{error:"carrier fetch failed"})})}function l(e){var o=document.querySelector("#".concat(e));return o?o.innerHTML:""}function p(){return t(a)}function m(e,t){var r=document.querySelector("".concat(e," ").concat(o.opc.addressRadio,'[name="').concat(t,'"]:checked')),d=r?String(r.getAttribute("value")||""):"";return d&&"new_address"!==d?d:""}function u(){return document.getElementById("opc-payment-methods-loader")}function y(){var o=u();o&&(o.classList.remove("d-none"),o.setAttribute("aria-hidden","false"),n.emit(e.opcPaymentMethodsLoading,{}))}function v(){var e=u();e&&(e.classList.add("d-none"),e.setAttribute("aria-hidden","true"))}function h(e){var t,r,d,n,a,c=document.querySelector(i);if(!c||!e)return"";var s=new URL(e,window.location.origin),l=(null===(t=c.querySelector('[name="id_country"]'))||void 0===t?void 0:t.value)||(null===(r=c.querySelector('[name="delivery_id_country"]'))||void 0===r?void 0:r.value)||"",p=(null===(d=c.querySelector('[name="invoice_id_country"]'))||void 0===d?void 0:d.value)||"",u=m(o.opc.deliveryList,"id_address_delivery")||(null===(n=c.querySelector('[name="id_address_delivery"]'))||void 0===n?void 0:n.value)||"",y=m(o.opc.billingList,"id_address_invoice")||(null===(a=c.querySelector('[name="id_address_invoice"]'))||void 0===a?void 0:a.value)||"";return l&&s.searchParams.set("id_country",l),p&&s.searchParams.set("invoice_id_country",p),u&&s.searchParams.set("id_address_delivery",u),y&&s.searchParams.set("id_address_invoice",y),s.toString()}function f(){var a=p(),i=h(d("paymentMethods"));if(a.length&&i){var m=++c;y(),t.get(i).done(function(t){if(m===c){if(!t||!1===t.success){var d=r(t,"Unable to load payment methods.");return a.html(l(o.templates.paymentError.replace("#",""))),s=null,v(),n.emit(e.opcPaymentMethodsFailed,{error:d}),void n.emit("handleError",{eventType:"opcPaymentMethods",resp:d})}var i=t.payment_html||"";s!==i?(a.html(i),s=i,n.emit(e.opcPaymentMethodsUpdated,t)):n.emit(e.opcPaymentMethodsRefreshed,t),v()}}).fail(function(t){if(m===c){var d=function(e,o){return r(e&&e.responseJSON,o)}(t,"Unable to load payment methods.");a.html(l(o.templates.paymentError.replace("#",""))),s=null,v(),n.emit(e.opcPaymentMethodsFailed,{error:d}),n.emit("handleError",{eventType:"opcPaymentMethods",resp:d})}})}}}()})();
\ No newline at end of file
diff --git a/views/public/opc-payment-select.bundle.js b/views/public/opc-payment-select.bundle.js
index 5df510d..140888f 100644
--- a/views/public/opc-payment-select.bundle.js
+++ b/views/public/opc-payment-select.bundle.js
@@ -1 +1 @@
-(()=>{"use strict";const e={opcCarrierSelected:"opcCarrierSelected",opcCarriersUpdated:"opcCarriersUpdated",opcCarriersFailed:"opcCarriersFailed",opcCarriersLoading:"opcCarriersLoading",opcPaymentMethodsLoading:"opcPaymentMethodsLoading",opcPaymentMethodsUpdated:"opcPaymentMethodsUpdated",opcPaymentMethodsFailed:"opcPaymentMethodsFailed",opcPaymentMethodSelected:"opcPaymentMethodSelected",opcGuestInitSuccess:"opcGuestInitSuccess",opcFinalSubmitStarted:"opcFinalSubmitStarted",opcFormValidated:"opcFormValidated",opcBillingSectionToggled:"opcBillingSectionToggled",opcSubmitFailed:"opcSubmitFailed",opcDeliveryAddressUpdated:"opcDeliveryAddressUpdated",opcBillingAddressUpdated:"opcBillingAddressUpdated",opcDeliveryAddressSelected:"opcDeliveryAddressSelected",opcBillingAddressSelected:"opcBillingAddressSelected",opcCartSummaryBeforeUpdate:"opcCartSummaryBeforeUpdate",opcCartSummaryUpdated:"opcCartSummaryUpdated",updatedOpcAddressForm:"updatedOpcAddressForm",opcCarriersRetry:"opcCarriersRetry",opcPaymentMethodsRetry:"opcPaymentMethodsRetry"};const t={opc:{checkout:".one-page-checkout",form:"#opc-form",payButton:"#opc-pay-button",payAmount:"#opc-pay-amount",addressesSection:".js-opc-addresses-section",deliveryMethods:"#opc-delivery-methods",paymentMethods:"#opc-payment-methods",deliverySection:"#opc-delivery-address",deliveryFields:"#opc-delivery-address-fields",billingSection:"#opc-billing-section",billingFields:"#opc-billing-address-fields",deliveryList:"#opc-delivery-address-content-list",billingList:"#opc-billing-address-content-list",useSameAddress:'[name="use_same_address"]',checkoutFooter:".one-page-checkout__footer",contactSection:".js-opc-contact-section",addressRadio:".js-opc-address-radio",addressItem:".opc-address-item",addressLabel:".form-check-label"},templates:{carrierLoader:"#opc-template-loader",carrierError:"#opc-template-carriers-error",paymentLoader:"#opc-template-payment-loader",paymentError:"#opc-template-payment-error"},inputs:{deliveryOption:'input[name="delivery_option"]',paymentOption:'input[name="payment-option"]',email:'input[name="email"]',conditions:'.one-page-checkout input[name^="conditions_to_approve["][required]'},modals:{address:"#opc-address-modal, #modal-delivery, #modal-invoice"}};function o(e){return o="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},o(e)}function n(e,t){return null===(n=e)||"object"!==o(n)||Array.isArray(n)?{errors:{"":[t]}}:e;var n}function a(e,t){return n(e&&e.responseJSON,t)}function i(e){var t=window&&"object"===o(window.ps_onepagecheckout)&&window.ps_onepagecheckout?window.ps_onepagecheckout:null;return t&&t.urls&&t.urls[e]?String(t.urls[e]):""}!function(){var o=window.$||window.jQuery,r=window.prestashop||{};if(o){var d=t.opc.paymentMethods,p=e.opcPaymentMethodSelected,c="data-confirmed-payment-option-id",s="data-confirmed-payment-module",l="data-confirmed-payment-selection-key";o(document).on("change","".concat(d," ").concat(t.inputs.paymentOption),function(e){var t=o(e.currentTarget),c=String(t.val()||""),s=String(t.data("moduleName")||t.data("module-name")||""),l=String(t.data("selectionKey")||t.data("selection-key")||""),f=i("selectPayment"),S=o(d);f&&c&&s&&l?(m(S,c),o.post(f,{payment_option:c,payment_module:s,payment_selection_key:l}).done(function(e){if(!e||!1===e.success)return u(S),void r.emit("handleError",{eventType:"opcSelectPayment",resp:n(e,"Unable to select the payment method.")});y(S,c,s,l),r.emit(p,{paymentOptionId:c,paymentModule:s,paymentSelectionKey:l,resp:e})}).fail(function(e){u(S),r.emit("handleError",{eventType:"opcSelectPayment",resp:a(e,"Unable to select the payment method.")})})):r.emit("handleError",{eventType:"opcSelectPayment",resp:n(null,"Missing OPC payment selection payload.")})}),r.on(e.opcPaymentMethodsUpdated,function(e){var n=String(e&&e.selected_payment_selection_key||""),a=String(e&&e.selected_payment_module||""),i=o(d);if(n){var r=i.find("".concat(t.inputs.paymentOption,'[data-selection-key="').concat(n,'"]')).first();if(r.length){var p=String(r.val()||""),c=String(r.data("moduleName")||r.data("module-name")||"");return m(i,p),void y(i,p,c,n)}}if(a){var s=i.find("".concat(t.inputs.paymentOption,'[data-module-name="').concat(a,'"]')).first();if(s.length){var l=String(s.val()||"");m(i,l),y(i,l,a,String(s.data("selectionKey")||s.data("selection-key")||""))}else y(i,"","","")}})}function m(e,n){e.find(".js-additional-information, .js-payment-option-form").hide(),e.find(".js-payment-option-input").prop("disabled",!0),e.find(t.inputs.paymentOption).each(function(t,a){var i=o(a),r=String(i.val()||"")===n;i.prop("checked",r),r&&(e.find("#".concat(n,"-additional-information")).show(),e.find("#pay-with-".concat(n,"-form")).show(),e.find("#pay-with-".concat(n,"-form .js-payment-option-input")).prop("disabled",!1))})}function y(e,t,o,n){t?e.attr(c,t):e.removeAttr(c),o?e.attr(s,o):e.removeAttr(s),n?e.attr(l,n):e.removeAttr(l)}function u(e){var o=String(e.attr(c)||"");o?m(e,o):function(e){e.find(".js-additional-information, .js-payment-option-form").hide(),e.find(".js-payment-option-input").prop("disabled",!0),e.find(t.inputs.paymentOption).prop("checked",!1)}(e)}}()})();
\ No newline at end of file
+(()=>{"use strict";const e={opcCarrierSelected:"opcCarrierSelected",opcCarriersUpdated:"opcCarriersUpdated",opcCarriersFailed:"opcCarriersFailed",opcCarriersLoading:"opcCarriersLoading",opcPaymentMethodsLoading:"opcPaymentMethodsLoading",opcPaymentMethodsUpdated:"opcPaymentMethodsUpdated",opcPaymentMethodsRefreshed:"opcPaymentMethodsRefreshed",opcPaymentMethodsFailed:"opcPaymentMethodsFailed",opcPaymentMethodSelected:"opcPaymentMethodSelected",opcGuestInitSuccess:"opcGuestInitSuccess",opcFinalSubmitStarted:"opcFinalSubmitStarted",opcFormValidated:"opcFormValidated",opcBillingSectionToggled:"opcBillingSectionToggled",opcSubmitFailed:"opcSubmitFailed",opcDeliveryAddressUpdated:"opcDeliveryAddressUpdated",opcBillingAddressUpdated:"opcBillingAddressUpdated",opcDeliveryAddressSelected:"opcDeliveryAddressSelected",opcBillingAddressSelected:"opcBillingAddressSelected",opcCartSummaryBeforeUpdate:"opcCartSummaryBeforeUpdate",opcCartSummaryUpdated:"opcCartSummaryUpdated",updatedOpcAddressForm:"updatedOpcAddressForm",opcCarriersRetry:"opcCarriersRetry",opcPaymentMethodsRetry:"opcPaymentMethodsRetry"};const t={opc:{checkout:".one-page-checkout",form:"#opc-form",payButton:"#opc-pay-button",payAmount:"#opc-pay-amount",addressesSection:".js-opc-addresses-section",deliveryMethods:"#opc-delivery-methods",paymentMethods:"#opc-payment-methods",deliverySection:"#opc-delivery-address",deliveryFields:"#opc-delivery-address-fields",billingSection:"#opc-billing-section",billingFields:"#opc-billing-address-fields",deliveryList:"#opc-delivery-address-content-list",billingList:"#opc-billing-address-content-list",useSameAddress:'[name="use_same_address"]',checkoutFooter:".one-page-checkout__footer",contactSection:".js-opc-contact-section",addressRadio:".js-opc-address-radio",addressItem:".opc-address-item",addressLabel:".form-check-label"},templates:{carrierLoader:"#opc-template-loader",carrierError:"#opc-template-carriers-error",paymentError:"#opc-template-payment-error"},inputs:{deliveryOption:'input[name="delivery_option"]',paymentOption:'input[name="payment-option"]',email:'input[name="email"]',conditions:'.one-page-checkout input[name^="conditions_to_approve["][required]'},modals:{address:"#opc-address-modal, #modal-delivery, #modal-invoice"}};function o(e){return o="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},o(e)}function n(e,t){return null===(n=e)||"object"!==o(n)||Array.isArray(n)?{errors:{"":[t]}}:e;var n}function a(e,t){return n(e&&e.responseJSON,t)}function i(e){var t=window&&"object"===o(window.ps_onepagecheckout)&&window.ps_onepagecheckout?window.ps_onepagecheckout:null;return t&&t.urls&&t.urls[e]?String(t.urls[e]):""}!function(){var o=window.$||window.jQuery,d=window.prestashop||{};if(o){var r=t.opc.paymentMethods,c=e.opcPaymentMethodSelected,p="data-confirmed-payment-option-id",s="data-confirmed-payment-module",l="data-confirmed-payment-selection-key";o(document).on("change","".concat(r," ").concat(t.inputs.paymentOption),function(e){var t=o(e.currentTarget),p=String(t.val()||""),s=String(t.data("moduleName")||t.data("module-name")||""),l=String(t.data("selectionKey")||t.data("selection-key")||""),f=i("selectPayment"),h=o(r);f&&p&&s&&l?(m(h,p),o.post(f,{payment_option:p,payment_module:s,payment_selection_key:l}).done(function(e){if(!e||!1===e.success)return u(h),void d.emit("handleError",{eventType:"opcSelectPayment",resp:n(e,"Unable to select the payment method.")});y(h,p,s,l),d.emit(c,{paymentOptionId:p,paymentModule:s,paymentSelectionKey:l,resp:e})}).fail(function(e){u(h),d.emit("handleError",{eventType:"opcSelectPayment",resp:a(e,"Unable to select the payment method.")})})):d.emit("handleError",{eventType:"opcSelectPayment",resp:n(null,"Missing OPC payment selection payload.")})}),d.on(e.opcPaymentMethodsUpdated,function(e){var n=String(e&&e.selected_payment_selection_key||""),a=String(e&&e.selected_payment_module||""),i=o(r);if(n){var d=i.find("".concat(t.inputs.paymentOption,'[data-selection-key="').concat(n,'"]')).first();if(d.length){var c=String(d.val()||""),p=String(d.data("moduleName")||d.data("module-name")||"");return m(i,c),void y(i,c,p,n)}}if(a){var s=i.find("".concat(t.inputs.paymentOption,'[data-module-name="').concat(a,'"]')).first();if(s.length){var l=String(s.val()||"");m(i,l),y(i,l,a,String(s.data("selectionKey")||s.data("selection-key")||""))}else y(i,"","","")}})}function m(e,n){e.find(".js-additional-information, .js-payment-option-form").hide(),e.find(".js-payment-option-input").prop("disabled",!0),e.find(t.inputs.paymentOption).each(function(t,a){var i=o(a),d=String(i.val()||"")===n;i.prop("checked",d),d&&(e.find("#".concat(n,"-additional-information")).show(),e.find("#pay-with-".concat(n,"-form")).show(),e.find("#pay-with-".concat(n,"-form .js-payment-option-input")).prop("disabled",!1))})}function y(e,t,o,n){t?e.attr(p,t):e.removeAttr(p),o?e.attr(s,o):e.removeAttr(s),n?e.attr(l,n):e.removeAttr(l)}function u(e){var o=String(e.attr(p)||"");o?m(e,o):function(e){e.find(".js-additional-information, .js-payment-option-form").hide(),e.find(".js-payment-option-input").prop("disabled",!0),e.find(t.inputs.paymentOption).prop("checked",!1)}(e)}}()})();
\ No newline at end of file
diff --git a/views/public/opc-submit.bundle.js b/views/public/opc-submit.bundle.js
index c22d3ff..13767bc 100644
--- a/views/public/opc-submit.bundle.js
+++ b/views/public/opc-submit.bundle.js
@@ -1,2 +1,2 @@
 /*! For license information please see opc-submit.bundle.js.LICENSE.txt */
-(()=>{"use strict";const e={opcCarrierSelected:"opcCarrierSelected",opcCarriersUpdated:"opcCarriersUpdated",opcCarriersFailed:"opcCarriersFailed",opcCarriersLoading:"opcCarriersLoading",opcPaymentMethodsLoading:"opcPaymentMethodsLoading",opcPaymentMethodsUpdated:"opcPaymentMethodsUpdated",opcPaymentMethodsFailed:"opcPaymentMethodsFailed",opcPaymentMethodSelected:"opcPaymentMethodSelected",opcGuestInitSuccess:"opcGuestInitSuccess",opcFinalSubmitStarted:"opcFinalSubmitStarted",opcFormValidated:"opcFormValidated",opcBillingSectionToggled:"opcBillingSectionToggled",opcSubmitFailed:"opcSubmitFailed",opcDeliveryAddressUpdated:"opcDeliveryAddressUpdated",opcBillingAddressUpdated:"opcBillingAddressUpdated",opcDeliveryAddressSelected:"opcDeliveryAddressSelected",opcBillingAddressSelected:"opcBillingAddressSelected",opcCartSummaryBeforeUpdate:"opcCartSummaryBeforeUpdate",opcCartSummaryUpdated:"opcCartSummaryUpdated",updatedOpcAddressForm:"updatedOpcAddressForm",opcCarriersRetry:"opcCarriersRetry",opcPaymentMethodsRetry:"opcPaymentMethodsRetry"};const t={opc:{checkout:".one-page-checkout",form:"#opc-form",payButton:"#opc-pay-button",payAmount:"#opc-pay-amount",addressesSection:".js-opc-addresses-section",deliveryMethods:"#opc-delivery-methods",paymentMethods:"#opc-payment-methods",deliverySection:"#opc-delivery-address",deliveryFields:"#opc-delivery-address-fields",billingSection:"#opc-billing-section",billingFields:"#opc-billing-address-fields",deliveryList:"#opc-delivery-address-content-list",billingList:"#opc-billing-address-content-list",useSameAddress:'[name="use_same_address"]',checkoutFooter:".one-page-checkout__footer",contactSection:".js-opc-contact-section",addressRadio:".js-opc-address-radio",addressItem:".opc-address-item",addressLabel:".form-check-label"},templates:{carrierLoader:"#opc-template-loader",carrierError:"#opc-template-carriers-error",paymentLoader:"#opc-template-payment-loader",paymentError:"#opc-template-payment-error"},inputs:{deliveryOption:'input[name="delivery_option"]',paymentOption:'input[name="payment-option"]',email:'input[name="email"]',conditions:'.one-page-checkout input[name^="conditions_to_approve["][required]'},modals:{address:"#opc-address-modal, #modal-delivery, #modal-invoice"}};function n(e){return n="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},n(e)}function o(e,t){return null===(o=e)||"object"!==n(o)||Array.isArray(o)?{errors:{"":[t]}}:e;var o}function r(e){var t=window&&"object"===n(window.ps_onepagecheckout)&&window.ps_onepagecheckout?window.ps_onepagecheckout:null;return t&&t.urls&&t.urls[e]?String(t.urls[e]):""}function a(e){var o=window.prestashop||null,r=e&&"object"===n(e)&&(e.total&&e.total.value||e.total_including_tax&&e.total_including_tax.value)||"",a=(o&&o.selectors&&o.selectors.opc&&o.selectors.opc.payAmount?String(o.selectors.opc.payAmount):"")||t.opc.payAmount;if(r&&a){var i=document.querySelector(a);i instanceof HTMLElement&&(i.textContent=String(r))}}function i(){var e,t,n="function"==typeof Symbol?Symbol:{},o=n.iterator||"@@iterator",r=n.toStringTag||"@@toStringTag";function a(n,o,r,a){var i=o&&o.prototype instanceof l?o:l,d=Object.create(i.prototype);return c(d,"_invoke",function(n,o,r){var a,i,c,l=0,d=r||[],s=!1,p={p:0,n:0,v:e,a:f,f:f.bind(e,4),d:function(t,n){return a=t,i=0,c=e,p.n=n,u}};function f(n,o){for(i=n,c=o,t=0;!s&&l&&!r&&t<d.length;t++){var r,a=d[t],f=p.p,m=a[2];n>3?(r=m===o)&&(c=a[(i=a[4])?5:(i=3,3)],a[4]=a[5]=e):a[0]<=f&&((r=n<2&&f<a[1])?(i=0,p.v=o,p.n=a[1]):f<m&&(r=n<3||a[0]>o||o>m)&&(a[4]=n,a[5]=o,p.n=m,i=0))}if(r||n>1)return u;throw s=!0,o}return function(r,d,m){if(l>1)throw TypeError("Generator is already running");for(s&&1===d&&f(d,m),i=d,c=m;(t=i<2?e:c)||!s;){a||(i?i<3?(i>1&&(p.n=-1),f(i,c)):p.n=c:p.v=c);try{if(l=2,a){if(i||(r="next"),t=a[r]){if(!(t=t.call(a,c)))throw TypeError("iterator result is not an object");if(!t.done)return t;c=t.value,i<2&&(i=0)}else 1===i&&(t=a.return)&&t.call(a),i<2&&(c=TypeError("The iterator does not provide a '"+r+"' method"),i=1);a=e}else if((t=(s=p.n<0)?c:n.call(o,p))!==u)break}catch(t){a=e,i=1,c=t}finally{l=1}}return{value:t,done:s}}}(n,r,a),!0),d}var u={};function l(){}function d(){}function s(){}t=Object.getPrototypeOf;var p=[][o]?t(t([][o]())):(c(t={},o,function(){return this}),t),f=s.prototype=l.prototype=Object.create(p);function m(e){return Object.setPrototypeOf?Object.setPrototypeOf(e,s):(e.__proto__=s,c(e,r,"GeneratorFunction")),e.prototype=Object.create(f),e}return d.prototype=s,c(f,"constructor",s),c(s,"constructor",d),d.displayName="GeneratorFunction",c(s,r,"GeneratorFunction"),c(f),c(f,r,"Generator"),c(f,o,function(){return this}),c(f,"toString",function(){return"[object Generator]"}),(i=function(){return{w:a,m}})()}function c(e,t,n,o){var r=Object.defineProperty;try{r({},"",{})}catch(e){r=0}c=function(e,t,n,o){function a(t,n){c(e,t,function(e){return this._invoke(t,n,e)})}t?r?r(e,t,{value:n,enumerable:!o,configurable:!o,writable:!o}):e[t]=n:(a("next",0),a("throw",1),a("return",2))},c(e,t,n,o)}function u(e,t,n,o,r,a,i){try{var c=e[a](i),u=c.value}catch(e){return void n(e)}c.done?t(u):Promise.resolve(u).then(o,r)}function l(e){return function(){var t=this,n=arguments;return new Promise(function(o,r){var a=e.apply(t,n);function i(e){u(a,o,r,i,c,"next",e)}function c(e){u(a,o,r,i,c,"throw",e)}i(void 0)})}}function d(e,t){var n="undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(!n){if(Array.isArray(e)||(n=function(e,t){if(e){if("string"==typeof e)return s(e,t);var n={}.toString.call(e).slice(8,-1);return"Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n?Array.from(e):"Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)?s(e,t):void 0}}(e))||t&&e&&"number"==typeof e.length){n&&(e=n);var o=0,r=function(){};return{s:r,n:function(){return o>=e.length?{done:!0}:{done:!1,value:e[o++]}},e:function(e){throw e},f:r}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var a,i=!0,c=!1;return{s:function(){n=n.call(e)},n:function(){var e=n.next();return i=e.done,e},e:function(e){c=!0,a=e},f:function(){try{i||null==n.return||n.return()}finally{if(c)throw a}}}}function s(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,o=Array(t);n<t;n++)o[n]=e[n];return o}!function(){var n=window.$||window.jQuery,c=window.prestashop||null;if(n&&c&&"function"==typeof c.on){var u=t.opc.form,s=t.opc.checkout,p=t.opc.payButton,f=t.opc.billingSection,m=t.opc.paymentMethods,y=t.opc.deliveryMethods,h=t.opc.checkoutFooter,v=t.opc.useSameAddress,S=t.inputs.deliveryOption,b=t.inputs.paymentOption,g=t.inputs.conditions,M=null,w="idle",L=!1;n(document).ready(function(){var t=E(),n=T();t instanceof HTMLFormElement&&n instanceof HTMLButtonElement&&(c.on(e.opcFinalSubmitStarted,function(){L=!0}),W(),_(),C(),c.on(e.opcPaymentMethodsLoading,function(){w="loading",C()}),c.on(e.opcPaymentMethodsFailed,function(){w="failed",K(t),C()}),c.on(e.opcPaymentMethodsUpdated,function(){w="ready",K(t),C()}),c.on(e.opcDeliveryAddressUpdated,function(){_(),K(t),C()}),c.on(e.opcBillingAddressUpdated,function(){_(),K(t),C()}),c.on(e.opcCarriersUpdated,function(){K(t),C()}),c.on(e.opcCarriersFailed,function(){K(t),C()}),c.on("updatedCart",function(){var e=c.cart&&c.cart.totals;if(e)a(e);else{var t=r("cartTotals");t&&fetch(t,{credentials:"same-origin"}).then(function(e){return e.json()}).then(function(e){e&&e.success&&e.totals&&a(e.totals)}).catch(function(){})}}))})}function E(){return document.querySelector(u)||document.querySelector(s)}function T(){return document.querySelector(p)}function k(){return document.querySelector(h)||document}function H(){return Array.from(k().querySelectorAll('input[name^="conditions_to_approve"]'))}function A(e){if(!(e instanceof HTMLElement))return!1;var t=e.closest(".modal");if(t instanceof HTMLElement&&!t.classList.contains("show"))return!1;var n=e.closest(f);if(n instanceof HTMLElement&&"none"===window.getComputedStyle(n).display)return!1;var o=window.getComputedStyle(e);return"none"!==o.display&&"hidden"!==o.visibility&&e.getClientRects().length>0}function B(){var e=document.querySelector(m);return e instanceof HTMLElement?e:null}function F(){var e=document.querySelector(m);return!(e instanceof HTMLElement&&A(e))||"loading"!==w&&"failed"!==w}function C(){var t=E(),n=T();if(t instanceof HTMLFormElement&&n instanceof HTMLButtonElement){var o,r,a,i=Array.from(t.querySelectorAll("[required]")).filter(function(e){return!(e instanceof HTMLInputElement&&e.matches(g))}).every(function(e){return function(e){return!(e instanceof HTMLElement&&A(e))||(e instanceof HTMLInputElement?"checkbox"===e.type?e.checked:"radio"===e.type?e.name?Boolean(document.querySelector('input[type="radio"][name="'.concat(e.name,'"]:checked'))):e.checked:Boolean(e.value.trim()):!(e instanceof HTMLSelectElement||e instanceof HTMLTextAreaElement)||Boolean(String(e.value||"").trim()))}(e)}),u=H().every(function(e){return!(e instanceof HTMLInputElement&&e.required)||("checkbox"===e.type?e.checked:Boolean(String(e.value||"").trim()))}),l=i&&u&&(r=document.querySelector(y),a=document.querySelectorAll(S),!(r instanceof HTMLElement&&A(r))||0!==a.length&&Boolean(r.querySelector("".concat(S,":checked"))))&&F()&&(!((o=B())instanceof HTMLElement&&A(o))||0!==o.querySelectorAll(b).length&&Boolean(o.querySelector("".concat(b,":checked"))));n.disabled=!l,c.emit(e.opcFormValidated,{isValid:l})}}function _(){var t=document.querySelector(v),n=document.querySelector(f);t instanceof HTMLInputElement&&n instanceof HTMLElement&&(M&&t.removeEventListener("change",M),M=function(){var o=!t.checked;n.style.display=o?"":"none",c.emit(e.opcBillingSectionToggled,{visible:o}),C()},t.addEventListener("change",M))}function q(e){var t=B();if(!(t instanceof HTMLElement&&A(t)))return{isValid:!0,paymentRadio:null};var n=t.querySelectorAll(b);if(0===n.length)return{isValid:!0,paymentRadio:null};var o=function(e){return e.querySelector("".concat(b,":checked"))||document.querySelector("".concat(m," ").concat(b,":checked"))||document.querySelector("".concat(b,":checked"))}(e);if(o instanceof HTMLInputElement)return{isValid:!0,paymentRadio:o};t.scrollIntoView({block:"center",behavior:"smooth"});var r=n[0];return r instanceof HTMLInputElement&&r.focus(),{isValid:!1,paymentRadio:null}}function j(){return n.post("".concat(window.prestashop.urls.pages.order),{ajax:1,action:"checkCartStillOrderable"})}function P(t){c.emit("handleError",{eventType:"opcSubmit",resp:t}),c.emit(e.opcSubmitFailed,{resp:t})}function O(e){P(o(null,e))}function I(t){var n=t.id,o=document.querySelector("#pay-with-".concat(n,"-form")),r=o?o.querySelector("form"):null;c.emit(e.opcFinalSubmitStarted),r instanceof HTMLFormElement?HTMLFormElement.prototype.submit.call(r):O("Missing rendered payment form for the selected option.")}function U(e,t){var n=new FormData(e);if(function(e){H().forEach(function(t){t instanceof HTMLInputElement&&t.name&&("checkbox"!==t.type?""!==String(t.value||"").trim()&&e.set(t.name,t.value):t.checked&&e.set(t.name,t.value))})}(n),!n.has("static_token")){var o,r,a=(null===(o=window.prestashop)||void 0===o?void 0:o.static_token)||(null===(r=window.prestashop)||void 0===r?void 0:r.token)||"";""!==a&&n.set("static_token",a)}return t instanceof HTMLInputElement&&t.dataset.moduleName&&n.set("paymentMethod",t.dataset.moduleName),n}function V(e){return function(e){return!!e.checkValidity()||(e.reportValidity(),!1)}(e)&&function(){var e,t=d(H());try{for(t.s();!(e=t.n()).done;){var n=e.value;if(n instanceof HTMLInputElement&&n.required&&!n.checkValidity())return n.reportValidity(),!1}}catch(e){t.e(e)}finally{t.f()}return!0}()?F()?q(e):(C(),{isValid:!1,paymentRadio:null}):{isValid:!1,paymentRadio:null}}function R(){var e=r("opcSubmit");return e||(O("Missing OPC submit URL."),"")}function x(e,t){return D.apply(this,arguments)}function D(){return(D=l(i().m(function e(t,n){var o;return i().w(function(e){for(;;)switch(e.n){case 0:return e.n=1,fetch(t,{method:"POST",credentials:"same-origin",headers:{Accept:"application/json"},body:n});case 1:return o=e.v,e.a(2,o.json().catch(function(){return{}}))}},e)}))).apply(this,arguments)}function G(e){return e&&e.reload?(window.location.href=e.checkout_url||window.location.href,!0):(P(e),!0)}function N(e,t){return $.apply(this,arguments)}function $(){return($=l(i().m(function e(t,n){var o,r,a;return i().w(function(e){for(;;)switch(e.n){case 0:return e.n=1,j();case 1:if(r=e.v,"function"!=typeof(a=null===(o=c.checkout)||void 0===o?void 0:o.onCheckOrderableCartResponse)){e.n=3;break}if(!a(r,{})){e.n=2;break}return e.a(2);case 2:e.n=4;break;case 3:if(!r||!0!==r.errors||!r.cartUrl){e.n=4;break}return window.location.href=r.cartUrl,e.a(2);case 4:if(!(n instanceof HTMLInputElement)){e.n=5;break}return I(n),e.a(2);case 5:window.location.href=t.checkout_url||window.prestashop.urls.pages.order;case 6:return e.a(2)}},e)}))).apply(this,arguments)}function Q(e){return z.apply(this,arguments)}function z(){return(z=l(i().m(function t(n){var o,r,a,u,l,d;return i().w(function(t){for(;;)switch(t.p=t.n){case 0:if(!L){t.n=1;break}return t.a(2);case 1:if((o=V(n)).isValid){t.n=2;break}return t.a(2);case 2:if(r=R()){t.n=3;break}return t.a(2);case 3:return a=T(),u=U(n,o.paymentRadio),L=!0,a instanceof HTMLButtonElement&&(a.disabled=!0),t.p=4,t.n=5,x(r,u);case 5:if((l=t.v)&&!0===l.success){t.n=6;break}return G(l),t.a(2);case 6:return t.n=7,N(l,o.paymentRadio);case 7:t.n=9;break;case 8:t.p=8,d=t.v,c.emit("handleError",{eventType:"opcSubmit",resp:{}}),c.emit(e.opcSubmitFailed,{error:d});case 9:return t.p=9,L=!1,C(),t.f(9);case 10:return t.a(2)}},t,null,[[4,8,9,10]])}))).apply(this,arguments)}function J(e,t,n){(e instanceof HTMLElement||e instanceof HTMLFormElement)&&e.querySelectorAll(t).forEach(function(e){(e instanceof HTMLInputElement||e instanceof HTMLSelectElement||e instanceof HTMLTextAreaElement)&&"1"!==e.dataset[n]&&(e.addEventListener("change",C),e.dataset[n]="1")})}function K(e){J(e,S,"opcDeliveryValidationBound");var t=B();t instanceof HTMLElement&&J(t,b,"opcPaymentValidationBound");var n=k();(n instanceof HTMLElement||n instanceof Document)&&J(n instanceof Document?n.documentElement:n,'input[name^="conditions_to_approve"]',"opcConditionsValidationBound")}function W(){var e=E(),t=T();e instanceof HTMLFormElement&&t instanceof HTMLButtonElement&&(!function(e,t){e.dataset.opcSubmitInputBound||(e.addEventListener("input",C),e.dataset.opcSubmitInputBound="1"),e.dataset.opcSubmitChangeBound||(e.addEventListener("change",C),e.dataset.opcSubmitChangeBound="1"),e.dataset.opcSubmitHandlerBound||(e.addEventListener("submit",function(t){t.preventDefault(),Q(e)}),e.dataset.opcSubmitHandlerBound="1"),t.dataset.opcSubmitHandlerBound||(t.addEventListener("click",function(n){n.preventDefault(),L||t.disabled||Q(e)}),t.dataset.opcSubmitHandlerBound="1")}(e,t),K(e))}}()})();
\ No newline at end of file
+(()=>{"use strict";const e={opcCarrierSelected:"opcCarrierSelected",opcCarriersUpdated:"opcCarriersUpdated",opcCarriersFailed:"opcCarriersFailed",opcCarriersLoading:"opcCarriersLoading",opcPaymentMethodsLoading:"opcPaymentMethodsLoading",opcPaymentMethodsUpdated:"opcPaymentMethodsUpdated",opcPaymentMethodsRefreshed:"opcPaymentMethodsRefreshed",opcPaymentMethodsFailed:"opcPaymentMethodsFailed",opcPaymentMethodSelected:"opcPaymentMethodSelected",opcGuestInitSuccess:"opcGuestInitSuccess",opcFinalSubmitStarted:"opcFinalSubmitStarted",opcFormValidated:"opcFormValidated",opcBillingSectionToggled:"opcBillingSectionToggled",opcSubmitFailed:"opcSubmitFailed",opcDeliveryAddressUpdated:"opcDeliveryAddressUpdated",opcBillingAddressUpdated:"opcBillingAddressUpdated",opcDeliveryAddressSelected:"opcDeliveryAddressSelected",opcBillingAddressSelected:"opcBillingAddressSelected",opcCartSummaryBeforeUpdate:"opcCartSummaryBeforeUpdate",opcCartSummaryUpdated:"opcCartSummaryUpdated",updatedOpcAddressForm:"updatedOpcAddressForm",opcCarriersRetry:"opcCarriersRetry",opcPaymentMethodsRetry:"opcPaymentMethodsRetry"};const t={opc:{checkout:".one-page-checkout",form:"#opc-form",payButton:"#opc-pay-button",payAmount:"#opc-pay-amount",addressesSection:".js-opc-addresses-section",deliveryMethods:"#opc-delivery-methods",paymentMethods:"#opc-payment-methods",deliverySection:"#opc-delivery-address",deliveryFields:"#opc-delivery-address-fields",billingSection:"#opc-billing-section",billingFields:"#opc-billing-address-fields",deliveryList:"#opc-delivery-address-content-list",billingList:"#opc-billing-address-content-list",useSameAddress:'[name="use_same_address"]',checkoutFooter:".one-page-checkout__footer",contactSection:".js-opc-contact-section",addressRadio:".js-opc-address-radio",addressItem:".opc-address-item",addressLabel:".form-check-label"},templates:{carrierLoader:"#opc-template-loader",carrierError:"#opc-template-carriers-error",paymentError:"#opc-template-payment-error"},inputs:{deliveryOption:'input[name="delivery_option"]',paymentOption:'input[name="payment-option"]',email:'input[name="email"]',conditions:'.one-page-checkout input[name^="conditions_to_approve["][required]'},modals:{address:"#opc-address-modal, #modal-delivery, #modal-invoice"}};function n(e){return n="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},n(e)}function o(e,t){return null===(o=e)||"object"!==n(o)||Array.isArray(o)?{errors:{"":[t]}}:e;var o}function r(e){var t=window&&"object"===n(window.ps_onepagecheckout)&&window.ps_onepagecheckout?window.ps_onepagecheckout:null;return t&&t.urls&&t.urls[e]?String(t.urls[e]):""}function a(e){var o=window.prestashop||null,r=e&&"object"===n(e)&&(e.total&&e.total.value||e.total_including_tax&&e.total_including_tax.value)||"",a=(o&&o.selectors&&o.selectors.opc&&o.selectors.opc.payAmount?String(o.selectors.opc.payAmount):"")||t.opc.payAmount;if(r&&a){var i=document.querySelector(a);i instanceof HTMLElement&&(i.textContent=String(r))}}function i(){var e,t,n="function"==typeof Symbol?Symbol:{},o=n.iterator||"@@iterator",r=n.toStringTag||"@@toStringTag";function a(n,o,r,a){var i=o&&o.prototype instanceof l?o:l,s=Object.create(i.prototype);return c(s,"_invoke",function(n,o,r){var a,i,c,l=0,s=r||[],d=!1,p={p:0,n:0,v:e,a:f,f:f.bind(e,4),d:function(t,n){return a=t,i=0,c=e,p.n=n,u}};function f(n,o){for(i=n,c=o,t=0;!d&&l&&!r&&t<s.length;t++){var r,a=s[t],f=p.p,m=a[2];n>3?(r=m===o)&&(c=a[(i=a[4])?5:(i=3,3)],a[4]=a[5]=e):a[0]<=f&&((r=n<2&&f<a[1])?(i=0,p.v=o,p.n=a[1]):f<m&&(r=n<3||a[0]>o||o>m)&&(a[4]=n,a[5]=o,p.n=m,i=0))}if(r||n>1)return u;throw d=!0,o}return function(r,s,m){if(l>1)throw TypeError("Generator is already running");for(d&&1===s&&f(s,m),i=s,c=m;(t=i<2?e:c)||!d;){a||(i?i<3?(i>1&&(p.n=-1),f(i,c)):p.n=c:p.v=c);try{if(l=2,a){if(i||(r="next"),t=a[r]){if(!(t=t.call(a,c)))throw TypeError("iterator result is not an object");if(!t.done)return t;c=t.value,i<2&&(i=0)}else 1===i&&(t=a.return)&&t.call(a),i<2&&(c=TypeError("The iterator does not provide a '"+r+"' method"),i=1);a=e}else if((t=(d=p.n<0)?c:n.call(o,p))!==u)break}catch(t){a=e,i=1,c=t}finally{l=1}}return{value:t,done:d}}}(n,r,a),!0),s}var u={};function l(){}function s(){}function d(){}t=Object.getPrototypeOf;var p=[][o]?t(t([][o]())):(c(t={},o,function(){return this}),t),f=d.prototype=l.prototype=Object.create(p);function m(e){return Object.setPrototypeOf?Object.setPrototypeOf(e,d):(e.__proto__=d,c(e,r,"GeneratorFunction")),e.prototype=Object.create(f),e}return s.prototype=d,c(f,"constructor",d),c(d,"constructor",s),s.displayName="GeneratorFunction",c(d,r,"GeneratorFunction"),c(f),c(f,r,"Generator"),c(f,o,function(){return this}),c(f,"toString",function(){return"[object Generator]"}),(i=function(){return{w:a,m}})()}function c(e,t,n,o){var r=Object.defineProperty;try{r({},"",{})}catch(e){r=0}c=function(e,t,n,o){function a(t,n){c(e,t,function(e){return this._invoke(t,n,e)})}t?r?r(e,t,{value:n,enumerable:!o,configurable:!o,writable:!o}):e[t]=n:(a("next",0),a("throw",1),a("return",2))},c(e,t,n,o)}function u(e,t,n,o,r,a,i){try{var c=e[a](i),u=c.value}catch(e){return void n(e)}c.done?t(u):Promise.resolve(u).then(o,r)}function l(e){return function(){var t=this,n=arguments;return new Promise(function(o,r){var a=e.apply(t,n);function i(e){u(a,o,r,i,c,"next",e)}function c(e){u(a,o,r,i,c,"throw",e)}i(void 0)})}}function s(e,t){var n="undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(!n){if(Array.isArray(e)||(n=function(e,t){if(e){if("string"==typeof e)return d(e,t);var n={}.toString.call(e).slice(8,-1);return"Object"===n&&e.constructor&&(n=e.constructor.name),"Map"===n||"Set"===n?Array.from(e):"Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)?d(e,t):void 0}}(e))||t&&e&&"number"==typeof e.length){n&&(e=n);var o=0,r=function(){};return{s:r,n:function(){return o>=e.length?{done:!0}:{done:!1,value:e[o++]}},e:function(e){throw e},f:r}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var a,i=!0,c=!1;return{s:function(){n=n.call(e)},n:function(){var e=n.next();return i=e.done,e},e:function(e){c=!0,a=e},f:function(){try{i||null==n.return||n.return()}finally{if(c)throw a}}}}function d(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,o=Array(t);n<t;n++)o[n]=e[n];return o}!function(){var n=window.$||window.jQuery,c=window.prestashop||null;if(n&&c&&"function"==typeof c.on){var u=t.opc.form,d=t.opc.checkout,p=t.opc.payButton,f=t.opc.billingSection,m=t.opc.paymentMethods,y=t.opc.deliveryMethods,h=t.opc.checkoutFooter,v=t.opc.useSameAddress,S=t.inputs.deliveryOption,b=t.inputs.paymentOption,g=t.inputs.conditions,M=null,w="idle",E=!1;n(document).ready(function(){var t=L(),n=T();t instanceof HTMLFormElement&&n instanceof HTMLButtonElement&&(c.on(e.opcFinalSubmitStarted,function(){E=!0}),X(),_(),C(),window.ps_onepagecheckout.submitBeforePayment=function(){var e=L();return e instanceof HTMLFormElement?function(e){return Q.apply(this,arguments)}(e):Promise.reject(new Error("OPC form not found."))},c.on(e.opcPaymentMethodsLoading,function(){w="loading",C()}),c.on(e.opcPaymentMethodsFailed,function(){w="failed",W(t),C()}),c.on(e.opcPaymentMethodsUpdated,function(){w="ready",W(t),C()}),c.on(e.opcPaymentMethodsRefreshed,function(){w="ready",W(t),C()}),c.on(e.opcDeliveryAddressUpdated,function(){_(),W(t),C()}),c.on(e.opcBillingAddressUpdated,function(){_(),W(t),C()}),c.on(e.opcCarriersUpdated,function(){W(t),C()}),c.on(e.opcCarriersFailed,function(){W(t),C()}),c.on("updatedCart",function(){var e=c.cart&&c.cart.totals;if(e)a(e);else{var t=r("cartTotals");t&&fetch(t,{credentials:"same-origin"}).then(function(e){return e.json()}).then(function(e){e&&e.success&&e.totals&&a(e.totals)}).catch(function(){})}}))})}function L(){return document.querySelector(u)||document.querySelector(d)}function T(){return document.querySelector(p)}function k(){return document.querySelector(h)||document}function H(){return Array.from(k().querySelectorAll('input[name^="conditions_to_approve"]'))}function A(e){if(!(e instanceof HTMLElement))return!1;var t=e.closest(".modal");if(t instanceof HTMLElement&&!t.classList.contains("show"))return!1;var n=e.closest(f);if(n instanceof HTMLElement&&"none"===window.getComputedStyle(n).display)return!1;var o=window.getComputedStyle(e);return"none"!==o.display&&"hidden"!==o.visibility&&e.getClientRects().length>0}function B(){var e=document.querySelector(m);return e instanceof HTMLElement?e:null}function F(){var e=document.querySelector(m);return!(e instanceof HTMLElement&&A(e))||"loading"!==w&&"failed"!==w}function C(){var t=L(),n=T();if(t instanceof HTMLFormElement&&n instanceof HTMLButtonElement){var o,r,a,i=Array.from(t.querySelectorAll("[required]")).filter(function(e){return!(e instanceof HTMLInputElement&&e.matches(g))}).every(function(e){return function(e){return!(e instanceof HTMLElement&&A(e))||(e instanceof HTMLInputElement?"checkbox"===e.type?e.checked:"radio"===e.type?e.name?Boolean(document.querySelector('input[type="radio"][name="'.concat(e.name,'"]:checked'))):e.checked:Boolean(e.value.trim()):!(e instanceof HTMLSelectElement||e instanceof HTMLTextAreaElement)||Boolean(String(e.value||"").trim()))}(e)}),u=H().every(function(e){return!(e instanceof HTMLInputElement&&e.required)||("checkbox"===e.type?e.checked:Boolean(String(e.value||"").trim()))}),l=i&&u&&(r=document.querySelector(y),a=document.querySelectorAll(S),!(r instanceof HTMLElement&&A(r))||0!==a.length&&Boolean(r.querySelector("".concat(S,":checked"))))&&F()&&(!((o=B())instanceof HTMLElement&&A(o))||0!==o.querySelectorAll(b).length&&Boolean(o.querySelector("".concat(b,":checked"))));n.disabled=!l,c.emit(e.opcFormValidated,{isValid:l})}}function _(){var t=document.querySelector(v),n=document.querySelector(f);t instanceof HTMLInputElement&&n instanceof HTMLElement&&(M&&t.removeEventListener("change",M),M=function(){var o=!t.checked;n.style.display=o?"":"none",c.emit(e.opcBillingSectionToggled,{visible:o}),C()},t.addEventListener("change",M))}function P(e){var t=B();if(!(t instanceof HTMLElement&&A(t)))return{isValid:!0,paymentRadio:null};var n=t.querySelectorAll(b);if(0===n.length)return{isValid:!0,paymentRadio:null};var o=function(e){return e.querySelector("".concat(b,":checked"))||document.querySelector("".concat(m," ").concat(b,":checked"))||document.querySelector("".concat(b,":checked"))}(e);if(o instanceof HTMLInputElement)return{isValid:!0,paymentRadio:o};t.scrollIntoView({block:"center",behavior:"smooth"});var r=n[0];return r instanceof HTMLInputElement&&r.focus(),{isValid:!1,paymentRadio:null}}function q(){return n.post("".concat(window.prestashop.urls.pages.order),{ajax:1,action:"checkCartStillOrderable"})}function j(t){c.emit("handleError",{eventType:"opcSubmit",resp:t}),c.emit(e.opcSubmitFailed,{resp:t})}function O(e){j(o(null,e))}function I(t){var n=t.id,o=document.querySelector("#pay-with-".concat(n,"-form")),r=o?o.querySelector("form"):null;c.emit(e.opcFinalSubmitStarted),r instanceof HTMLFormElement?HTMLFormElement.prototype.submit.call(r):O("Missing rendered payment form for the selected option.")}function R(e,t){var n=new FormData(e);if(function(e){H().forEach(function(t){t instanceof HTMLInputElement&&t.name&&("checkbox"!==t.type?""!==String(t.value||"").trim()&&e.set(t.name,t.value):t.checked&&e.set(t.name,t.value))})}(n),!n.has("static_token")){var o,r,a=(null===(o=window.prestashop)||void 0===o?void 0:o.static_token)||(null===(r=window.prestashop)||void 0===r?void 0:r.token)||"";""!==a&&n.set("static_token",a)}return t instanceof HTMLInputElement&&t.dataset.moduleName&&n.set("paymentMethod",t.dataset.moduleName),n}function U(e){return function(e){return!!e.checkValidity()||(e.reportValidity(),!1)}(e)&&function(){var e,t=s(H());try{for(t.s();!(e=t.n()).done;){var n=e.value;if(n instanceof HTMLInputElement&&n.required&&!n.checkValidity())return n.reportValidity(),!1}}catch(e){t.e(e)}finally{t.f()}return!0}()?F()?P(e):(C(),{isValid:!1,paymentRadio:null}):{isValid:!1,paymentRadio:null}}function V(){var e=r("opcSubmit");return e||(O("Missing OPC submit URL."),"")}function x(e,t){return D.apply(this,arguments)}function D(){return(D=l(i().m(function e(t,n){var o;return i().w(function(e){for(;;)switch(e.n){case 0:return e.n=1,fetch(t,{method:"POST",credentials:"same-origin",headers:{Accept:"application/json"},body:n});case 1:return o=e.v,e.a(2,o.json().catch(function(){return{}}))}},e)}))).apply(this,arguments)}function G(e){return e&&e.reload?(window.location.href=e.checkout_url||window.location.href,!0):(j(e),!0)}function N(e,t){return $.apply(this,arguments)}function $(){return($=l(i().m(function e(t,n){var o,r,a;return i().w(function(e){for(;;)switch(e.n){case 0:return e.n=1,q();case 1:if(r=e.v,"function"!=typeof(a=null===(o=c.checkout)||void 0===o?void 0:o.onCheckOrderableCartResponse)){e.n=3;break}if(!a(r,{})){e.n=2;break}return e.a(2);case 2:e.n=4;break;case 3:if(!r||!0!==r.errors||!r.cartUrl){e.n=4;break}return window.location.href=r.cartUrl,e.a(2);case 4:if(!(n instanceof HTMLInputElement)){e.n=5;break}return I(n),e.a(2);case 5:window.location.href=t.checkout_url||window.prestashop.urls.pages.order;case 6:return e.a(2)}},e)}))).apply(this,arguments)}function Q(){return(Q=l(i().m(function t(n){var o,r,a,u,l,s;return i().w(function(t){for(;;)switch(t.p=t.n){case 0:if(!E){t.n=1;break}return t.a(2);case 1:if((o=U(n)).isValid){t.n=2;break}return t.a(2);case 2:if(r=V()){t.n=3;break}return t.a(2);case 3:return a=T(),u=R(n,o.paymentRadio),E=!0,a instanceof HTMLButtonElement&&(a.disabled=!0),t.p=4,t.n=5,x(r,u);case 5:(l=t.v)&&!0===l.success||G(l),t.n=7;break;case 6:t.p=6,s=t.v,c.emit("handleError",{eventType:"opcSubmit",resp:{}}),c.emit(e.opcSubmitFailed,{error:s});case 7:return t.p=7,E=!1,C(),t.f(7);case 8:return t.a(2)}},t,null,[[4,6,7,8]])}))).apply(this,arguments)}function z(e){return J.apply(this,arguments)}function J(){return(J=l(i().m(function t(n){var o,r,a,u,l,s;return i().w(function(t){for(;;)switch(t.p=t.n){case 0:if(!E){t.n=1;break}return t.a(2);case 1:if((o=U(n)).isValid){t.n=2;break}return t.a(2);case 2:if(r=V()){t.n=3;break}return t.a(2);case 3:return a=T(),u=R(n,o.paymentRadio),E=!0,a instanceof HTMLButtonElement&&(a.disabled=!0),t.p=4,t.n=5,x(r,u);case 5:if((l=t.v)&&!0===l.success){t.n=6;break}return G(l),t.a(2);case 6:return t.n=7,N(l,o.paymentRadio);case 7:t.n=9;break;case 8:t.p=8,s=t.v,c.emit("handleError",{eventType:"opcSubmit",resp:{}}),c.emit(e.opcSubmitFailed,{error:s});case 9:return t.p=9,E=!1,C(),t.f(9);case 10:return t.a(2)}},t,null,[[4,8,9,10]])}))).apply(this,arguments)}function K(e,t,n){(e instanceof HTMLElement||e instanceof HTMLFormElement)&&e.querySelectorAll(t).forEach(function(e){(e instanceof HTMLInputElement||e instanceof HTMLSelectElement||e instanceof HTMLTextAreaElement)&&"1"!==e.dataset[n]&&(e.addEventListener("change",C),e.dataset[n]="1")})}function W(e){K(e,S,"opcDeliveryValidationBound");var t=B();t instanceof HTMLElement&&K(t,b,"opcPaymentValidationBound");var n=k();(n instanceof HTMLElement||n instanceof Document)&&K(n instanceof Document?n.documentElement:n,'input[name^="conditions_to_approve"]',"opcConditionsValidationBound")}function X(){var e=L(),t=T();e instanceof HTMLFormElement&&t instanceof HTMLButtonElement&&(!function(e,t){e.dataset.opcSubmitInputBound||(e.addEventListener("input",C),e.dataset.opcSubmitInputBound="1"),e.dataset.opcSubmitChangeBound||(e.addEventListener("change",C),e.dataset.opcSubmitChangeBound="1"),e.dataset.opcSubmitHandlerBound||(e.addEventListener("submit",function(t){t.preventDefault(),z(e)}),e.dataset.opcSubmitHandlerBound="1"),t.dataset.opcSubmitHandlerBound||(t.addEventListener("click",function(n){n.preventDefault(),n.stopPropagation(),E||t.disabled||z(e)}),t.dataset.opcSubmitHandlerBound="1")}(e,t),W(e))}}()})();
\ No newline at end of file
diff --git a/views/scss/_opc-form-fields-row.scss b/views/scss/_opc-form-fields-row.scss
new file mode 100644
index 0000000..5f501d6
--- /dev/null
+++ b/views/scss/_opc-form-fields-row.scss
@@ -0,0 +1,18 @@
+/**
+ * For the full copyright and license information, please view the
+ * LICENSE.md file that was distributed with this source code.
+ */
+.opc-form-fields-row {
+  display: grid;
+  gap: 1rem;
+
+  @include media-breakpoint-up(md) {
+    &--2 {
+      grid-template-columns: 1fr 1fr;
+    }
+
+    &--3 {
+      grid-template-columns: 1fr 1fr 1fr;
+    }
+  }
+}
diff --git a/views/scss/one-page-checkout.scss b/views/scss/one-page-checkout.scss
index 66ac857..a278128 100644
--- a/views/scss/one-page-checkout.scss
+++ b/views/scss/one-page-checkout.scss
@@ -12,6 +12,8 @@
 
 $component-name: one-page-checkout;
 
+@import "opc-form-fields-row";
+
 .#{$component-name} {
   @include media-breakpoint-up(lg) {
     padding-right: 2em;
@@ -53,3 +55,7 @@ $component-name: one-page-checkout;
     cursor: pointer;
   }
 }
+
+.opc-payment-methods-wrapper {
+  min-height: 6rem;
+}
diff --git a/views/templates/front/_partials/form-fields-row.tpl b/views/templates/front/_partials/form-fields-row.tpl
new file mode 100644
index 0000000..81c6167
--- /dev/null
+++ b/views/templates/front/_partials/form-fields-row.tpl
@@ -0,0 +1,25 @@
+{**
+ * For the full copyright and license information, please view the
+ * LICENSE.md file that was distributed with this source code.
+ *}
+
+{**
+ * Multi-column form field row
+ *
+ * Renders an explicit set of form fields side by side on desktop, stacked on
+ * mobile. The grid column count is derived from the number of fields passed.
+ *
+ * This partial is intentionally "dumb": it only handles layout. The caller is
+ * responsible for deciding which fields belong together in the same row and for
+ * ensuring all passed fields actually exist before including this template.
+ *
+ *
+ * @param array $fields - Explicit list of form field objects to render in a row
+ *                        (2 or 3 items — matches CSS modifiers --2 and --3)
+ *}
+
+<div class="opc-form-fields-row opc-form-fields-row--{$fields|count}">
+    {foreach from=$fields item="field"}
+        {form_field field=$field}
+    {/foreach}
+</div>
diff --git a/views/templates/front/checkout/_partials/one-page-checkout/address-fields.tpl b/views/templates/front/checkout/_partials/one-page-checkout/address-fields.tpl
index c0acf6e..2e4dab0 100644
--- a/views/templates/front/checkout/_partials/one-page-checkout/address-fields.tpl
+++ b/views/templates/front/checkout/_partials/one-page-checkout/address-fields.tpl
@@ -32,18 +32,18 @@
     {form_field field=$field}
 
   {elseif $_base === 'firstname' && $_has_name_row}
-    {include file='_partials/form-fields-row.tpl'
+    {include file='module:ps_onepagecheckout/views/templates/front/_partials/form-fields-row.tpl'
       fields=[$formFields[$_key_firstname], $formFields[$_key_lastname]]
     }
 
   {elseif $_base === 'lastname' && $_has_name_row}
   {elseif $_base === 'city' && $_has_city_row}
     {if $_has_state}
-      {include file='_partials/form-fields-row.tpl'
+      {include file='module:ps_onepagecheckout/views/templates/front/_partials/form-fields-row.tpl'
         fields=[$formFields[$_key_city], $formFields[$_key_id_state], $formFields[$_key_postcode]]
       }
     {else}
-      {include file='_partials/form-fields-row.tpl'
+      {include file='module:ps_onepagecheckout/views/templates/front/_partials/form-fields-row.tpl'
         fields=[$formFields[$_key_city], $formFields[$_key_postcode]]
       }
     {/if}
diff --git a/views/templates/front/checkout/_partials/one-page-checkout/address-list.tpl b/views/templates/front/checkout/_partials/one-page-checkout/address-list.tpl
index 5d32dc5..88489eb 100644
--- a/views/templates/front/checkout/_partials/one-page-checkout/address-list.tpl
+++ b/views/templates/front/checkout/_partials/one-page-checkout/address-list.tpl
@@ -76,6 +76,7 @@
                 data-id_state="{$address.id_state}"
                 data-id_country="{$address.id_country}"
                 data-phone="{$address.phone|escape:'html':'UTF-8'}"
+                data-address="{$address|@json_encode|escape:'htmlall':'UTF-8'}"
               >
                 {l s='Edit' d='Shop.Theme.Actions'}
               </button>
diff --git a/views/templates/front/checkout/_partials/one-page-checkout/address-modal.tpl b/views/templates/front/checkout/_partials/one-page-checkout/address-modal.tpl
index f1ed7cb..a71ce65 100644
--- a/views/templates/front/checkout/_partials/one-page-checkout/address-modal.tpl
+++ b/views/templates/front/checkout/_partials/one-page-checkout/address-modal.tpl
@@ -60,7 +60,7 @@
           {if isset($formFields[$_key_alias])}{form_field field=$formFields[$_key_alias]}{/if}
 
           {if isset($formFields[$_key_firstname]) && isset($formFields[$_key_lastname])}
-            {include file='_partials/form-fields-row.tpl' fields=[$formFields[$_key_firstname], $formFields[$_key_lastname]]}
+            {include file='module:ps_onepagecheckout/views/templates/front/_partials/form-fields-row.tpl' fields=[$formFields[$_key_firstname], $formFields[$_key_lastname]]}
           {/if}
 
           {if isset($formFields[$_key_company])}{form_field field=$formFields[$_key_company]}{/if}
@@ -71,7 +71,7 @@
 
           {if isset($formFields[$_key_address2])}{form_field field=$formFields[$_key_address2]}{/if}
 
-          <div class="form-fields-row form-fields-row--2 address-country-row">
+          <div class="opc-form-fields-row opc-form-fields-row--2 address-country-row">
             {if isset($formFields[$_key_city])}{form_field field=$formFields[$_key_city]}{/if}
             <div class="form-group mb-3 state-field-wrapper" style="{if !isset($formFields[$_key_id_state]) || empty($formFields[$_key_id_state].availableValues)}display: none;{/if}">
               <label class="form-label{if isset($formFields[$_key_id_state]) && $formFields[$_key_id_state].required} required{/if}" for="{$modal_id}-field-id_state">
@@ -95,6 +95,20 @@
           </div>
 
           {if isset($formFields[$_key_phone])}{form_field field=$formFields[$_key_phone]}{/if}
+
+          {* Render any additional fields not covered above (phone_mobile, dni, other, hook fields) *}
+          {assign var="_static_fields" value=['alias', 'id_country', 'firstname', 'lastname', 'company', 'vat_number', 'address1', 'address2', 'city', 'postcode', 'id_state', 'phone']}
+          {foreach from=$formFields item="field" key="fieldKey"}
+            {if $prefix && strpos($field.name, $prefix) !== 0}{continue}{/if}
+            {if !$prefix && strpos($field.name, 'invoice_') === 0}{continue}{/if}
+            {if $prefix}
+              {assign var="_base" value=$field.name|substr:($prefix|strlen)}
+            {else}
+              {assign var="_base" value=$field.name}
+            {/if}
+            {if in_array($_base, $_static_fields)}{continue}{/if}
+            {form_field field=$field}
+          {/foreach}
         </div>
       </div>
       <div class="modal-footer">
diff --git a/views/templates/front/checkout/_partials/one-page-checkout/connected-account-info.tpl b/views/templates/front/checkout/_partials/one-page-checkout/connected-account-info.tpl
new file mode 100644
index 0000000..e69f7da
--- /dev/null
+++ b/views/templates/front/checkout/_partials/one-page-checkout/connected-account-info.tpl
@@ -0,0 +1,35 @@
+{**
+ * For the full copyright and license information, please view the
+ * LICENSE.md file that was distributed with this source code.
+ *}
+
+<div class="step__account">
+  <p>
+    {l s='Connected as [1]%firstname% %lastname%[/1].'
+    d='Shop.Theme.Customeraccount'
+    sprintf=[
+      '[1]' => "<a href='{$urls.pages.identity}' aria-label='{l s='My account (%firstname% %lastname%)' d='Shop.Theme.Customeraccount' sprintf=['%firstname%' => $customer.firstname, '%lastname%' => $customer.lastname]}'>",
+      '[/1]' => "</a>",
+      '%firstname%' => $customer.firstname,
+      '%lastname%' => $customer.lastname
+    ]
+    }
+  </p>
+
+  <p class="mb-1">
+    {l
+    s='Not you? [1]Sign out[/1]'
+    d='Shop.Theme.Customeraccount'
+    sprintf=[
+      '[1]' => "<a class='text-danger' href='{$urls.actions.logout}'>",
+      '[/1]' => "</a>"
+    ]
+    }
+  </p>
+
+  {if !isset($empty_cart_on_logout) || $empty_cart_on_logout}
+    <p class="mb-0">
+      <small class="text-body-tertiary">{l s='If you sign out now, your cart will be emptied.' d='Shop.Theme.Checkout'}</small>
+    </p>
+  {/if}
+</div>
diff --git a/views/templates/front/checkout/_partials/one-page-checkout/contact-section.tpl b/views/templates/front/checkout/_partials/one-page-checkout/contact-section.tpl
index 87cba07..369c419 100644
--- a/views/templates/front/checkout/_partials/one-page-checkout/contact-section.tpl
+++ b/views/templates/front/checkout/_partials/one-page-checkout/contact-section.tpl
@@ -12,10 +12,10 @@
     <h2 class="one-page-checkout__title">{l s='Contact information' d='Shop.Theme.Checkout'}</h2>
 
     <div class="one-page-checkout__links">
-      <a class="one-page-checkout__link" href="{$urls.pages.authentication}?back={$urls.pages.order}">
+      <a class="one-page-checkout__link" href="{$opc_urls.authentication}">
         {l s='Already have an account? Sign in' d='Shop.Theme.Checkout'}
       </a>
-      <a class="one-page-checkout__link" href="{$urls.pages.registration}?back={$urls.pages.order}">
+      <a class="one-page-checkout__link" href="{$opc_urls.registration}">
         {l s='Create account' d='Shop.Theme.Checkout'}
       </a>
     </div>
@@ -45,6 +45,6 @@
 {else}
   <section class="one-page-checkout__section">
     <h2 class="one-page-checkout__title">{l s='Contact information' d='Shop.Theme.Checkout'}</h2>
-    {include file='checkout/_partials/connected-account-info.tpl'}
+    {include file='module:ps_onepagecheckout/views/templates/front/checkout/_partials/one-page-checkout/connected-account-info.tpl'}
   </section>
 {/if}
diff --git a/views/templates/front/checkout/_partials/one-page-checkout/payment-section.tpl b/views/templates/front/checkout/_partials/one-page-checkout/payment-section.tpl
index bd6b224..106e39e 100644
--- a/views/templates/front/checkout/_partials/one-page-checkout/payment-section.tpl
+++ b/views/templates/front/checkout/_partials/one-page-checkout/payment-section.tpl
@@ -20,29 +20,34 @@
 
   {hook h='displayPaymentTop'}
 
-  <div class="one-page-checkout__placeholder" id="opc-payment-methods"
-    data-url-update="{url entity='order' params=['ajax' => 1, 'action' => 'opcSelectPayment']}"
-  >
-    {if $payment_options|count}
-      {include file='module:ps_onepagecheckout/views/templates/front/checkout/_partials/one-page-checkout/payment-methods.tpl'
-        payment_options=$payment_options
-        is_free=$is_free
-        selected_payment_module=$selected_payment_module
-        selected_payment_selection_key=$selected_payment_selection_key|default:''
+  <div class="opc-payment-methods-wrapper position-relative">
+    <div class="one-page-checkout__placeholder" id="opc-payment-methods"
+      data-url-update="{url entity='order' params=['ajax' => 1, 'action' => 'opcSelectPayment']}"
+    >
+      {if $payment_options|count}
+        {include file='module:ps_onepagecheckout/views/templates/front/checkout/_partials/one-page-checkout/payment-methods.tpl'
+          payment_options=$payment_options
+          is_free=$is_free
+          selected_payment_module=$selected_payment_module
+          selected_payment_selection_key=$selected_payment_selection_key|default:''
+        }
+      {else}
+        <div class="card card-body bg-light">
+          {l s='You will see the available payment methods once you\'ve entered your delivery address.' d='Shop.Theme.Checkout'}
+        </div>
+      {/if}
+    </div>
+
+    <div id="opc-payment-methods-loader"
+      class="opc-payment-methods-loader position-absolute top-0 start-0 end-0 bottom-0 bg-white d-none"
+      aria-hidden="true"
+    >
+      {include file='module:ps_onepagecheckout/views/templates/front/checkout/_partials/one-page-checkout/opc-loader.tpl'
+        message={l s='Loading payment methods...' d='Shop.Theme.Checkout'}
       }
-    {else}
-      <div class="card card-body bg-light">
-        {l s='You will see the available payment methods once you\'ve entered your delivery address.' d='Shop.Theme.Checkout'}
-      </div>
-    {/if}
+    </div>
   </div>
 
-  <template id="opc-template-payment-loader">
-    {include file='module:ps_onepagecheckout/views/templates/front/checkout/_partials/one-page-checkout/opc-loader.tpl'
-      message={l s='Loading payment methods...' d='Shop.Theme.Checkout'}
-    }
-  </template>
-
   <template id="opc-template-payment-error">
     {include file='module:ps_onepagecheckout/views/templates/front/checkout/_partials/one-page-checkout/opc-error.tpl'
       message={l s='An error occurred while loading payment methods. Please try again.' d='Shop.Theme.Checkout'}
diff --git a/views/templates/front/checkout/_partials/steps/one-page-checkout.tpl b/views/templates/front/checkout/_partials/steps/one-page-checkout.tpl
index e5b800f..943594d 100644
--- a/views/templates/front/checkout/_partials/steps/one-page-checkout.tpl
+++ b/views/templates/front/checkout/_partials/steps/one-page-checkout.tpl
@@ -47,6 +47,7 @@
 <div class="one-page-checkout__footer">
   {* ===== Terms & conditions ===== *}
   {if $conditions_to_approve|count}
+    <form id="conditions-to-approve" class="js-conditions-to-approve mt-3" method="GET">
     {foreach from=$conditions_to_approve item="condition" key="condition_name"}
       <div class="form-check">
         <input id="conditions_to_approve[{$condition_name}]"
@@ -61,14 +62,17 @@
         </label>
       </div>
     {/foreach}
+    </form>
   {/if}
 
   {hook h='displayCheckoutBeforeConfirmation'}
 
   {* ===== Pay button ===== *}
-  <button class="one-page-checkout__submit btn btn-primary btn-lg w-100" type="button" id="opc-pay-button" disabled>
-    {l s='Pay' d='Shop.Theme.Checkout'} <span id="opc-pay-amount">{$cart.totals.total.value}</span>
-  </button>
+  <div id="payment-confirmation" class="js-payment-confirmation">
+    <button class="one-page-checkout__submit btn btn-primary btn-lg w-100" type="button" id="opc-pay-button" disabled>
+      {l s='Pay' d='Shop.Theme.Checkout'} <span id="opc-pay-amount">{$cart.totals.total.value}</span>
+    </button>
+  </div>
 
   {hook h='displayPaymentByBinaries'}
 </div>
diff --git a/views/templates/front/checkout/checkout.tpl b/views/templates/front/checkout/checkout.tpl
new file mode 100644
index 0000000..3259484
--- /dev/null
+++ b/views/templates/front/checkout/checkout.tpl
@@ -0,0 +1,60 @@
+{**
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *}
+{extends file=$layout}
+{block name='notifications'}
+{/block}
+
+{block name='breadcrumb'}
+{/block}
+
+{block name='content_columns'}
+  {block name='checkout_notifications'}
+    {include file='_partials/notifications.tpl'}
+  {/block}
+  <div
+    id="js-account-created-toast"
+    class="d-none"
+    data-show="{$show_account_created_toast|intval|default:0}"
+    data-message="{l s='Account successfully created' d='Shop.Theme.Customeraccount'}"
+  ></div>
+
+  <div class="columns-container container">
+    <div id="center-column" class="center-column page page--full-width">
+      <div class="checkout-grid row">
+        <div class="checkout-grid__content col-lg-8 order-2 order-lg-1">
+          <div class="tab-content">
+            {block name='checkout_process'}
+              {render file='checkout/checkout-process.tpl' ui=$checkout_process}
+            {/block}
+          </div>
+        </div>
+
+        <div class="checkout-grid__aside col-lg-4 order-1 order-lg-2">
+          <div class="checkout-grid__aside-wrapper">
+            <div class="checkout__summary-accordion accordion">
+              <div class="checkout__summary-accordion-item accordion-item">
+                <div class="checkout__summary-accordion-header accordion-header">
+                  <button class="accordion-button" type="button" data-bs-target="#js-checkout-summary" data-bs-toggle="collapse" aria-expanded="true">
+                    {l s='Order summary' d='Shop.Theme.Checkout'}
+                  </button>
+                </div>
+
+                {block name='cart_summary'}
+                  <div class="checkout__summary-accordion-wrapper cart-summary js-checkout-summary">
+                    {include file='checkout/_partials/cart-summary.tpl' cart=$cart}
+                  </div>
+                {/block}
+              </div>
+            </div>
+
+            {hook h='displayReassurance'}
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  {include file='checkout/_partials/modal-terms.tpl'}
+{/block}