Fix: Resolving box now by instance, not by type. Also, fixing bug where missing shipping driver would break checkout

resources/js/checkout/bbk-checkout-form-controller.js

@@ -123,7 +123,7 @@ export default class extends Controller {
     }
 
     async selectShipping(event) {
-        this.toggleBoxNowLocker(event.target.value)
+        this.toggleBoxNowLocker(event.target.dataset.boxNow === 'true')
 
         // Tracked so flush() can await it — nothing else stops "place order"
         // (a separate, unrelated click) from racing ahead of this request.
@@ -136,15 +136,17 @@ export default class extends Controller {
     // re-renders wholesale on every shipping-option change — so its own
     // Stimulus controller reconnects fresh each time and has no memory of
     // which option was previously selected. This is the one place that
-    // knows the newly-chosen option's identifier, so it also owns
-    // showing/hiding the picker.
-    toggleBoxNowLocker(identifier) {
+    // knows the newly-chosen option, so it also owns showing/hiding the
+    // picker. Whether an option is Box Now comes from the server
+    // (data-box-now, by the method's driver) — the option's value is the
+    // merchant-typed method code, which needn't be "box-now".
+    toggleBoxNowLocker(isBoxNow) {
         const picker = this.shippingOptionsTarget.querySelector('#bbk-box-now-locker')
         if (!picker) return
 
         const controller = this.application.getControllerForElementAndIdentifier(picker, 'bbk-box-now-locker')
 
-        if (identifier === 'box-now') {
+        if (isBoxNow) {
             controller?.show()
         } else {
             controller?.hide()

resources/views/checkout/partials/shipping-options.blade.php

@@ -8,6 +8,8 @@
     $shippingAddress, $shippingOptions come from the controller / page scope.
 --}}
 @php($selected = $shippingAddress?->shipping_option)
+{{-- Box Now by the method's driver, not its (merchant-typed) code --}}
+@php($boxNowCodes = \Modules\Core\Shipping\Support\BoxNowShipping::codes())
 
 {{-- Rate resolution needs country (always Greece here) + postcode; until a
      postcode is saved there's nothing to quote against yet. --}}
@@ -34,6 +36,7 @@
                     type="radio"
                     name="shipping_option"
                     value="{{ $option->identifier }}"
+                    data-box-now="{{ in_array($option->identifier, $boxNowCodes, true) ? 'true' : 'false' }}"
                     @checked($selected === $option->identifier)
                     data-action="change->bbk-checkout-form#selectShipping"
                 >
@@ -73,7 +76,7 @@
     data-bbk-box-now-locker-select-label-value="{{ __('checkout.page.box_now_locker_select') }}"
     data-bbk-box-now-locker-selected-label-value="{{ __('checkout.page.box_now_locker_selected') }}"
     data-bbk-box-now-locker-no-results-value="{{ __('checkout.page.box_now_locker_no_results') }}"
-    @if ($selected !== 'box-now') hidden @endif
+    @if (! in_array($selected, $boxNowCodes, true)) hidden @endif
 >
     <p class="bbk-checkout-box-now-locker-label">
         {{ __('checkout.page.box_now_locker_label') }}