TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-27 11:41:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'invoice-custom-field' into 'master'

Browse Source 
fix custom field invoice issue

See merge request mohit.panjvani/crater-web!1432
This commit is contained in:
Mohit Panjwani
2022-01-27 10:27:31 +00:00
parent 221184df41 30f36461c2
commit f594556de0
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Resources/Customer/InvoiceResource.php
View File

@ -46,6 +46,7 @@ class InvoiceResource extends JsonResource
'base_due_amount' => $this->base_due_amount,
'currency_id' => $this->currency_id,
'formatted_created_at' => $this->formattedCreatedAt,
'formatted_notes' => $this->formattedNotes,
'invoice_pdf_url' => $this->invoicePdfUrl,
'formatted_invoice_date' => $this->formattedInvoiceDate,
'formatted_due_date' => $this->formattedDueDate,

5
app/Models/Invoice.php
View File

@ -166,6 +166,11 @@ class Invoice extends Model implements HasMedia
}
}
public function getFormattedNotesAttribute($value)
{
return $this->getNotes();
}
public function getFormattedCreatedAtAttribute($value)
{
$dateFormat = CompanySetting::getSetting('carbon_date_format', $this->company_id);

4
resources/scripts/components/InvoiceInformationCard.vue
View File

@ -48,14 +48,14 @@
</dd>
</div>
<div
v-if="invoice.notes"
v-if="invoice.formatted_notes"
class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6"
>
<dt class="text-sm font-medium text-gray-500">
{{ $t('invoices.notes') }}
</dt>
<dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
<span v-html="invoice.notes"></span>
<span v-html="invoice.formatted_notes"></span>
</dd>
</div>
</dl>