Merge pull request #5706 from turbo124/v5-develop

Don't store PDFs

app/Http/Controllers/ClientPortal/InvoiceController.php

@@ -164,10 +164,10 @@ class InvoiceController extends Controller
 
         //if only 1 pdf, output to buffer for download
         if ($invoices->count() == 1) {
-            return response()->streamDownload(function () use ($invoices) {
+
-                echo file_get_contents($invoices->first()->pdf_file_path());
+           $file = $invoices->first()->pdf_file_path();
-            }, basename($invoices->first()->pdf_file_path()), ['Cache-Control:' => 'no-cache']);
+           return response()->download($file, basename($file), ['Cache-Control:' => 'no-cache'])->deleteFileAfterSend(true);;
-            //return response()->download(TempFile::path($invoices->first()->pdf_file_path()), basename($invoices->first()->pdf_file_path()));
+
         }
 
         // enable output of HTTP headers

app/Http/Controllers/ClientPortal/QuoteController.php

@@ -76,10 +76,9 @@ class QuoteController extends Controller
         }
 
         if ($quotes->count() == 1) {
-            return response()->streamDownload(function () use ($quotes) {
+
-                echo file_get_contents($quotes->first()->pdf_file_path());
+           $file = $quotes->first()->pdf_file_path();
-            }, basename($quotes->first()->pdf_file_path()), ['Cache-Control:' => 'no-cache']);
+           return response()->download($file, basename($file), ['Cache-Control:' => 'no-cache'])->deleteFileAfterSend(true);
-            //return response()->download(TempFile::path($invoices->first()->pdf_file_path()), basename($quotes->first()->pdf_file_path()));
         }
 
         // enable output of HTTP headers

app/Http/Controllers/CreditController.php

@@ -536,10 +536,8 @@ class CreditController extends BaseController
                 }
                 break;
             case 'download':    
-                    return response()->streamDownload(function () use ($credit) {
+                $file = $credit->pdf_file_path();
-                        echo file_get_contents($credit->pdf_file_path());
+                return response()->download($file, basename($file), ['Cache-Control:' => 'no-cache'])->deleteFileAfterSend(true);
-                    }, basename($credit->pdf_file_path()), ['Cache-Control:' => 'no-cache']);
-                //return response()->download(TempFile::path($credit->pdf_file_path()), basename($credit->pdf_file_path()));
               break;
             case 'archive':
                 $this->credit_repository->archive($credit);
@@ -589,7 +587,7 @@ class CreditController extends BaseController
 
         $file_path = $credit->service()->getCreditPdf($invitation);
 
-        return response()->download($file_path, basename($file_path), ['Cache-Control:' => 'no-cache']);
+        return response()->download($file_path, basename($file_path), ['Cache-Control:' => 'no-cache'])->deleteFileAfterSend(true);
     }
 
     /**

app/Http/Controllers/InvoiceController.php

@@ -671,10 +671,10 @@ class InvoiceController extends BaseController
                 }
                 break;
             case 'download':
-                    return response()->streamDownload(function () use ($invoice) {
+
-                        echo file_get_contents($invoice->pdf_file_path());
+               $file = $invoice->pdf_file_path();
-                    }, basename($invoice->pdf_file_path()), ['Cache-Control:' => 'no-cache']);
+               return response()->download($file, basename($file), ['Cache-Control:' => 'no-cache'])->deleteFileAfterSend(true);
-                    //return response()->download(TempFile::path($invoice->pdf_file_path()), basename($invoice->pdf_file_path()));
+
                 break;
             case 'restore':
                 $this->invoice_repo->restore($invoice);
@@ -793,9 +793,10 @@ class InvoiceController extends BaseController
         $contact = $invitation->contact;
         $invoice = $invitation->invoice;
 
-        $file_path = $invoice->service()->getInvoicePdf($contact);
+        $file = $invoice->service()->getInvoicePdf($contact);
+
+        return response()->download($file, basename($file), ['Cache-Control:' => 'no-cache'])->deleteFileAfterSend(true);;
 
-        return response()->download($file_path, basename($file_path), ['Cache-Control:' => 'no-cache']);
     }
 
     /**
@@ -844,12 +845,10 @@ class InvoiceController extends BaseController
      */
     public function deliveryNote(ShowInvoiceRequest $request, Invoice $invoice)
     {
-        $file_path = $invoice->service()->getInvoiceDeliveryNote($invoice, $invoice->invitations->first()->contact);
+        $file = $invoice->service()->getInvoiceDeliveryNote($invoice, $invoice->invitations->first()->contact);
         
         try {
-            $file = public_path("storage/{$file_path}");
+       return response()->download($file, basename($file), ['Cache-Control:' => 'no-cache'])->deleteFileAfterSend(true);
-
-            return response()->download($file, basename($file), ['Cache-Control:' => 'no-cache']);
         } catch (\Exception $e) {
             return response(['message' => 'Oops, something went wrong. Make sure you have symlink to storage/ in public/ directory.'], 500);
         }

app/Http/Controllers/QuoteController.php

@@ -675,10 +675,10 @@ class QuoteController extends BaseController
                 // code...
                 break;
             case 'download':
-                    return response()->streamDownload(function () use ($quote) {
+
-                        echo file_get_contents($quote->pdf_file_path());
+               $file = $quote->pdf_file_path();
-                    }, basename($quote->pdf_file_path()), ['Cache-Control:' => 'no-cache']);
+               return response()->download($file, basename($file), ['Cache-Control:' => 'no-cache'])->deleteFileAfterSend(true);
-                    //return response()->download(TempFile::path($quote->pdf_file_path()), basename($quote->pdf_file_path()));
+
                 break;
             case 'restore':
                 $this->quote_repo->restore($quote);
@@ -730,7 +730,7 @@ class QuoteController extends BaseController
 
         $file_path = $quote->service()->getQuotePdf($contact);
 
-        return response()->download($file_path, basename($file_path), ['Cache-Control:' => 'no-cache']);
+        return response()->download($file_path, basename($file_path), ['Cache-Control:' => 'no-cache'])->deleteFileAfterSend(true);
     }
 
     /**

app/Http/Controllers/RecurringInvoiceController.php

@@ -497,7 +497,7 @@ class RecurringInvoiceController extends BaseController
 
         $file_path = $recurring_invoice->service()->getInvoicePdf($contact);
 
-        return response()->download($file_path, basename($file_path), ['Cache-Control:' => 'no-cache']);
+        return response()->download($file_path, basename($file_path), ['Cache-Control:' => 'no-cache'])->deleteFileAfterSend(true);
     }
 
     /**

app/Jobs/Entity/CreateEntityPdf.php

@@ -86,7 +86,9 @@ class CreateEntityPdf implements ShouldQueue
 
         $this->contact = $invitation->contact;
 
-        $this->disk = $disk ?? config('filesystems.default');
+        $this->disk = 'public';
+        
+        // $this->disk = $disk ?? config('filesystems.default');
     }
 
     public function handle()

app/Jobs/Invoice/ZipInvoices.php

@@ -83,23 +83,24 @@ class ZipInvoices implements ShouldQueue
         $zip = new ZipStream($file_name, $options);
 
         foreach ($this->invoices as $invoice) {
-            $zip->addFileFromPath(basename($invoice->pdf_file_path()), TempFile::path($invoice->pdf_file_path()));
+            //$zip->addFileFromPath(basename($invoice->pdf_file_path()), TempFile::path($invoice->pdf_file_path()));
+            $zip->addFileFromPath(basename($invoice->pdf_file_path()), $invoice->pdf_file_path());
         }
 
         $zip->finish();
 
-        Storage::disk(config('filesystems.default'))->put($path.$file_name, $tempStream);
+        Storage::disk('public')->put($path.$file_name, $tempStream);
 
         fclose($tempStream);
 
         $nmo = new NinjaMailerObject;
-        $nmo->mailable = new DownloadInvoices(Storage::disk(config('filesystems.default'))->url($path.$file_name), $this->company);
+        $nmo->mailable = new DownloadInvoices(Storage::disk('public')->url($path.$file_name), $this->company);
         $nmo->to_user = $this->user;
         $nmo->settings = $this->settings;
         $nmo->company = $this->company;
         
         NinjaMailerJob::dispatch($nmo);
         
-        UnlinkFile::dispatch(config('filesystems.default'), $path.$file_name)->delay(now()->addHours(1));
+        UnlinkFile::dispatch('public', $path.$file_name)->delay(now()->addHours(1));
     }
 }

app/Jobs/Util/UnlinkFile.php

@@ -39,8 +39,6 @@ class UnlinkFile implements ShouldQueue
      */
     public function handle()
     {
-        // nlog("deleting");
-        // nlog($this->file_path);
         Storage::disk($this->disk)->delete($this->file_path);
     }
 }

app/Models/BaseModel.php

@@ -13,12 +13,14 @@ namespace App\Models;
 
 use App\DataMapper\ClientSettings;
 use App\DataMapper\CompanySettings;
+use App\Jobs\Entity\CreateEntityPdf;
 use App\Utils\Traits\MakesHash;
 use App\Utils\Traits\UserSessionAttributes;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\ModelNotFoundException as ModelNotFoundException;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\Storage;
 
 
 /**
@@ -199,4 +201,5 @@ class BaseModel extends Model
 
         return $formatted_number;
     }
+
 }

app/Models/Credit.php

@@ -251,25 +251,29 @@ class Credit extends BaseModel
         $this->save();
     }
 
-    public function pdf_file_path($invitation = null)
+    public function pdf_file_path($invitation = null, string $type = 'url')
     {
-        $storage_path = Storage::url($this->client->credit_filepath().$this->numberFormatter().'.pdf');
-
-        if (Storage::exists($this->client->credit_filepath().$this->numberFormatter().'.pdf')) {
-            return $storage_path;
-        }
-
         if (! $invitation) {
-            event(new CreditWasUpdated($this, $this->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
+
-            CreateEntityPdf::dispatchNow($this->invitations->first());
+            if($this->invitations()->exists())
-        } else {
+                $invitation = $this->invitations()->first();
-            event(new CreditWasUpdated($this, $this->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
+            else{
-            CreateEntityPdf::dispatchNow($invitation);
+                $this->service()->createInvitations();
+                $invitation = $this->invitations()->first();
             }
 
-        return $storage_path;
         }
 
+        if(!$invitation)
+            throw new \Exception('Hard fail, could not create an invitation - is there a valid contact?');
+
+        
+        $file_path = CreateEntityPdf::dispatchNow($invitation);
+
+        return Storage::disk('public')->path($file_path);
+    }
+
+
     public function markInvitationsSent()
     {
         $this->invitations->each(function ($invitation) {

app/Models/Expense.php

@@ -96,4 +96,9 @@ class Expense extends BaseModel
     {
         return $this->belongsTo(Vendor::class);
     }
+
+    public function client()
+    {
+        return $this->belongsTo(Client::class);
+    }
 }

app/Models/Invoice.php

@@ -408,21 +408,12 @@ class Invoice extends BaseModel
         if(!$invitation)
             throw new \Exception('Hard fail, could not create an invitation - is there a valid contact?');
 
-        $storage_path = Storage::$type($this->client->invoice_filepath().$this->numberFormatter().'.pdf');
         
-        if (! Storage::exists($this->client->invoice_filepath().$this->numberFormatter().'.pdf')) {
+        $file_path = CreateEntityPdf::dispatchNow($invitation);
-            event(new InvoiceWasUpdated($this, $this->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
+
-            CreateEntityPdf::dispatchNow($invitation);
+        return Storage::disk('public')->path($file_path);
     }
 
-nlog($storage_path);
-
-        return $storage_path;
-    }
-
-    /**
-     * Updates Invites to SENT.
-     */
     public function markInvitationsSent()
     {
         $this->invitations->each(function ($invitation) {

app/Models/Quote.php

@@ -210,22 +210,25 @@ class Quote extends BaseModel
     public function pdf_file_path($invitation = null, string $type = 'url')
     {
         if (! $invitation) {
-            $invitation = $this->invitations->first();
+
+            if($this->invitations()->exists())
+                $invitation = $this->invitations()->first();
+            else{
+                $this->service()->createInvitations();
+                $invitation = $this->invitations()->first();
             }
 
-        $storage_path = Storage::$type($this->client->quote_filepath().$this->numberFormatter().'.pdf');
-
-        nlog($storage_path);
-
-        if (! Storage::exists($this->client->quote_filepath().$this->numberFormatter().'.pdf')) {
-            event(new QuoteWasUpdated($this, $this->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
-            CreateEntityPdf::dispatchNow($invitation);
         }
 
-        return $storage_path;
+        if(!$invitation)
-    }
+            throw new \Exception('Hard fail, could not create an invitation - is there a valid contact?');
 
         
+        $file_path = CreateEntityPdf::dispatchNow($invitation);
+
+        return Storage::disk('public')->path($file_path);
+    }
+
 
     /**
      * @param int $status

app/Services/Invoice/GenerateDeliveryNote.php

@@ -20,7 +20,6 @@ use App\Services\PdfMaker\PdfMaker as PdfMakerService;
 use App\Utils\HostedPDF\NinjaPdf;
 use App\Utils\HtmlEngine;
 use App\Utils\PhantomJS\Phantom;
-use App\Utils\TempFile;
 use App\Utils\Traits\MakesHash;
 use App\Utils\Traits\Pdf\PdfMaker;
 use Illuminate\Support\Facades\Storage;
@@ -50,7 +49,9 @@ class GenerateDeliveryNote
 
         $this->contact = $contact;
 
-        $this->disk = $disk ?? config('filesystems.default');
+        $this->disk = 'public';
+
+        // $this->disk = $disk ?? config('filesystems.default');
     }
 
     public function run()
@@ -106,10 +107,7 @@ class GenerateDeliveryNote
 
         Storage::disk($this->disk)->put($file_path, $pdf);
 
-        /* Copy from remote disk to local when using cloud file storage. */
+        return Storage::disk($this->disk)->path($file_path);
-        if(config('filesystems.default') == 's3')
-            return TempFile::path(Storage::disk($this->disk)->url($file_path));
 
-        return $file_path;
     }
 }

app/Services/Invoice/GetInvoicePdf.php

@@ -39,7 +39,9 @@ class GetInvoicePdf extends AbstractService
 
         $file_path = $path.$this->invoice->numberFormatter().'.pdf';
 
-        $disk = config('filesystems.default');
+        $disk = 'public';
+
+        // $disk = config('filesystems.default');
 
         $file = Storage::disk($disk)->exists($file_path);
 
@@ -47,10 +49,9 @@ class GetInvoicePdf extends AbstractService
             $file_path = CreateEntityPdf::dispatchNow($invitation);
         }
 
-
+        // /* Copy from remote disk to local when using cloud file storage. */
-        /* Copy from remote disk to local when using cloud file storage. */
+        // if(config('filesystems.default') == 's3')
-        if(config('filesystems.default') == 's3')
+        //     return TempFile::path(Storage::disk($disk)->url($file_path));
-            return TempFile::path(Storage::disk($disk)->url($file_path));
 
         // return Storage::disk($disk)->url($file_path);
         return Storage::disk($disk)->path($file_path);

tests/Feature/PdfCreatorTest.php

@@ -40,20 +40,20 @@ class PdfCreatorTest extends TestCase
     {
         $credit_path = CreateEntityPdf::dispatchNow($this->credit->invitations->first());
     
-        $this->assertTrue(Storage::exists($this->client->credit_filepath().$this->credit->number.'.pdf'));
+        $this->assertTrue(Storage::disk('public')->exists($credit_path));
     }
 
     public function testInvoicePdfCreated()
     {
         $invoice_path = CreateEntityPdf::dispatchNow($this->invoice->invitations->first());
 
-        $this->assertTrue(Storage::exists($this->client->invoice_filepath().$this->invoice->number.'.pdf'));
+        $this->assertTrue(Storage::disk('public')->exists($invoice_path));
         }
 
     public function testQuotePdfCreated()
     {
         $quote_path = CreateEntityPdf::dispatchNow($this->quote->invitations->first());
     
-        $this->assertTrue(Storage::exists($this->client->quote_filepath().$this->quote->number.'.pdf'));
+        $this->assertTrue(Storage::disk('public')->exists($quote_path));
     }
 }