Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-03 23:17:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes for resolution of backup HTML documents

Browse Source
This commit is contained in:
David Bomba 2021-10-24 19:27:12 +11:00
parent 52a259147b
commit 5bd79c4046
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/ActivityController.php
View File

@ -15,6 +15,7 @@ use App\Http\Requests\Activity\DownloadHistoricalEntityRequest;
use App\Models\Activity; use App\Models\Activity;
use App\Transformers\ActivityTransformer; use App\Transformers\ActivityTransformer;
use App\Utils\HostedPDF\NinjaPdf; use App\Utils\HostedPDF\NinjaPdf;
use App\Utils\Ninja;
use App\Utils\PhantomJS\Phantom; use App\Utils\PhantomJS\Phantom;
use App\Utils\Traits\Pdf\PdfMaker; use App\Utils\Traits\Pdf\PdfMaker;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
@ -147,7 +148,12 @@ class ActivityController extends BaseController
*/ */
if($backup && $backup->filename && Storage::disk(config('filesystems.default'))->exists($backup->filename)){ //disk if($backup && $backup->filename && Storage::disk(config('filesystems.default'))->exists($backup->filename)){ //disk
if(Ninja::isHosted())
$html_backup = file_get_contents(Storage::disk(config('filesystems.default'))->url($backup->filename));
else
$html_backup = file_get_contents(Storage::disk(config('filesystems.default'))->path($backup->filename)); $html_backup = file_get_contents(Storage::disk(config('filesystems.default'))->path($backup->filename));
} }
elseif($backup && $backup->html_backup){ //db elseif($backup && $backup->html_backup){ //db
$html_backup = $backup->html_backup; $html_backup = $backup->html_backup;