checkout and shipping part

resources/views/checkout/components/field.blade.php

@@ -24,7 +24,6 @@
         @if ($required) required @endif
         {{ $attributes->class(['bbk-field-input', 'bbk-field-input--error' => $errors->has($name)]) }}
     >
-    @error($name)
-        <p class="bbk-field-error">{{ $message }}</p>
-    @enderror
+    {{-- Always present so bbk-checkout-form can fill it live on an autosave. --}}
+    <p class="bbk-field-error" data-bbk-field-error="{{ $name }}" @unless ($errors->has($name)) hidden @endunless>{{ $errors->first($name) }}</p>
 </div>

resources/views/checkout/components/region-country.blade.php

@@ -0,0 +1,46 @@
+{{--
+    The state/region + country pair for one address (billing or shipping).
+
+    Single-country store ($storeCountry set): region is a <select> of that
+    country's Lunar states, submitting `->name` (table-rate-shipping resolves
+    zones with State::whereName()), and country is a fixed hidden field + label.
+    Otherwise: free-text region + full country <select>, as before.
+--}}
+@props([
+    'prefix',
+    'storeCountry' => null,
+    'regions' => [],
+    'countries' => [],
+    'address' => null,
+])
+
+<div class="bbk-field-row">
+    @if ($storeCountry)
+        <x-checkout::select
+            :name="$prefix . '_state'"
+            label="{{ __('checkout.page.state') }}"
+            :options="$regions"
+            value-field="name"
+            :value="$address?->state"
+            placeholder="{{ __('checkout.page.state_placeholder') }}"
+            required
+        />
+
+        <div class="bbk-field">
+            <span class="bbk-field-label">{{ __('checkout.page.country') }}</span>
+            <p class="bbk-field-static">{{ $storeCountry->name }}</p>
+            <input type="hidden" name="{{ $prefix }}_country_id" value="{{ $storeCountry->id }}">
+        </div>
+    @else
+        <x-checkout::field :name="$prefix . '_state'" label="{{ __('checkout.page.state') }}" :value="$address?->state" />
+
+        <x-checkout::select
+            :name="$prefix . '_country_id'"
+            label="{{ __('checkout.page.country') }}"
+            :options="$countries"
+            :value="$address?->country_id"
+            placeholder="{{ __('checkout.page.country_placeholder') }}"
+            required
+        />
+    @endif
+</div>

resources/views/checkout/components/select.blade.php

@@ -1,8 +1,11 @@
 {{--
     <x-checkout::select name="billing_country_id" label="Country" :options="$countries" required />
+    <x-checkout::select name="shipping_state" label="Region" :options="$regions" value-field="name" required />
 
-    `options` is an iterable of {id, name} (a Collection of models works
-    directly) — value/label pulled from those two keys.
+    `options` is an iterable of models/objects; `label` is always read from
+    `->name`, the submitted value from `->{$valueField}` (default `id`, but e.g.
+    `name` for Lunar states — table-rate-shipping resolves those with
+    State::whereName(), so the address must carry the exact name string).
 --}}
 @props([
     'name',
@@ -11,6 +14,7 @@
     'value' => null,
     'placeholder' => null,
     'required' => false,
+    'valueField' => 'id',
 ])
 
 @php($selected = old($name, $value))
@@ -27,12 +31,10 @@
             <option value="" @selected(! $selected)>{{ $placeholder }}</option>
         @endif
         @foreach ($options as $option)
-            <option value="{{ $option->id }}" @selected((string) $selected === (string) $option->id)>
+            <option value="{{ $option->{$valueField} }}" @selected((string) $selected === (string) $option->{$valueField})>
                 {{ $option->name }}
             </option>
         @endforeach
     </select>
-    @error($name)
-        <p class="bbk-field-error">{{ $message }}</p>
-    @enderror
+    <p class="bbk-field-error" data-bbk-field-error="{{ $name }}" @unless ($errors->has($name)) hidden @endunless>{{ $errors->first($name) }}</p>
 </div>

resources/views/checkout/components/textarea.blade.php

@@ -14,7 +14,5 @@
         @if ($required) required @endif
         {{ $attributes->class(['bbk-field-input', 'bbk-field-input--error' => $errors->has($name)]) }}
     >{{ old($name, $value) }}</textarea>
-    @error($name)
-        <p class="bbk-field-error">{{ $message }}</p>
-    @enderror
+    <p class="bbk-field-error" data-bbk-field-error="{{ $name }}" @unless ($errors->has($name)) hidden @endunless>{{ $errors->first($name) }}</p>
 </div>