From 2d98ab20b3ae0e6feb65491d1f59176db03aa870 Mon Sep 17 00:00:00 2001 From: Roene Date: Mon, 18 Aug 2025 11:00:34 +0200 Subject: [PATCH 1/5] Add disbaled on inputs and select when .loading --- .../views/checkout/partials/address.blade.php | 16 ++++++++++++++++ tailwind.config.js | 3 +++ 2 files changed, 19 insertions(+) diff --git a/resources/views/checkout/partials/address.blade.php b/resources/views/checkout/partials/address.blade.php index b9a130397..66ceed2d3 100644 --- a/resources/views/checkout/partials/address.blade.php +++ b/resources/views/checkout/partials/address.blade.php @@ -42,6 +42,7 @@ @@ -55,6 +56,7 @@ name="{{ $type }}_vat_id" v-model="variables.vat_id" v-on:change="window.app.$emit('vat-change', $event)" + v-bind:disabled="$root.loading" :required="Rapidez::config('customer/address/taxvat_show') == 'req'" /> @@ -70,6 +72,7 @@ @if (Rapidez::config('customer/address/prefix_show') === 'opt') @@ -90,6 +93,7 @@ @@ -101,6 +105,7 @@ @@ -111,6 +116,7 @@ @@ -122,6 +128,7 @@ @if (Rapidez::config('customer/address/suffix_show') === 'opt') @@ -146,6 +153,7 @@ window.app.$emit('postcode-change', variables); variables.region_id = null })" + v-bind:disabled="$root.loading" required /> @@ -158,6 +166,7 @@ class="region exists" name="{{ $type }}_region" country="variables.country_code" v-model="variables.region_id" + v-bind:disabled="$root.loading" /> @@ -168,6 +177,7 @@ class="region exists" @@ -180,6 +190,7 @@ class="region exists" name="{{ $type }}_postcode" v-model="variables.postcode" v-on:change="$root.$nextTick(() => window.app.$emit('postcode-change', variables))" + v-bind:disabled="$root.loading" required /> @@ -192,6 +203,7 @@ class="region exists" name="{{ $type }}_housenumber" v-model="variables.street[1]" v-on:change="$root.$nextTick(() => window.app.$emit('postcode-change', variables))" + v-bind:disabled="$root.loading" required /> @@ -204,6 +216,7 @@ class="region exists" @@ -214,6 +227,7 @@ class="region exists" @@ -224,6 +238,7 @@ class="region exists" @@ -235,6 +250,7 @@ class="region exists" diff --git a/tailwind.config.js b/tailwind.config.js index a8fb20ff2..ce8f859b6 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -45,6 +45,7 @@ export default { emphasis: color('--foreground-emphasis', colors.slate[900]), DEFAULT: color('--foreground', colors.slate[800]), muted: color('--foreground-muted', colors.slate[600]), + disabled: color('--foreground-disabled', colors.neutral[600]), }, border: { @@ -52,6 +53,7 @@ export default { emphasis: color('--border-emphasis', colors.slate[400]), DEFAULT: color('--border', colors.slate[300]), muted: color('--border-muted', colors.slate[100]), + disabled: color('--background-disabled', colors.neutral[200]), }, background: { @@ -59,6 +61,7 @@ export default { emphasis: color('--background-emphasis', colors.slate[200]), DEFAULT: color('--background', colors.slate[100]), muted: color('--background-muted', colors.slate[50]), + disabled: color('--background-disabled', colors.neutral[200]), }, backdrop: color('--backdrop', 'rgba(0, 0, 0, 0.4)'), }, From e3ce56e0bd0b76d3ad3abe7fce12268980695922 Mon Sep 17 00:00:00 2001 From: Roene Date: Mon, 18 Aug 2025 11:02:52 +0200 Subject: [PATCH 2/5] Fix border-disabled color --- tailwind.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tailwind.config.js b/tailwind.config.js index ce8f859b6..bb3f542cd 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -53,7 +53,7 @@ export default { emphasis: color('--border-emphasis', colors.slate[400]), DEFAULT: color('--border', colors.slate[300]), muted: color('--border-muted', colors.slate[100]), - disabled: color('--background-disabled', colors.neutral[200]), + disabled: color('--border-disabled', colors.neutral[200]), }, background: { From 38e4ca72ed8c9e2969768d7db11c32ca86d050ae Mon Sep 17 00:00:00 2001 From: Roene Date: Tue, 19 Aug 2025 16:03:20 +0200 Subject: [PATCH 3/5] Remove disabled colors from field | Added correct foreground-disabled --- resources/css/app.css | 8 ++++++++ resources/views/checkout/partials/address.blade.php | 2 +- tailwind.config.js | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/resources/css/app.css b/resources/css/app.css index 2090c0a01..c3d6a3c8f 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -73,3 +73,11 @@ input[type='search']::-webkit-search-results-decoration { .button-loading:before { @apply animate-loading; } + +.no-disabled-state { + input[disabled], + select[disabled], + textarea[disabled] { + @apply disabled:bg-white disabled:border-default disabled:text; + } +} \ No newline at end of file diff --git a/resources/views/checkout/partials/address.blade.php b/resources/views/checkout/partials/address.blade.php index 66ceed2d3..f44a6a3a3 100644 --- a/resources/views/checkout/partials/address.blade.php +++ b/resources/views/checkout/partials/address.blade.php @@ -16,7 +16,7 @@ -
+
@if ((Rapidez::config('customer/address/company_show')) || (Rapidez::config('customer/address/taxvat_show')))
@lang('Order type')
diff --git a/tailwind.config.js b/tailwind.config.js index bb3f542cd..cab2a4c6a 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -45,7 +45,7 @@ export default { emphasis: color('--foreground-emphasis', colors.slate[900]), DEFAULT: color('--foreground', colors.slate[800]), muted: color('--foreground-muted', colors.slate[600]), - disabled: color('--foreground-disabled', colors.neutral[600]), + disabled: color('--foreground-disabled', colors.slate[600]), }, border: { From 5daa3097ee0e782fda8099b6ea93ab7510f27675 Mon Sep 17 00:00:00 2001 From: Roene-JustBetter Date: Tue, 19 Aug 2025 14:04:31 +0000 Subject: [PATCH 4/5] Apply fixes from Prettier --- resources/css/app.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/css/app.css b/resources/css/app.css index c3d6a3c8f..7f1d26494 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -80,4 +80,4 @@ input[type='search']::-webkit-search-results-decoration { textarea[disabled] { @apply disabled:bg-white disabled:border-default disabled:text; } -} \ No newline at end of file +} From 121e511b7c7a8bbf053294bf71bdf580c158dea5 Mon Sep 17 00:00:00 2001 From: Roene Date: Thu, 28 Aug 2025 11:22:33 +0200 Subject: [PATCH 5/5] Removed disabled colors --- resources/css/app.css | 8 -------- resources/views/checkout/partials/address.blade.php | 2 +- tailwind.config.js | 3 --- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/resources/css/app.css b/resources/css/app.css index c3d6a3c8f..2090c0a01 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -73,11 +73,3 @@ input[type='search']::-webkit-search-results-decoration { .button-loading:before { @apply animate-loading; } - -.no-disabled-state { - input[disabled], - select[disabled], - textarea[disabled] { - @apply disabled:bg-white disabled:border-default disabled:text; - } -} \ No newline at end of file diff --git a/resources/views/checkout/partials/address.blade.php b/resources/views/checkout/partials/address.blade.php index f44a6a3a3..66ceed2d3 100644 --- a/resources/views/checkout/partials/address.blade.php +++ b/resources/views/checkout/partials/address.blade.php @@ -16,7 +16,7 @@
-
+
@if ((Rapidez::config('customer/address/company_show')) || (Rapidez::config('customer/address/taxvat_show')))
@lang('Order type')
diff --git a/tailwind.config.js b/tailwind.config.js index cab2a4c6a..a8fb20ff2 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -45,7 +45,6 @@ export default { emphasis: color('--foreground-emphasis', colors.slate[900]), DEFAULT: color('--foreground', colors.slate[800]), muted: color('--foreground-muted', colors.slate[600]), - disabled: color('--foreground-disabled', colors.slate[600]), }, border: { @@ -53,7 +52,6 @@ export default { emphasis: color('--border-emphasis', colors.slate[400]), DEFAULT: color('--border', colors.slate[300]), muted: color('--border-muted', colors.slate[100]), - disabled: color('--border-disabled', colors.neutral[200]), }, background: { @@ -61,7 +59,6 @@ export default { emphasis: color('--background-emphasis', colors.slate[200]), DEFAULT: color('--background', colors.slate[100]), muted: color('--background-muted', colors.slate[50]), - disabled: color('--background-disabled', colors.neutral[200]), }, backdrop: color('--backdrop', 'rgba(0, 0, 0, 0.4)'), },