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

minor fixes

Browse Source
This commit is contained in:
David Bomba 2021-07-18 08:43:07 +10:00
parent a1e9de5807
commit 0f10c4b8dd
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Services/Subscription/SubscriptionService.php
View File

@ -940,7 +940,7 @@ class SubscriptionService
'subscription' => $this->subscription->hashed_id, 'subscription' => $this->subscription->hashed_id,
'recurring_invoice' => $recurring_invoice_hashed_id, 'recurring_invoice' => $recurring_invoice_hashed_id,
'client' => $invoice->client->hashed_id, 'client' => $invoice->client->hashed_id,
'contact' => $invoice->client->primary_contact()->first()->hashed_id, 'contact' => $invoice->client->primary_contact()->first() ? $invoice->client->contacts->first() : false,
'invoice' => $invoice->hashed_id, 'invoice' => $invoice->hashed_id,
]; ];

24
resources/views/portal/ninja2020/invoices/payment.blade.php
View File

@ -48,18 +48,28 @@
@endif @endif
<div class="px-4 py-5 bg-white sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6"> <div class="px-4 py-5 bg-white sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
@if($invoice->po_number)
<dt class="text-sm font-medium leading-5 text-gray-500">
{{ ctrans('texts.po_number') }}
</dt>
<dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
{{ $invoice->po_number }}
</dd>
@elseif($invoice->public_notes)
<dt class="text-sm font-medium leading-5 text-gray-500">
{{ ctrans('texts.public_notes') }}
</dt>
<dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
{{ $invoice->public_notes }}
</dd>
@else
<dt class="text-sm font-medium leading-5 text-gray-500"> <dt class="text-sm font-medium leading-5 text-gray-500">
{{ ctrans('texts.invoice_date') }} {{ ctrans('texts.invoice_date') }}
</dt> </dt>
<dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2"> <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
@if($invoice->po_number) {{ $invoice->date }}
{{ $invoice->po_number }}
@elseif($invoice->public_notes)
{{ $invoice->public_notes }}
@else
{{ $invoice->date}}
@endif
</dd> </dd>
@endif
</div> </div>
@if(!empty($invoice->due_date) && !is_null($invoice->due_date)) @if(!empty($invoice->due_date) && !is_null($invoice->due_date))