Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for getting first contact/primary

Browse Source
This commit is contained in:
David Bomba 2022-03-07 08:53:32 +11:00
parent a3dae762d0
commit 2b145e8833
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/ClientPortal/NinjaPlanController.php
View File

@ -163,7 +163,7 @@ class NinjaPlanController extends Controller
$recurring_invoice->service()->start();
return redirect('/');
return redirect('https://invoicing.co');
}

2
app/Services/Credit/GetCreditPdf.php
View File

@ -34,7 +34,7 @@ class GetCreditPdf extends AbstractService
public function run()
{
if (! $this->contact) {
$this->contact = $this->credit->client->primary_contact()->first();
$this->contact = $this->credit->client->primary_contact()->first() ?: $this->credit->client->contacts()->first();
}
$path = $this->credit->client->credit_filepath($this->invitation);

2
app/Services/Invoice/GetInvoicePdf.php
View File

@ -30,7 +30,7 @@ class GetInvoicePdf extends AbstractService
public function run()
{
if (! $this->contact) {
$this->contact = $this->invoice->client->primary_contact()->first();
$this->contact = $this->invoice->client->primary_contact()->first() ?: $this->invoice->client->contacts()->first();
}
$invitation = $this->invoice->invitations->where('client_contact_id', $this->contact->id)->first();

2
app/Services/Quote/GetQuotePdf.php
View File

@ -30,7 +30,7 @@ class GetQuotePdf extends AbstractService
public function run()
{
if (! $this->contact) {
$this->contact = $this->quote->client->primary_contact()->first();
$this->contact = $this->quote->client->primary_contact()->first() ?: $this->quote->client->contacts()->first();
}
$invitation = $this->quote->invitations->where('client_contact_id', $this->contact->id)->first();

2
resources/views/portal/ninja2020/layout/app.blade.php
View File

@ -57,7 +57,7 @@
<!-- Styles -->
<link href="{{ mix('css/app.css') }}" rel="stylesheet">
@if(!auth()->guard('contact')->user()->user->account->isPaid())
@if(auth()->guard('contact')->user() && !auth()->guard('contact')->user()->user->account->isPaid())
<link href="{{ asset('favicon.png') }}" rel="shortcut icon" type="image/png">
@endif