An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.
PHP coolifydatabasesdeploymentdockerdocker-composeinertiajslaravelmariadbmysqlnextjsnodejsphppostgresredisself-hostedself-hostingserverstatic-sitesveltesvelte5
fix(subscription): preserve adjustment modal state during Livewire updates
Andras Bacsai9c5020c93b8a
diff --git a/resources/views/livewire/subscription/actions.blade.php b/resources/views/livewire/subscription/actions.blade.phpindex 18a093f6f0..3bccfd67cd 100644--- a/resources/views/livewire/subscription/actions.blade.php+++ b/resources/views/livewire/subscription/actions.blade.php@@ -1,40 +1,40 @@-<div wire:init="loadRefundEligibility" class="application-settings-workspace flex flex-col gap-6">+<div wire:init="loadRefundEligibility" class="application-settings-workspace flex flex-col gap-6" x-data="{+ qty: {{ $quantity }},+ get current() { return $wire.server_limits; },+ activeServers: {{ currentTeam()->servers->count() }},+ preview: @js($pricePreview),+ loading: false,+ showModal: false,+ async fetchPreview() {+ if (this.qty < 2 || this.qty > 100 || this.qty === this.current) { return; }+ this.loading = true;+ this.preview = null;+ await $wire.loadPricePreview(this.qty);+ this.preview = $wire.pricePreview;+ this.loading = false;+ },+ fmt(cents) {+ if (!this.preview) return '';+ const c = this.preview.currency;+ return c === 'USD' ? '$' + (cents / 100).toFixed(2) : (cents / 100).toFixed(2) + ' ' + c;+ },+ get isReduction() { return this.qty < this.activeServers; },+ get hasChanged() { return this.qty !== this.current; },+ get hasPreview() { return this.preview !== null; },+ openAdjust() {+ this.showModal = true;+ },+ closeAdjust() {+ this.showModal = false;+ this.qty = this.current;+ this.preview = null;+ }+}" @success.window="preview = null; showModal = false; qty = $wire.server_limits"+ @keydown.escape.window="if (showModal) { closeAdjust(); }">@if (subscriptionProvider() === 'stripe'){{-- Plan Overview --}}<x-application.settings-section title="Plan overview"- description="Review billing status and the number of servers included in this plan." x-data="{- qty: {{ $quantity }},- get current() { return $wire.server_limits; },- activeServers: {{ currentTeam()->servers->count() }},- preview: @js($pricePreview),- loading: false,- showModal: false,- async fetchPreview() {- if (this.qty < 2 || this.qty > 100 || this.qty === this.current) { return; }- this.loading = true;- this.preview = null;- await $wire.loadPricePreview(this.qty);- this.preview = $wire.pricePreview;- this.loading = false;- },- fmt(cents) {- if (!this.preview) return '';- const c = this.preview.currency;- return c === 'USD' ? '$' + (cents / 100).toFixed(2) : (cents / 100).toFixed(2) + ' ' + c;- },- get isReduction() { return this.qty < this.activeServers; },- get hasChanged() { return this.qty !== this.current; },- get hasPreview() { return this.preview !== null; },- openAdjust() {- this.showModal = true;- },- closeAdjust() {- this.showModal = false;- this.qty = this.current;- this.preview = null;- }- }" @success.window="preview = null; showModal = false; qty = $wire.server_limits"- @keydown.escape.window="if (showModal) { closeAdjust(); }">+ description="Review billing status and the number of servers included in this plan."><div class="space-y-2"><div class="text-sm"><span class="text-neutral-500">Plan:</span>diff --git a/tests/Feature/Subscription/SubscriptionPricingPageTest.php b/tests/Feature/Subscription/SubscriptionPricingPageTest.phpindex d89dbbcb01..98e0c9ad4b 100644--- a/tests/Feature/Subscription/SubscriptionPricingPageTest.php+++ b/tests/Feature/Subscription/SubscriptionPricingPageTest.php@@ -86,7 +86,9 @@ test('subscribed cloud sidebar shows subscription link for team admins', functiotest('subscription adjustment modal is protected from livewire morphing', function () {$view = file_get_contents(resource_path('views/livewire/subscription/actions.blade.php'));- expect($view)->toContain('<template x-teleport="body" wire:ignore>');+ expect($view)+ ->toContain('<div wire:init="loadRefundEligibility" class="application-settings-workspace flex flex-col gap-6" x-data="{')+ ->toContain('<template x-teleport="body" wire:ignore>');});test('subscription pricing page does not render a single-item pricing tab strip', function () {