Merge pull request #8415 from turbo124/v5-develop

v5.5.102

VERSION.txt

@@ -1 +1 @@
-5.5.101
+5.5.102

app/Factory/DesignFactory.php

@@ -24,7 +24,7 @@ class DesignFactory
         $design->is_active = true;
         $design->is_custom = true;
         $design->name = '';
-        $design->design = [];
+        $design->design = '[]';
 
         return $design;
     }

app/Http/Controllers/RecurringInvoiceController.php

@@ -556,4 +556,29 @@ class RecurringInvoiceController extends BaseController
 
         return $this->itemResponse($recurring_invoice->fresh());
     }
+
+    public function downloadPdf(string $invitation_key)
+    {
+        $invitation = $this->recurring_invoice_repo->getInvitationByKey($invitation_key);
+
+        if (! $invitation) {
+            return response()->json(['message' => 'no record found'], 400);
+        }
+
+        $contact = $invitation->contact;
+        $invoice = $invitation->recurring_invoice;
+
+        $file = $invoice->service()->getInvoicePdf($contact);
+
+        $headers = ['Content-Type' => 'application/pdf'];
+
+        if (request()->input('inline') == 'true') {
+            $headers = array_merge($headers, ['Content-Disposition' => 'inline']);
+        }
+
+        return response()->streamDownload(function () use ($file) {
+            echo Storage::get($file);
+        }, basename($file), $headers);
+    }
+
 }

app/Listeners/Invoice/InvoiceEmailActivity.php

@@ -50,10 +50,10 @@ class InvoiceEmailActivity implements ShouldQueue
         $fields->user_id = $user_id;
         $fields->invoice_id = $event->invitation->invoice->id;
         $fields->company_id = $event->invitation->invoice->company_id;
-        $fields->client_contact_id = $event->invitation->invoice->client_contact_id;
+        $fields->client_contact_id = $event->invitation->client_contact_id;
         $fields->client_id = $event->invitation->invoice->client_id;
         $fields->activity_type_id = Activity::EMAIL_INVOICE;
 
-        $this->activity_repo->save($fields, $event->invitation->invoice, $event->event_vars);
+        $this->activity_repo->save($fields, $event->invitation, $event->event_vars);
     }
 }

app/Listeners/Invoice/InvoiceReminderEmailActivity.php

@@ -47,11 +47,12 @@ class InvoiceReminderEmailActivity implements ShouldQueue
         $user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->invitation->invoice->user_id;
 
         $fields->user_id = $user_id;
-        $fields->invoice_id = $event->invitation->invoice->id;
+        $fields->invoice_id = $event->invitation->invoice_id;
-        $fields->company_id = $event->invitation->invoice->company_id;
+        $fields->company_id = $event->invitation->company_id;
-        $fields->client_contact_id = $event->invitation->invoice->client_contact_id;
+        $fields->client_contact_id = $event->invitation->client_contact_id;
+        $fields->client_id = $event->invitation->invoice->client_id;
         $fields->activity_type_id = $event->reminder;
 
-        $this->activity_repo->save($fields, $event->invitation->invoice, $event->event_vars);
+        $this->activity_repo->save($fields, $event->invitation, $event->event_vars);
     }
 }

app/Listeners/PurchaseOrder/PurchaseOrderEmailActivity.php

@@ -49,11 +49,11 @@ class PurchaseOrderEmailActivity implements ShouldQueue
 
         $fields->user_id = $user_id;
         $fields->purchase_order_id = $event->invitation->purchase_order->id;
-        $fields->company_id = $event->invitation->purchase_order->company_id;
+        $fields->company_id = $event->invitation->company_id;
-        $fields->vendor_contact_id = $event->invitation->purchase_order->vendor_contact_id;
+        $fields->vendor_contact_id = $event->invitation->vendor_contact_id;
         $fields->vendor_id = $event->invitation->purchase_order->vendor_id;
         $fields->activity_type_id = Activity::EMAIL_PURCHASE_ORDER;
 
-        $this->activity_repo->save($fields, $event->invitation->purchase_order, $event->event_vars);
+        $this->activity_repo->save($fields, $event->invitation, $event->event_vars);
     }
 }

app/Listeners/Quote/QuoteEmailActivity.php

@@ -56,6 +56,6 @@ class QuoteEmailActivity implements ShouldQueue
         $fields->client_id = $event->invitation->quote->client_id;
         $fields->activity_type_id = Activity::EMAIL_QUOTE;
 
-        $this->activity_repo->save($fields, $event->invitation->quote, $event->event_vars);
+        $this->activity_repo->save($fields, $event->invitation, $event->event_vars);
     }
 }

app/Repositories/RecurringInvoiceRepository.php

@@ -28,6 +28,6 @@ class RecurringInvoiceRepository extends BaseRepository
 
     public function getInvitationByKey($key) :?RecurringInvoiceInvitation
     {
-        return RecurringInvoiceInvitation::where('key', $key)->first();
+        return RecurringInvoiceInvitation::withTrashed()->where('key', $key)->first();
     }
 }

config/ninja.php

@@ -14,8 +14,8 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => '5.5.101',
+    'app_version' => '5.5.102',
-    'app_tag' => '5.5.101',
+    'app_tag' => '5.5.102',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),