diff --git a/composer.json b/composer.json index 50970a3..819d695 100644 --- a/composer.json +++ b/composer.json @@ -17,10 +17,10 @@ "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.0", - "rapidez/core": "^3.1" + "rapidez/account": "^3.2", + "rapidez/core": "^3.4" }, "autoload": { "psr-4": { 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/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') @@ -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']) 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']) @endsection diff --git a/resources/views/account/partials/address-form.blade.php b/resources/views/account/partials/address-form.blade.php index 64ce8c2..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']) +
- +
@lang('Default shipping address') @lang('Default billing address') 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 @@ +
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..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'])
@if (Rapidez::config('customer/address/company_show', 'opt') || Rapidez::config('customer/address/taxvat_show', 0)) @@ -29,9 +29,22 @@ +