Merge remote-tracking branch 'origin/next' into 9916-investigate-undefined-relationship

README.md

@@ -69,6 +69,7 @@ ### Big Sponsors
 * [Arcjet](https://arcjet.com?ref=coolify.io) - Advanced web security and performance solutions
 * [BC Direct](https://bc.direct?ref=coolify.io) - Your trusted technology consulting partner
 * [Blacksmith](https://blacksmith.sh?ref=coolify.io) - Infrastructure automation platform
+* [Capture.page](https://capture.page/?ref=coolify.io) - Fast & Reliable Screenshot API for Developers
 * [Context.dev](https://context.dev?ref=coolify.io) - API to personalize your product with logos, colors, and company info from any domain
 * [ByteBase](https://www.bytebase.com?ref=coolify.io) - Database CI/CD and Security at Scale
 * [CodeRabbit](https://coderabbit.ai?ref=coolify.io) - Cut Code Review Time & Bugs in Half
@@ -87,6 +88,7 @@ ### Big Sponsors
 * [Juxtdigital](https://juxtdigital.com?ref=coolify.io) - Digital PR & AI Authority Building Agency
 * [LiquidWeb](https://liquidweb.com?ref=coolify.io) - Premium managed hosting solutions
 * [Logto](https://logto.io?ref=coolify.io) - The better identity infrastructure for developers
+* [LumaDock](https://lumadock.com/vps-hosting/coolify?utm_source=coolify&utm_medium=sponsorship&utm_campaign=coolify_oss_sponsor_2026&utm_content=github_readme) - Fast and reliable virtual server hosting
 * [Macarne](https://macarne.com?ref=coolify.io) - Best IP Transit & Carrier Ethernet Solutions for Simplified Network Connectivity
 * [Mobb](https://vibe.mobb.ai/?ref=coolify.io) - Secure Your AI-Generated Code to Unlock Dev Productivity
 * [PetroSky Cloud](https://petrosky.io?ref=coolify.io) - Open source cloud deployment solutions

app/Livewire/Project/Application/Deployment/Show.php

@@ -108,19 +108,6 @@ public function getLogLinesProperty()
         return decode_remote_command_output($this->application_deployment_queue);
     }
 
-    public function copyLogs(): string
-    {
-        $logs = decode_remote_command_output($this->application_deployment_queue)
-            ->map(function ($line) {
-                return $line['timestamp'].' '.
-                       (isset($line['command']) && $line['command'] ? '[CMD]: ' : '').
-                       trim($line['line']);
-            })
-            ->join("\n");
-
-        return sanitizeLogsForExport($logs);
-    }
-
     public function downloadAllLogs(): string
     {
         $logs = decode_remote_command_output($this->application_deployment_queue, includeAll: true)

resources/views/livewire/project/application/deployment/show.blade.php

@@ -155,9 +155,9 @@
 
             this.matchCount = query ? count : 0;
         },
-        downloadLogs() {
+        collectVisibleLogs() {
             const logs = document.getElementById('logs');
-            if (!logs) return;
+            if (!logs) return '';
             const visibleLines = logs.querySelectorAll('[data-log-line]:not(.hidden)');
             let content = '';
             visibleLines.forEach(line => {
@@ -166,6 +166,17 @@
                     content += text + String.fromCharCode(10);
                 }
             });
+            return content;
+        },
+        copyLogs() {
+            const content = this.collectVisibleLogs();
+            if (!content) return;
+            navigator.clipboard.writeText(content);
+            Livewire.dispatch('success', ['Logs copied to clipboard.']);
+        },
+        downloadLogs() {
+            const content = this.collectVisibleLogs();
+            if (!content) return;
             const blob = new Blob([content], { type: 'text/plain' });
             const url = URL.createObjectURL(blob);
             const a = document.createElement('a');
@@ -258,12 +269,7 @@ class="absolute right-2 top-1/2 -translate-y-1/2 text-gray-400 hover:text-gray-6
                             </div>
                             <div class="flex flex-wrap items-center gap-1">
                                 <button
-                                    x-on:click="
+                                    x-on:click="copyLogs()"
-                                    $wire.copyLogs().then(logs => {
-                                        navigator.clipboard.writeText(logs);
-                                        Livewire.dispatch('success', ['Logs copied to clipboard.']);
-                                    });
-                                "
                                 title="Copy Logs"
                                 class="p-1 text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200">
                                 <svg class="w-4 h-4" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"

resources/views/livewire/subscription/actions.blade.php

@@ -249,23 +249,23 @@ class="w-20 px-2 py-1 text-xl font-bold text-center rounded border dark:bg-coolg
         {{-- Refund --}}
         <section>
             <h3 class="pb-2">Refund</h3>
-            <div class="flex flex-wrap items-center gap-2">
+            @if ($refundCheckLoading || ($isRefundEligible && !currentTeam()->subscription->stripe_cancel_at_period_end))
-                @if ($refundCheckLoading)
+                <div class="flex flex-wrap items-center gap-2">
-                    <x-forms.button disabled>Request Full Refund</x-forms.button>
+                    @if ($refundCheckLoading)
-                @elseif ($isRefundEligible && !currentTeam()->subscription->stripe_cancel_at_period_end)
+                        <x-forms.button disabled>Request Full Refund</x-forms.button>
-                    <x-modal-confirmation title="Request Full Refund?" buttonTitle="Request Full Refund"
+                    @else
-                        isErrorButton submitAction="refundSubscription"
+                        <x-modal-confirmation title="Request Full Refund?" buttonTitle="Request Full Refund"
-                        :actions="[
+                            isErrorButton submitAction="refundSubscription"
-                            'Your latest payment will be fully refunded.',
+                            :actions="[
-                            'Your subscription will be cancelled immediately.',
+                                'Your latest payment will be fully refunded.',
-                            'All servers will be deactivated.',
+                                'Your subscription will be cancelled immediately.',
-                        ]" confirmationText="{{ currentTeam()->name }}"
+                                'All servers will be deactivated.',
-                        confirmationLabel="Enter your team name to confirm" shortConfirmationLabel="Team Name"
+                            ]" confirmationText="{{ currentTeam()->name }}"
-                        step2ButtonText="Confirm Refund & Cancel" />
+                            confirmationLabel="Enter your team name to confirm" shortConfirmationLabel="Team Name"
-                @else
+                            step2ButtonText="Confirm Refund & Cancel" />
-                    <x-forms.button disabled>Request Full Refund</x-forms.button>
+                    @endif
-                @endif
+                </div>
-            </div>
+            @endif
             <p class="mt-2 text-sm text-neutral-500">
                 @if ($refundCheckLoading)
                     Checking refund eligibility...