Merge pull request #744 from bigcapitalhq/fix-due-invoice-server-invoice

fix: due invoice server invoice

packages/server/src/interfaces/SaleInvoice.ts

@@ -338,21 +338,22 @@ export interface InvoicePdfTemplateAttributes {
   subtotalLabel: string;
   discountLabel: string;
   paymentMadeLabel: string;
-  balanceDueLabel: string;
 
   showTotal: boolean;
   showSubtotal: boolean;
   showDiscount: boolean;
   showTaxes: boolean;
   showPaymentMade: boolean;
-  showDueAmount: boolean;
-  showBalanceDue: boolean;
 
   total: string;
   subtotal: string;
   discount: string;
   paymentMade: string;
-  balanceDue: string;
+
+  // Due Amount
+  dueAmount: string;
+  showDueAmount: boolean;
+  dueAmountLabel: string;
 
   termsConditionsLabel: string;
   showTermsConditions: boolean;

packages/server/src/services/Sales/Invoices/SaleInvoicePdf.ts

@@ -19,9 +19,6 @@ export class SaleInvoicePdf {
   @Inject()
   private chromiumlyTenancy: ChromiumlyTenancy;
 
-  @Inject()
-  private templateInjectable: TemplateInjectable;
-
   @Inject()
   private getInvoiceService: GetSaleInvoice;
 

packages/server/src/services/Sales/Invoices/utils.ts

@@ -27,7 +27,7 @@ export const transformInvoiceToPdfTemplate = (
     total: invoice.totalFormatted,
     subtotal: invoice.subtotalFormatted,
     paymentMade: invoice.paymentAmountFormatted,
-    balanceDue: invoice.balanceAmountFormatted,
+    dueAmount: invoice.dueAmountFormatted,
 
     termsConditions: invoice.termsConditions,
     statement: invoice.invoiceMessage,

shared/pdf-templates/src/components/InvoicePaperTemplate.tsx

@@ -71,10 +71,12 @@ export interface InvoicePaperTemplateProps extends PaperTemplateProps {
   totalLabel?: string;
   total?: string;
 
+  // Discount
   showDiscount?: boolean;
   discountLabel?: string;
   discount?: string;
 
+  // Subtotal
   showSubtotal?: boolean;
   subtotalLabel?: string;
   subtotal?: string;
@@ -85,10 +87,10 @@ export interface InvoicePaperTemplateProps extends PaperTemplateProps {
 
   showTaxes?: boolean;
 
+  // Due Amount
   showDueAmount?: boolean;
-  showBalanceDue?: boolean;
-  balanceDueLabel?: string;
-  balanceDue?: string;
+  dueAmountLabel?: string;
+  dueAmount?: string;
 
   // Footer
   termsConditionsLabel?: string;
@@ -144,7 +146,7 @@ export function InvoicePaperTemplate({
   subtotalLabel = 'Subtotal',
   discountLabel = 'Discount',
   paymentMadeLabel = 'Payment Made',
-  balanceDueLabel = 'Balance Due',
+  dueAmountLabel = 'Balance Due',
 
   // Totals
   showTotal = true,
@@ -153,13 +155,12 @@ export function InvoicePaperTemplate({
   showTaxes = true,
   showPaymentMade = true,
   showDueAmount = true,
-  showBalanceDue = true,
 
   total = '$662.75',
   subtotal = '630.00',
   discount = '0.00',
   paymentMade = '100.00',
-  balanceDue = '$562.75',
+  dueAmount = '$562.75',
 
   // Footer paragraphs.
   termsConditionsLabel = 'Terms & Conditions',
@@ -297,10 +298,10 @@ export function InvoicePaperTemplate({
                 amount={paymentMade}
               />
             )}
-            {showBalanceDue && (
+            {showDueAmount && (
               <PaperTemplate.TotalLine
-                label={balanceDueLabel}
-                amount={balanceDue}
+                label={dueAmountLabel}
+                amount={dueAmount}
                 border={PaperTemplateTotalBorder.Dark}
                 style={{ fontWeight: 500 }}
               />