From 6ab461a212b67d87ae364e0b063da7c52a5edd12 Mon Sep 17 00:00:00 2001
From: Ahmed Bouhuolia <a.bouhuolia@gmail.com>
Date: Wed, 4 Dec 2024 12:00:22 +0200
Subject: [PATCH] feat: enhance discount and adjustment formatting

---
 .../src/services/CreditNotes/CreditNoteTransformer.ts       | 2 ++
 .../services/Purchases/Bills/PurchaseInvoiceTransformer.ts  | 2 ++
 .../Purchases/VendorCredits/VendorCreditTransformer.ts      | 2 ++
 .../src/services/Sales/Estimates/SaleEstimateTransformer.ts | 2 ++
 .../src/services/Sales/Invoices/SaleInvoiceTransformer.ts   | 6 ++++--
 .../src/services/Sales/Receipts/SaleReceiptTransformer.ts   | 2 ++
 .../Drawers/EstimateDetailDrawer/EstimateDetailHeader.tsx   | 2 +-
 .../EstimateDetailDrawer/EstimateDetailTableFooter.tsx      | 6 +++---
 .../InvoiceDetailDrawer/InvoiceDetailTableFooter.tsx        | 6 +++---
 .../VendorCreditDetailDrawerFooter.tsx                      | 6 +++---
 10 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/packages/server/src/services/CreditNotes/CreditNoteTransformer.ts b/packages/server/src/services/CreditNotes/CreditNoteTransformer.ts
index c136c463e..611d006ad 100644
--- a/packages/server/src/services/CreditNotes/CreditNoteTransformer.ts
+++ b/packages/server/src/services/CreditNotes/CreditNoteTransformer.ts
@@ -96,6 +96,7 @@ export class CreditNoteTransformer extends Transformer {
   protected discountAmountFormatted = (credit): string => {
     return formatNumber(credit.discountAmount, {
       currencyCode: credit.currencyCode,
+      excerptZero: true,
     });
   };
 
@@ -118,6 +119,7 @@ export class CreditNoteTransformer extends Transformer {
   protected adjustmentFormatted = (credit): string => {
     return this.formatMoney(credit.adjustment, {
       currencyCode: credit.currencyCode,
+      excerptZero: true,
     });
   };
 
diff --git a/packages/server/src/services/Purchases/Bills/PurchaseInvoiceTransformer.ts b/packages/server/src/services/Purchases/Bills/PurchaseInvoiceTransformer.ts
index 6fba33c2e..a6766a0db 100644
--- a/packages/server/src/services/Purchases/Bills/PurchaseInvoiceTransformer.ts
+++ b/packages/server/src/services/Purchases/Bills/PurchaseInvoiceTransformer.ts
@@ -171,6 +171,7 @@ export class PurchaseInvoiceTransformer extends Transformer {
   protected discountAmountFormatted = (bill): string => {
     return formatNumber(bill.discountAmount, {
       currencyCode: bill.currencyCode,
+      excerptZero: true,
     });
   };
 
@@ -193,6 +194,7 @@ export class PurchaseInvoiceTransformer extends Transformer {
   protected adjustmentFormatted = (bill): string => {
     return formatNumber(bill.adjustment, {
       currencyCode: bill.currencyCode,
+      excerptZero: true,
     });
   };
 
diff --git a/packages/server/src/services/Purchases/VendorCredits/VendorCreditTransformer.ts b/packages/server/src/services/Purchases/VendorCredits/VendorCreditTransformer.ts
index 594c6aa14..b42c90ea0 100644
--- a/packages/server/src/services/Purchases/VendorCredits/VendorCreditTransformer.ts
+++ b/packages/server/src/services/Purchases/VendorCredits/VendorCreditTransformer.ts
@@ -82,6 +82,7 @@ export class VendorCreditTransformer extends Transformer {
   protected discountAmountFormatted = (credit): string => {
     return formatNumber(credit.discountAmount, {
       currencyCode: credit.currencyCode,
+      excerptZero: true,
     });
   };
 
@@ -102,6 +103,7 @@ export class VendorCreditTransformer extends Transformer {
   protected adjustmentFormatted = (credit): string => {
     return formatNumber(credit.adjustment, {
       currencyCode: credit.currencyCode,
+      excerptZero: true,
     });
   };
 
diff --git a/packages/server/src/services/Sales/Estimates/SaleEstimateTransformer.ts b/packages/server/src/services/Sales/Estimates/SaleEstimateTransformer.ts
index dff7915ca..91e7d0ab5 100644
--- a/packages/server/src/services/Sales/Estimates/SaleEstimateTransformer.ts
+++ b/packages/server/src/services/Sales/Estimates/SaleEstimateTransformer.ts
@@ -111,6 +111,7 @@ export class SaleEstimateTransfromer extends Transformer {
   protected discountAmountFormatted = (estimate: ISaleEstimate): string => {
     return formatNumber(estimate.discountAmount, {
       currencyCode: estimate.currencyCode,
+      excerptZero: true,
     });
   };
 
@@ -133,6 +134,7 @@ export class SaleEstimateTransfromer extends Transformer {
   protected adjustmentFormatted = (estimate: ISaleEstimate): string => {
     return this.formatMoney(estimate.adjustment, {
       currencyCode: estimate.currencyCode,
+      excerptZero: true,
     });
   };
 
diff --git a/packages/server/src/services/Sales/Invoices/SaleInvoiceTransformer.ts b/packages/server/src/services/Sales/Invoices/SaleInvoiceTransformer.ts
index e54a59b72..05dce98b7 100644
--- a/packages/server/src/services/Sales/Invoices/SaleInvoiceTransformer.ts
+++ b/packages/server/src/services/Sales/Invoices/SaleInvoiceTransformer.ts
@@ -170,6 +170,7 @@ export class SaleInvoiceTransformer extends Transformer {
   protected discountAmountFormatted = (invoice): string => {
     return formatNumber(invoice.discountAmount, {
       currencyCode: invoice.currencyCode,
+      excerptZero: true,
     });
   };
 
@@ -192,8 +193,9 @@ export class SaleInvoiceTransformer extends Transformer {
   protected adjustmentFormatted = (invoice): string => {
     return this.formatMoney(invoice.adjustment, {
       currencyCode: invoice.currencyCode,
-    })
-  }
+      excerptZero: true,
+    });
+  };
 
   /**
    * Retrieves formatted total in foreign currency.
diff --git a/packages/server/src/services/Sales/Receipts/SaleReceiptTransformer.ts b/packages/server/src/services/Sales/Receipts/SaleReceiptTransformer.ts
index 4a92bc873..422e88e83 100644
--- a/packages/server/src/services/Sales/Receipts/SaleReceiptTransformer.ts
+++ b/packages/server/src/services/Sales/Receipts/SaleReceiptTransformer.ts
@@ -113,6 +113,7 @@ export class SaleReceiptTransformer extends Transformer {
   protected discountAmountFormatted = (receipt: ISaleReceipt): string => {
     return formatNumber(receipt.discountAmount, {
       currencyCode: receipt.currencyCode,
+      excerptZero: true,
     });
   };
 
@@ -135,6 +136,7 @@ export class SaleReceiptTransformer extends Transformer {
   protected adjustmentFormatted = (receipt: ISaleReceipt): string => {
     return this.formatMoney(receipt.adjustment, {
       currencyCode: receipt.currencyCode,
+      excerptZero: true,
     });
   };
 
diff --git a/packages/webapp/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailHeader.tsx b/packages/webapp/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailHeader.tsx
index a6ae51468..a448b8d96 100644
--- a/packages/webapp/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailHeader.tsx
+++ b/packages/webapp/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailHeader.tsx
@@ -30,7 +30,7 @@ export default function EstimateDetailHeader() {
       <CommercialDocTopHeader>
         <DetailsMenu>
           <AmountEstimateDetail label={intl.get('amount')}>
-            <span class="big-number">{estimate.formatted_amount}</span>
+            <span class="big-number">{estimate.total_formatted}</span>
           </AmountEstimateDetail>
 
           <EstimateStatusDetail>
diff --git a/packages/webapp/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailTableFooter.tsx b/packages/webapp/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailTableFooter.tsx
index ade4f2690..6533267b3 100644
--- a/packages/webapp/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailTableFooter.tsx
+++ b/packages/webapp/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailTableFooter.tsx
@@ -25,11 +25,11 @@ export default function EstimateDetailTableFooter() {
           value={estimate.formatted_subtotal}
           borderStyle={TotalLineBorderStyle.SingleDark}
         />
-        {estimate.discount_amount > 0 && (
+        {estimate?.discount_amount > 0 && (
           <TotalLine
             title={
               estimate.discount_percentage_formatted
-                ? `Discount [${invoice.discount_percentage_formatted}]`
+                ? `Discount [${estimate.discount_percentage_formatted}]`
                 : 'Discount'
             }
             value={estimate.discount_amount_formatted}
@@ -38,7 +38,7 @@ export default function EstimateDetailTableFooter() {
         )}
         <TotalLine
           title={<T id={'estimate.details.total'} />}
-          value={estimate.formatted_amount}
+          value={estimate.total_formatted}
           borderStyle={TotalLineBorderStyle.DoubleDark}
           textStyle={TotalLineTextStyle.Bold}
         />
diff --git a/packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailTableFooter.tsx b/packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailTableFooter.tsx
index 3d034b0c4..509d32f66 100644
--- a/packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailTableFooter.tsx
+++ b/packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailTableFooter.tsx
@@ -26,7 +26,7 @@ export function InvoiceDetailTableFooter() {
           value={invoice.subtotal_formatted}
           borderStyle={TotalLineBorderStyle.SingleDark}
         />
-        {invoice.discount_amount > 0 && (
+        {invoice?.discount_amount > 0 && (
           <TotalLine
             title={
               invoice.discount_percentage_formatted
@@ -37,14 +37,14 @@ export function InvoiceDetailTableFooter() {
             textStyle={TotalLineTextStyle.Regular}
           />
         )}
-        {invoice.adjustment > 0 && (
+        {invoice?.adjustment > 0 && (
           <TotalLine
             title="Adjustment"
             value={invoice.adjustment_formatted}
             textStyle={TotalLineTextStyle.Regular}
           />
         )}
-        {invoice.taxes.map((taxRate) => (
+        {invoice?.taxes?.map((taxRate) => (
           <TotalLine
             key={taxRate.id}
             title={`${taxRate.name} [${taxRate.tax_rate}%]`}
diff --git a/packages/webapp/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetailDrawerFooter.tsx b/packages/webapp/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetailDrawerFooter.tsx
index 9c81a3b36..271cb5c24 100644
--- a/packages/webapp/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetailDrawerFooter.tsx
+++ b/packages/webapp/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetailDrawerFooter.tsx
@@ -25,11 +25,11 @@ export default function VendorCreditDetailDrawerFooter() {
           value={vendorCredit.formatted_subtotal}
           borderStyle={TotalLineBorderStyle.SingleDark}
         />
-        {vendorCredit.discount_amount > 0 && (
+        {vendorCredit.discount_amount_formatted && (
           <TotalLine
             title={
-              bill.discount_percentage_formatted
-                ? `Discount [${bill.discount_percentage_formatted}]`
+              vendorCredit.discount_percentage_formatted
+                ? `Discount [${vendorCredit.discount_percentage_formatted}]`
                 : 'Discount'
             }
             value={vendorCredit.discount_amount_formatted}