Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop

app/Http/Controllers/EmailController.php

@@ -114,7 +114,7 @@ class EmailController extends BaseController
     public function send(SendEmailRequest $request)
     {
         $entity = $request->input('entity');
-        $entity_obj = $entity::find($request->input('entity_id'));
+        $entity_obj = $entity::withTrashed()->with('invitations')->find($request->input('entity_id'));
         $subject = $request->has('subject') ? $request->input('subject') : '';
         $body = $request->has('body') ? $request->input('body') : '';
         $entity_string = strtolower(class_basename($entity_obj));

app/Http/Requests/Email/SendEmailRequest.php

@@ -82,7 +82,7 @@ class SendEmailRequest extends Request
             $entity = $input['entity'];
 
             /* Harvest the entity*/
-            $entity_obj = $entity::whereId($input['entity_id'])->company()->first();
+            $entity_obj = $entity::whereId($input['entity_id'])->withTrashed()->company()->first();
 
             /* Check object, check user and company id is same as users, and check user can edit the object */
             if ($entity_obj && ($company->id == $entity_obj->company_id) && auth()->user()->can('edit', $entity_obj)) {

app/Jobs/Entity/CreateRawPdf.php

@@ -0,0 +1,198 @@
+<?php
+
+/**
+ * Entity Ninja (https://entityninja.com).
+ *
+ * @link https://github.com/entityninja/entityninja source repository
+ *
+ * @copyright Copyright (c) 2021. Entity Ninja LLC (https://entityninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Jobs\Entity;
+
+use App\Exceptions\FilePermissionsFailure;
+use App\Libraries\MultiDB;
+use App\Models\Account;
+use App\Models\Credit;
+use App\Models\CreditInvitation;
+use App\Models\Design;
+use App\Models\Invoice;
+use App\Models\InvoiceInvitation;
+use App\Models\Quote;
+use App\Models\QuoteInvitation;
+use App\Models\RecurringInvoice;
+use App\Models\RecurringInvoiceInvitation;
+use App\Services\PdfMaker\Design as PdfDesignModel;
+use App\Services\PdfMaker\Design as PdfMakerDesign;
+use App\Services\PdfMaker\PdfMaker as PdfMakerService;
+use App\Utils\HostedPDF\NinjaPdf;
+use App\Utils\HtmlEngine;
+use App\Utils\Ninja;
+use App\Utils\PhantomJS\Phantom;
+use App\Utils\Traits\MakesHash;
+use App\Utils\Traits\MakesInvoiceHtml;
+use App\Utils\Traits\NumberFormatter;
+use App\Utils\Traits\Pdf\PdfMaker;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\Storage;
+
+class CreateRawPdf implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, NumberFormatter, MakesInvoiceHtml, PdfMaker, MakesHash;
+
+    public $entity;
+
+    public $company;
+
+    public $contact;
+
+    public $invitation;
+
+    public $entity_string = '';
+
+    /**
+     * Create a new job instance.
+     *
+     * @param $invitation
+     */
+    public function __construct($invitation, $db)
+    {
+        MultiDB::setDb($db);
+        
+        $this->invitation = $invitation;
+
+        if ($invitation instanceof InvoiceInvitation) {
+            $this->entity = $invitation->invoice;
+            $this->entity_string = 'invoice';
+        } elseif ($invitation instanceof QuoteInvitation) {
+            $this->entity = $invitation->quote;
+            $this->entity_string = 'quote';
+        } elseif ($invitation instanceof CreditInvitation) {
+            $this->entity = $invitation->credit;
+            $this->entity_string = 'credit';
+        } elseif ($invitation instanceof RecurringInvoiceInvitation) {
+            $this->entity = $invitation->recurring_invoice;
+            $this->entity_string = 'recurring_invoice';
+        }
+
+        $this->company = $invitation->company;
+
+        $this->contact = $invitation->contact;
+
+    }
+
+    public function handle()
+    {
+        
+        /* Forget the singleton*/
+        App::forgetInstance('translator');
+
+        /* Init a new copy of the translator*/
+        $t = app('translator');
+        /* Set the locale*/
+        App::setLocale($this->contact->preferredLocale());
+
+        /* Set customized translations _NOW_ */
+        $t->replace(Ninja::transformTranslations($this->entity->client->getMergedSettings()));
+
+        $entity_design_id = '';
+
+        if ($this->entity instanceof Invoice) {
+            $path = $this->entity->client->invoice_filepath($this->invitation);
+            $entity_design_id = 'invoice_design_id';
+        } elseif ($this->entity instanceof Quote) {
+            $path = $this->entity->client->quote_filepath($this->invitation);
+            $entity_design_id = 'quote_design_id';
+        } elseif ($this->entity instanceof Credit) {
+            $path = $this->entity->client->credit_filepath($this->invitation);
+            $entity_design_id = 'credit_design_id';
+        } elseif ($this->entity instanceof RecurringInvoice) {
+            $path = $this->entity->client->recurring_invoice_filepath($this->invitation);
+            $entity_design_id = 'invoice_design_id';
+        }
+
+        $file_path = $path.$this->entity->numberFormatter().'.pdf';
+
+        $entity_design_id = $this->entity->design_id ? $this->entity->design_id : $this->decodePrimaryKey($this->entity->client->getSetting($entity_design_id));
+
+        $design = Design::find($entity_design_id);
+
+        /* Catch all in case migration doesn't pass back a valid design */
+        if(!$design)
+            $design = Design::find(2);
+
+        $html = new HtmlEngine($this->invitation);
+
+        if ($design->is_custom) {
+            $options = [
+            'custom_partials' => json_decode(json_encode($design->design), true)
+          ];
+            $template = new PdfMakerDesign(PdfDesignModel::CUSTOM, $options);
+        } else {
+            $template = new PdfMakerDesign(strtolower($design->name));
+        }
+
+        $variables = $html->generateLabelsAndValues();
+
+        $state = [
+            'template' => $template->elements([
+                'client' => $this->entity->client,
+                'entity' => $this->entity,
+                'pdf_variables' => (array) $this->entity->company->settings->pdf_variables,
+                '$product' => $design->design->product,
+                'variables' => $variables,
+            ]),
+            'variables' => $variables,
+            'options' => [
+                'all_pages_header' => $this->entity->client->getSetting('all_pages_header'),
+                'all_pages_footer' => $this->entity->client->getSetting('all_pages_footer'),
+            ],
+            'process_markdown' => $this->entity->client->company->markdown_enabled,
+        ];
+
+        $maker = new PdfMakerService($state);
+
+        $maker
+            ->design($template)
+            ->build();
+
+        $pdf = null;
+
+        try {
+
+            if(config('ninja.invoiceninja_hosted_pdf_generation') || config('ninja.pdf_generator') == 'hosted_ninja'){
+                $pdf = (new NinjaPdf())->build($maker->getCompiledHTML(true));
+            }
+            else {
+                $pdf = $this->makePdf(null, null, $maker->getCompiledHTML(true));
+            }
+
+        } catch (\Exception $e) {
+            nlog(print_r($e->getMessage(), 1));
+        }
+
+        if (config('ninja.log_pdf_html')) {
+            info($maker->getCompiledHTML());
+        }
+
+        if ($pdf) 
+            return $pdf;
+
+        throw new FilePermissionsFailure("Unable to generate the raw PDF");
+
+    }
+
+    public function failed($e)
+    {
+
+    }
+    
+}