From afaa8198eeacbba03f64abcf848854d0425dfe05 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Tue, 25 Feb 2025 13:02:26 +0100
Subject: [PATCH 1/6] Add region select component

---
 .../components/input/region-select.blade.php  | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 resources/views/components/input/region-select.blade.php

diff --git a/resources/views/components/input/region-select.blade.php b/resources/views/components/input/region-select.blade.php
new file mode 100644
index 0000000..36fe744
--- /dev/null
+++ b/resources/views/components/input/region-select.blade.php
@@ -0,0 +1,28 @@
+@props(['label' => '', 'country' => '', 'placeholderClass' => ''])
+<graphql
+    v-if="{{ $country }}"
+    query="query country($id: String) { country(id: $id) { available_regions { code id name } } }"
+    v-bind:variables="{ id: {{ $country }} }"
+    v-bind:cache="'regions_' + {{ $country }}"
+    v-bind:key="{{ $country }}"
+>
+    <div class="contents" slot-scope="{ data }">
+        <template v-if="data && data.country.available_regions">
+            <x-rapidez-ct::input.select
+                :$label
+                {{ $attributes }}
+                v-if="{{ Rapidez::config('general/region/display_all', '0') }} || '{{ Rapidez::config('general/region/state_required') }}'.split(',').includes({{ $country }})"
+                v-bind:required="'{{ Rapidez::config('general/region/state_required') }}'.split(',').includes({{ $country }})"
+            >
+                <option v-for="region in data.country.available_regions" :value="region.id">
+                    @{{ region.name }}
+                </option>
+            </x-rapidez-ct::input.select>
+        </template>
+        @if ($placeholderClass)
+            <template v-else>
+                <div class="{{ $placeholderClass }}"></div>
+            </template>
+        @endif
+    </div>
+</graphql>

From 0bf6d9552193d2a3f4ba8777e05c3a6464ef5934 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Tue, 25 Feb 2025 13:19:22 +0100
Subject: [PATCH 2/6] Add region to address form

---
 resources/js/components/AddressCard.vue       |  4 +++
 .../account/partials/address-form.blade.php   |  2 +-
 .../partials/sections/address.blade.php       |  6 ++--
 .../views/components/address-form.blade.php   | 10 +++++++
 resources/views/components/address.blade.php  |  3 +-
 .../components/input/region-select.blade.php  | 28 -------------------
 6 files changed, 21 insertions(+), 32 deletions(-)
 delete mode 100644 resources/views/components/input/region-select.blade.php

diff --git a/resources/js/components/AddressCard.vue b/resources/js/components/AddressCard.vue
index 3984981..ba47fd1 100644
--- a/resources/js/components/AddressCard.vue
+++ b/resources/js/components/AddressCard.vue
@@ -42,6 +42,10 @@
                 return this.address?.country_id ?? this.address?.country_code ?? ''
             },
 
+            region() {
+                return this.address?.region?.region ?? this.address?.region?.region_code ?? ''
+            },
+
             isEmpty() {
                 return [this.company, this.street, this.name, this.city].filter(Boolean).length == 0
             }
diff --git a/resources/views/account/partials/address-form.blade.php b/resources/views/account/partials/address-form.blade.php
index 64ce8c2..843a8e2 100644
--- a/resources/views/account/partials/address-form.blade.php
+++ b/resources/views/account/partials/address-form.blade.php
@@ -1,7 +1,7 @@
 <form slot-scope="{ variables, mutate, mutated }" v-on:submit.prevent="mutate">
     <x-rapidez-ct::sections>
         <x-rapidez-ct::card.inactive>
-            <x-rapidez-ct::address-form type="edit" address="variables" country-key="country_code"/>
+            <x-rapidez-ct::address-form type="edit"/>
             <div class="flex gap-5 py-5">
                 <x-rapidez::input.checkbox v-model="variables.default_shipping">@lang('Default shipping address')</x-input.checkbox>
                 <x-rapidez::input.checkbox v-model="variables.default_billing">@lang('Default billing address')</x-input.checkbox>
diff --git a/resources/views/checkout/partials/sections/address.blade.php b/resources/views/checkout/partials/sections/address.blade.php
index 0df82c9..04b687b 100644
--- a/resources/views/checkout/partials/sections/address.blade.php
+++ b/resources/views/checkout/partials/sections/address.blade.php
@@ -13,7 +13,8 @@
                     cart_id: mask,
                     ...window.address_defaults,
                     ...cart.shipping_addresses[0],
-                    country_code: cart.shipping_addresses[0]?.country.code || window.address_defaults.country_code
+                    country_code: cart.shipping_addresses[0]?.country.code || window.address_defaults.country_code,
+                    region_id: cart.shipping_addresses[0]?.region.region_id || window.address_defaults.region_id,
                 }"
                 group="shipping"
                 :callback="updateCart"
@@ -34,7 +35,8 @@
                     ...window.address_defaults,
                     ...cart.billing_address,
                     same_as_shipping: !cart.is_virtual && (cart?.billing_address?.same_as_shipping ?? true),
-                    country_code: cart.billing_address?.country.code || window.address_defaults.country_code
+                    country_code: cart.billing_address?.country.code || window.address_defaults.country_code,
+                    region_id: cart.billing_address?.region.region_id || window.address_defaults.region_id,
                 }))"
                 :callback="updateCart"
                 :error-callback="checkResponseForExpiredCart"
diff --git a/resources/views/components/address-form.blade.php b/resources/views/components/address-form.blade.php
index f328fd0..cb6c2bb 100644
--- a/resources/views/components/address-form.blade.php
+++ b/resources/views/components/address-form.blade.php
@@ -29,9 +29,19 @@
         <x-rapidez::input.select.country
             name="{{ $type }}_country"
             v-model="{{ $address }}.{{ $countryKey }}"
+            v-on:change="() => {{ $address }}.region_id = null"
             required
         />
     </label>
+    <label class="sm:col-span-2 has-[.exists]:block hidden">
+        <x-rapidez::label>@lang('Region')</x-rapidez::label>
+        <x-rapidez::input.select.region
+            class="exists"
+            name="{{ $type }}_region"
+            v-model="{{ $address }}.region_id"
+            country="{{ $address }}.{{ $countryKey }}"
+        />
+    </label>
     <div class="max-sm:hidden sm:col-span-2"></div>
     <label @class([ 'sm:col-span-2' => !Rapidez::config('customer/address/middlename_show', 0)])>
         <x-rapidez::label>@lang('Firstname')</x-rapidez::label>
diff --git a/resources/views/components/address.blade.php b/resources/views/components/address.blade.php
index 708c65f..d4458a8 100644
--- a/resources/views/components/address.blade.php
+++ b/resources/views/components/address.blade.php
@@ -5,7 +5,7 @@
         'v-bind:shipping' => var_export($shipping, true),
         'v-bind:billing' => var_export($billing, true),
     ]) }}
-    v-slot="{ company, name, street, city, country, billing, shipping, isEmpty, customTitle, disabled, check }"
+    v-slot="{ company, name, street, city, country, region, billing, shipping, isEmpty, customTitle, disabled, check }"
 >
     <div {{ $attributes->whereDoesntStartWith('v-')->class('flex flex-col') }}>
         <template v-if="!isEmpty">
@@ -32,6 +32,7 @@
                     <li v-if="name">@{{ name }}</li>
                     <li v-if="street">@{{ street }}</li>
                     <li v-if="city">@{{ city }}</li>
+                    <li v-if="region">@{{ region }}</li>
                     <li v-if="country">@{{ country }}</li>
                 </ul>
                 @if (!empty($slot))
diff --git a/resources/views/components/input/region-select.blade.php b/resources/views/components/input/region-select.blade.php
deleted file mode 100644
index 36fe744..0000000
--- a/resources/views/components/input/region-select.blade.php
+++ /dev/null
@@ -1,28 +0,0 @@
-@props(['label' => '', 'country' => '', 'placeholderClass' => ''])
-<graphql
-    v-if="{{ $country }}"
-    query="query country($id: String) { country(id: $id) { available_regions { code id name } } }"
-    v-bind:variables="{ id: {{ $country }} }"
-    v-bind:cache="'regions_' + {{ $country }}"
-    v-bind:key="{{ $country }}"
->
-    <div class="contents" slot-scope="{ data }">
-        <template v-if="data && data.country.available_regions">
-            <x-rapidez-ct::input.select
-                :$label
-                {{ $attributes }}
-                v-if="{{ Rapidez::config('general/region/display_all', '0') }} || '{{ Rapidez::config('general/region/state_required') }}'.split(',').includes({{ $country }})"
-                v-bind:required="'{{ Rapidez::config('general/region/state_required') }}'.split(',').includes({{ $country }})"
-            >
-                <option v-for="region in data.country.available_regions" :value="region.id">
-                    @{{ region.name }}
-                </option>
-            </x-rapidez-ct::input.select>
-        </template>
-        @if ($placeholderClass)
-            <template v-else>
-                <div class="{{ $placeholderClass }}"></div>
-            </template>
-        @endif
-    </div>
-</graphql>

From ed0315a68978bc52a9cfd9177ee16131d0d6949e Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Mon, 3 Mar 2025 11:03:44 +0100
Subject: [PATCH 3/6] Fix account address form

---
 resources/views/account/address-edit.blade.php     |  4 ++--
 resources/views/account/address-new.blade.php      |  2 +-
 .../views/account/partials/address-form.blade.php  |  4 +++-
 .../partials/register-account-address.blade.php    | 14 +++++++++++++-
 resources/views/components/address-form.blade.php  |  9 ++++++---
 5 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/resources/views/account/address-edit.blade.php b/resources/views/account/address-edit.blade.php
index ec41c44..e2c9038 100644
--- a/resources/views/account/address-edit.blade.php
+++ b/resources/views/account/address-edit.blade.php
@@ -7,7 +7,7 @@
 @section('account-content')
     <x-rapidez-ct::sections>
         <graphql
-            query="{ customer { addresses { id firstname middlename lastname street city postcode country_code telephone company vat_id default_billing default_shipping } } }"
+            query="{ customer { addresses { id firstname middlename lastname street city postcode country_code region { region_id } telephone company vat_id default_billing default_shipping } } }"
             :check="(data) => data.customer?.addresses.find(a => a.id == {{ request()->id }})"
             redirect="{{ route('account.edit') }}"
         >
@@ -19,7 +19,7 @@
                     :notify="{ 'message': '@lang('Address changed successfully')' }"
                     redirect="{{ route('account.edit') }}"
                 >
-                    @include('rapidez-ct::account.partials.address-form')
+                    @include('rapidez-ct::account.partials.address-form', ['region' => 'region.region_id'])
                 </graphql-mutation>
             </div>
         </graphql>
diff --git a/resources/views/account/address-new.blade.php b/resources/views/account/address-new.blade.php
index f636db9..32a737b 100644
--- a/resources/views/account/address-new.blade.php
+++ b/resources/views/account/address-new.blade.php
@@ -14,7 +14,7 @@
             :notify="{ 'message': '@lang('Address created successfully')' }"
             redirect="{{ route('account.edit') }}"
         >
-            @include('rapidez-ct::account.partials.address-form')
+            @include('rapidez-ct::account.partials.address-form', ['region' => 'region.region_id'])
         </graphql-mutation>
     </x-rapidez-ct::sections>
 @endsection
diff --git a/resources/views/account/partials/address-form.blade.php b/resources/views/account/partials/address-form.blade.php
index 843a8e2..82bf234 100644
--- a/resources/views/account/partials/address-form.blade.php
+++ b/resources/views/account/partials/address-form.blade.php
@@ -1,7 +1,9 @@
+@props(['region' => 'region_id'])
+
 <form slot-scope="{ variables, mutate, mutated }" v-on:submit.prevent="mutate">
     <x-rapidez-ct::sections>
         <x-rapidez-ct::card.inactive>
-            <x-rapidez-ct::address-form type="edit"/>
+            <x-rapidez-ct::address-form type="edit" :$region/>
             <div class="flex gap-5 py-5">
                 <x-rapidez::input.checkbox v-model="variables.default_shipping">@lang('Default shipping address')</x-input.checkbox>
                 <x-rapidez::input.checkbox v-model="variables.default_billing">@lang('Default billing address')</x-input.checkbox>
diff --git a/resources/views/account/partials/register-account-address.blade.php b/resources/views/account/partials/register-account-address.blade.php
index a0cd8de..44a9b38 100644
--- a/resources/views/account/partials/register-account-address.blade.php
+++ b/resources/views/account/partials/register-account-address.blade.php
@@ -113,11 +113,23 @@
                     <x-rapidez::input.select.country
                         name="country_code"
                         v-model="addressVariables.country_code"
-                        v-on:change="window.app.$emit('postcode-change', addressVariables)"
                         class="w-full"
+                        v-on:change="() => {
+                            window.app.$emit('postcode-change', addressVariables);
+                            addressVariables.region = { region_id: null };
+                        }"
                         required
                     />
                 </label>
+                <label class="sm:col-span-2 has-[.exists]:block hidden">
+                    <x-rapidez::label>@lang('Region')</x-rapidez::label>
+                    <x-rapidez::input.select.region
+                        class="exists"
+                        name="region"
+                        v-model="addressVariables.region.region_id"
+                        country="addressVariables.country_code"
+                    />
+                </label>
             </span>
         </div>
     </div>
diff --git a/resources/views/components/address-form.blade.php b/resources/views/components/address-form.blade.php
index cb6c2bb..9241bc7 100644
--- a/resources/views/components/address-form.blade.php
+++ b/resources/views/components/address-form.blade.php
@@ -1,4 +1,4 @@
-@props(['type' => 'shipping', 'address' => 'variables', 'countryKey' => 'country_code'])
+@props(['type' => 'shipping', 'address' => 'variables', 'countryKey' => 'country_code', 'region' => 'region_id'])
 
 <div class="grid gap-4 md:gap-5 md:grid-cols-4">
     @if (Rapidez::config('customer/address/company_show', 'opt') || Rapidez::config('customer/address/taxvat_show', 0))
@@ -29,7 +29,10 @@
         <x-rapidez::input.select.country
             name="{{ $type }}_country"
             v-model="{{ $address }}.{{ $countryKey }}"
-            v-on:change="() => {{ $address }}.region_id = null"
+            v-on:change="() => {
+                {{ $address }}.region = {};
+                {{ $address }}.{{ $region }} = null;
+            }"
             required
         />
     </label>
@@ -38,7 +41,7 @@
         <x-rapidez::input.select.region
             class="exists"
             name="{{ $type }}_region"
-            v-model="{{ $address }}.region_id"
+            v-model="{{ $address }}.{{ $region }}"
             country="{{ $address }}.{{ $countryKey }}"
         />
     </label>

From 783b6faee21b504a1e84d9bb6439f56ab49283d3 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Thu, 17 Apr 2025 09:32:24 +0200
Subject: [PATCH 4/6] Add version constraint

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 50970a3..63b1384 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
         "php": "^8.0|^8.1|^8.2",
         "blade-ui-kit/blade-heroicons": "^2.0",
         "rapidez/account": "^3.0",
-        "rapidez/core": "^3.1"
+        "rapidez/core": "^3.4"
     },
     "autoload": {
         "psr-4": {

From 87f5630c747bebe7d38f4c814b75ac4866029de8 Mon Sep 17 00:00:00 2001
From: Jade Geels <jade@justbetter.nl>
Date: Thu, 17 Apr 2025 09:46:27 +0200
Subject: [PATCH 5/6] Add version constraint for rapidez/account

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 63b1384..fe8572e 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
     "require": {
         "php": "^8.0|^8.1|^8.2",
         "blade-ui-kit/blade-heroicons": "^2.0",
-        "rapidez/account": "^3.0",
+        "rapidez/account": "^3.2",
         "rapidez/core": "^3.4"
     },
     "autoload": {

From 994362cfde199b78c7269c3d314084f99950f7e1 Mon Sep 17 00:00:00 2001
From: Roy Duineveld <royduineveld@gmail.com>
Date: Thu, 17 Apr 2025 09:47:53 +0200
Subject: [PATCH 6/6] Update composer.json

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index fe8572e..819d695 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": "^8.0|^8.1|^8.2",
+        "php": "^8.0",
         "blade-ui-kit/blade-heroicons": "^2.0",
         "rapidez/account": "^3.2",
         "rapidez/core": "^3.4"