Merge pull request #10797 from turbo124/v5-develop

v5.11.61

VERSION.txt

@@ -1 +1 @@
-5.11.60
+5.11.61

app/Events/Socket/DownloadAvailable.php

@@ -41,7 +41,7 @@ class DownloadAvailable implements ShouldBroadcast
     public function broadcastWith(): array
     {
 
-        ctrans('texts.document_download_subject');
+        // ctrans('texts.document_download_subject');
 
         return [
             'message' => $this->message,

app/Events/Socket/RefetchEntity.php

@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2025. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Events\Socket;
+
+use App\Models\User;
+use League\Fractal\Manager;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+use App\Utils\Traits\Invoice\Broadcasting\DefaultResourceBroadcast;
+
+/**
+ * Class RefetchEntity.
+ */
+class RefetchEntity implements ShouldBroadcast
+{
+    use SerializesModels;
+    use InteractsWithSockets;
+
+    public function __construct(public string $entity, public ?string $entity_id, public User $user)
+    {
+    }
+
+    public function broadcastOn()
+    {
+        return [
+            new PrivateChannel("user-{$this->user->account->key}-{$this->user->id}"),
+        ];
+    }
+
+    public function broadcastWith(): array
+    {
+
+        return [
+            'entity' => $this->entity,
+            'entity_id' => $this->entity_id,
+        ];
+    }
+
+}

app/Jobs/RecurringInvoice/UpdateRecurring.php

@@ -11,15 +11,16 @@
 
 namespace App\Jobs\RecurringInvoice;
 
-use App\Libraries\MultiDB;
-use App\Models\Company;
-use App\Models\RecurringInvoice;
 use App\Models\User;
+use App\Models\Company;
+use App\Libraries\MultiDB;
 use Illuminate\Bus\Queueable;
+use App\Models\RecurringInvoice;
+use App\Events\Socket\RefetchEntity;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
 
 class UpdateRecurring implements ShouldQueue
 {
@@ -58,6 +59,8 @@ class UpdateRecurring implements ShouldQueue
                     }
                 }
             });
+
+        event(new RefetchEntity('recurring_invoices', null, $this->user));
     }
 
     public function failed($exception = null)

app/Services/Pdf/PdfBuilder.php

@@ -2102,10 +2102,8 @@ class PdfBuilder
 
             if ($this->service->company->markdown_enabled && $this->isMarkdown($child['content'])) {
 
-                $child['content'] = str_ireplace(['<br>', '<br/>', '<br />'], "\r\n", $child['content']); //19-05-2025 - pivotting back to this, and allowing html_input for commonmark.
+                $child['content'] = str_ireplace(['<br>', '<br/>', '<br />'], "\r", $child['content']); //19-05-2025 - pivotting back to this, and allowing html_input for commonmark.
                 $child['content'] = $this->commonmark->convert($child['content']); //@phpstan-ignore-line
-                $child['content'] = nl2br($child['content']); //19-05-2025 - This allows us to use <br> and markdown and still get our spacing.
-                
             }
 
             $contains_html = str_contains($child['content'], '<') && str_contains($child['content'], '>');

config/ninja.php

@@ -17,8 +17,8 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => env('APP_VERSION', '5.11.60'),
-    'app_tag' => env('APP_TAG', '5.11.60'),
+    'app_version' => env('APP_VERSION', '5.11.61'),
+    'app_tag' => env('APP_TAG', '5.11.61'),
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', false),