Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-03 03:04:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for self hosted setup

Browse Source
This commit is contained in:
David Bomba 2022-05-26 12:00:53 +10:00
parent e09f1abf73
commit f5e24de767
3 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
app/Http/Controllers/SetupController.php
View File

@ -48,14 +48,14 @@ class SetupController extends Controller
public function index() public function index()
{ {
$check = SystemHealth::check(false); $check = SystemHealth::check(false);
if ($check['system_health'] == true && $check['simple_db_check'] && Schema::hasTable('accounts') && $account = Account::all()->first()) { if ($check['system_health'] == true && $check['simple_db_check'] && Schema::hasTable('accounts') && $account = Account::first()) {
return redirect('/'); return redirect('/');
} }
if(Ninja::isHosted()) if(Ninja::isHosted())
return redirect('/'); return redirect('/');
return view('setup.index', ['check' => $check]); return view('setup.index', ['check' => $check]);
} }
@ -211,29 +211,31 @@ class SetupController extends Controller
public function checkPdf(Request $request) public function checkPdf(Request $request)
{ {
try { try {
if (config('ninja.pdf_generator') == 'phantom') {
return $this->testPhantom();
}
$pdf = new Snappdf(); // if (config('ninja.pdf_generator') == 'phantom') {
// return $this->testPhantom();
// }
if (config('ninja.snappdf_chromium_path')) { // $pdf = new Snappdf();
$pdf->setChromiumPath(config('ninja.snappdf_chromium_path'));
}
if (config('ninja.snappdf_chromium_arguments')) { // if (config('ninja.snappdf_chromium_path')) {
$pdf->clearChromiumArguments(); // $pdf->setChromiumPath(config('ninja.snappdf_chromium_path'));
$pdf->addChromiumArguments(config('ninja.snappdf_chromium_arguments')); // }
}
$pdf = $pdf // if (config('ninja.snappdf_chromium_arguments')) {
->setHtml('GENERATING PDFs WORKS! Thank you for using Invoice Ninja!') // $pdf->clearChromiumArguments();
->generate(); // $pdf->addChromiumArguments(config('ninja.snappdf_chromium_arguments'));
// }
Storage::disk(config('filesystems.default'))->put('test.pdf', $pdf); // $pdf = $pdf
Storage::disk('local')->put('test.pdf', $pdf); // ->setHtml('GENERATING PDFs WORKS! Thank you for using Invoice Ninja!')
// ->generate();
return response(['url' => Storage::disk('local')->url('test.pdf')], 200); // Storage::disk(config('filesystems.default'))->put('test.pdf', $pdf);
// Storage::disk('local')->put('test.pdf', $pdf);
return response(['url' => ''], 200);
// return response(['url' => Storage::disk('local')->url('test.pdf')], 200);
} catch (Exception $e) { } catch (Exception $e) {
nlog($e->getMessage()); nlog($e->getMessage());

16
app/Utils/SystemHealth.php
View File

@ -77,7 +77,7 @@ class SystemHealth
'open_basedir' => (bool)self::checkOpenBaseDir(), 'open_basedir' => (bool)self::checkOpenBaseDir(),
'mail_mailer' => (string)self::checkMailMailer(), 'mail_mailer' => (string)self::checkMailMailer(),
'flutter_renderer' => (string)config('ninja.flutter_canvas_kit'), 'flutter_renderer' => (string)config('ninja.flutter_canvas_kit'),
'jobs_pending' => (int) Queue::size(), 'jobs_pending' => (int) self::checkQueueSize(),
'pdf_engine' => (string) self::getPdfEngine(), 'pdf_engine' => (string) self::getPdfEngine(),
'queue' => (string) config('queue.default'), 'queue' => (string) config('queue.default'),
'trailing_slash' => (bool) self::checkUrlState(), 'trailing_slash' => (bool) self::checkUrlState(),
@ -85,6 +85,20 @@ class SystemHealth
]; ];
} }
private static function checkQueueSize()
{
$count = 0;
try{
$count = Queue::size();
}
catch(\Exception $e){
}
return $count;
}
public static function checkFileSystem() public static function checkFileSystem()
{ {

4
resources/views/setup/_application.blade.php
View File

@ -52,10 +52,6 @@
<dd class="text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2"> <dd class="text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
<div class="alert py-2 bg-white" id="test-pdf-response"></div> <div class="alert py-2 bg-white" id="test-pdf-response"></div>
</dd> </dd>
<a target="_blank" class="block text-sm text-gray-900 leading-5 underline"
href="https://invoiceninja.github.io/docs/self-host-troubleshooting/#pdf-conversion-issues">
{{ ctrans('texts.setup_phantomjs_note') }}
</a>
</div> </div>
</dl> </dl>
</div> </div>