QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-22 07:40:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: invoice pdf document

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2023-11-30 13:49:43 +02:00
parent 5a958cc9fa
commit 30b5f8120a
5 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/server/resources/locales/en.json
View File

@@ -176,6 +176,7 @@
"invoice.paper.conditions_title": "Conditions & terms", "invoice.paper.conditions_title": "Conditions & terms",
"invoice.paper.notes_title": "Notes", "invoice.paper.notes_title": "Notes",
"invoice.paper.total": "Total", "invoice.paper.total": "Total",
"invoice.paper.subtotal": "Subtotal",
"invoice.paper.payment_amount": "Payment Amount", "invoice.paper.payment_amount": "Payment Amount",
"invoice.paper.balance_due": "Balance Due", "invoice.paper.balance_due": "Balance Due",

6
packages/server/resources/scss/modules/invoice.scss
View File

@@ -137,10 +137,14 @@
tbody tr.payment-amount td:last-child { tbody tr.payment-amount td:last-child {
color: red color: red
} }
tbody tr.blanace-due td { tbody tr.blanace-due td{
border-top: 3px double #666; border-top: 3px double #666;
font-weight: bold; font-weight: bold;
} }
tbody tr.total td {
border-top: 1px solid #666;
font-weight: bold;
}
} }
} }

21
packages/server/resources/views/modules/invoice-regular.pug
View File

@@ -22,12 +22,12 @@ block content
div.invoice__due-amount div.invoice__due-amount
div.label #{__('invoice.paper.invoice_amount')} div.label #{__('invoice.paper.invoice_amount')}
div.amount #{saleInvoice.formattedAmount} div.amount #{saleInvoice.totalFormatted}
div.invoice__meta div.invoice__meta
div.invoice__meta-item.invoice__meta-item--amount div.invoice__meta-item.invoice__meta-item--amount
span.label #{__('invoice.paper.due_amount')} span.label #{__('invoice.paper.due_amount')}
span.value #{saleInvoice.formattedDueAmount} span.value #{saleInvoice.dueAmountFormatted}
div.invoice__meta-item.invoice__meta-item--billed-to div.invoice__meta-item.invoice__meta-item--billed-to
span.label #{__("invoice.paper.billed_to")} span.label #{__("invoice.paper.billed_to")}
@@ -35,11 +35,11 @@ block content
div.invoice__meta-item.invoice__meta-item--invoice-date div.invoice__meta-item.invoice__meta-item--invoice-date
span.label #{__("invoice.paper.invoice_date")} span.label #{__("invoice.paper.invoice_date")}
span.value #{saleInvoice.formattedInvoiceDate} span.value #{saleInvoice.invoiceDateFormatted}
div.invoice__meta-item.invoice__meta-item--due-date div.invoice__meta-item.invoice__meta-item--due-date
span.label #{__("invoice.paper.due_date")} span.label #{__("invoice.paper.due_date")}
span.value #{saleInvoice.formattedDueDate} span.value #{saleInvoice.dueDateFormatted}
div.invoice__table div.invoice__table
table table
@@ -63,15 +63,22 @@ block content
div.invoice__table-total div.invoice__table-total
table table
tbody tbody
tr.subtotal
td #{__('invoice.paper.subtotal')}
td #{saleInvoice.subtotalFormatted}
each tax in saleInvoice.taxes
tr.tax_line
td #{tax.name} [#{tax.taxRate}%]
td #{tax.taxRateAmountFormatted}
tr.total tr.total
td #{__('invoice.paper.total')} td #{__('invoice.paper.total')}
td #{saleInvoice.formattedAmount} td #{saleInvoice.totalFormatted}
tr.payment-amount tr.payment-amount
td #{__('invoice.paper.payment_amount')} td #{__('invoice.paper.payment_amount')}
td #{saleInvoice.formattedPaymentAmount} td #{saleInvoice.paymentAmountFormatted}
tr.blanace-due tr.blanace-due
td #{__('invoice.paper.balance_due')} td #{__('invoice.paper.balance_due')}
td #{saleInvoice.formattedDueAmount} td #{saleInvoice.dueAmountFormatted}
div.invoice__footer div.invoice__footer
if saleInvoice.termsConditions if saleInvoice.termsConditions

6
packages/server/resources/views/modules/payment-receive-standard.pug
View File

@@ -45,9 +45,9 @@ block content
each entry in paymentReceive.entries each entry in paymentReceive.entries
tr tr
td.item=entry.invoice.invoiceNo td.item=entry.invoice.invoiceNo
td.date=entry.invoice.formattedInvoiceDate td.date=entry.invoice.invoiceDateFormatted
td.invoiceAmount=entry.invoice.formattedAmount td.invoiceAmount=entry.invoice.totalFormatted
td.paymentAmount=entry.invoice.formattedPaymentAmount td.paymentAmount=entry.invoice.paymentAmountFormatted
div.payment__table-after div.payment__table-after
div.payment__table-total div.payment__table-total

3
packages/server/src/services/Sales/Invoices/CommandSaleInvoiceValidators.ts
View File

@@ -21,6 +21,9 @@ export class CommandSaleInvoiceValidators {
/** /**
* Validate whether sale invoice number unqiue on the storage. * Validate whether sale invoice number unqiue on the storage.
* @param {number} tenantId -
* @param {string} invoiceNumber -
* @param {number} notInvoiceId -
*/ */
public async validateInvoiceNumberUnique( public async validateInvoiceNumberUnique(
tenantId: number, tenantId: number,