Merge pull request #761 from bigcapitalhq/fix-total-lines-style

fix: total lines style
bigcapitalhq · Dec 4, 2024 · 391dc77 · 391dc77
2 parents 5a5eac2 + 38f2004
commit 391dc77
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 18 deletions.
diff --git a/packages/server/src/services/Sales/Receipts/SaleReceiptTransformer.ts b/packages/server/src/services/Sales/Receipts/SaleReceiptTransformer.ts
@@ -49,7 +49,7 @@ export class SaleReceiptTransformer extends Transformer {
 
   /**
    * Retrieve formatted receipt created at date.
-   * @param receipt 
+   * @param receipt
    * @returns {string}
    */
   protected formattedCreatedAt = (receipt: ISaleReceipt): string => {
@@ -62,7 +62,9 @@ export class SaleReceiptTransformer extends Transformer {
    * @returns {string}
    */
   protected subtotalFormatted = (receipt: ISaleReceipt): string => {
-    return formatNumber(receipt.subtotal, { money: false });
+    return formatNumber(receipt.subtotal, {
+      currencyCode: receipt.currencyCode,
+    });
   };
 
   /**
@@ -82,7 +84,7 @@ export class SaleReceiptTransformer extends Transformer {
    * @returns {string}
    */
   protected totalFormatted = (receipt: ISaleReceipt): string => {
-    return formatNumber(receipt.total, { money: false });
+    return formatNumber(receipt.total, { currencyCode: receipt.currencyCode });
   };
 
   /**
@@ -91,7 +93,9 @@ export class SaleReceiptTransformer extends Transformer {
    * @returns {string}
    */
   protected totalLocalFormatted = (receipt: ISaleReceipt): string => {
-    return formatNumber(receipt.totalLocal, { money: false });
+    return formatNumber(receipt.totalLocal, {
+      currencyCode: receipt.currencyCode,
+    });
   };
 
   /**
@@ -123,9 +127,7 @@ export class SaleReceiptTransformer extends Transformer {
    * @returns {string}
    */
   protected discountPercentageFormatted = (receipt: ISaleReceipt): string => {
-    return receipt.discountPercentage
-      ? `${receipt.discountPercentage}%`
-      : '';
+    return receipt.discountPercentage ? `${receipt.discountPercentage}%` : '';
   };
 
   /**

diff --git a/packages/webapp/src/containers/Sales/Estimates/EstimateForm/EstimateFormCurrencyTag.tsx b/packages/webapp/src/containers/Sales/Estimates/EstimateForm/EstimateFormCurrencyTag.tsx
@@ -13,7 +13,6 @@ export default function EstimateFromCurrencyTag() {
   if (!isForeignCustomer) {
     return null;
   }
-
   return (
     <BaseCurrencyRoot>
       <BaseCurrency currency={selectCustomer?.currency_code} />

diff --git a/shared/pdf-templates/src/components/EstimatePaperTemplate.tsx b/shared/pdf-templates/src/components/EstimatePaperTemplate.tsx
@@ -1,3 +1,4 @@
+import isEmpty from 'lodash/isEmpty';
 import { Box } from '../lib/layout/Box';
 import { Text } from '../lib/text/Text';
 import { Stack } from '../lib/layout/Stack';
@@ -10,7 +11,11 @@ import {
   DefaultPdfTemplateAddressBilledTo,
   DefaultPdfTemplateAddressBilledFrom,
 } from './_constants';
-import { PaperTemplate, PaperTemplateProps } from './PaperTemplate';
+import {
+  PaperTemplate,
+  PaperTemplateProps,
+  PaperTemplateTotalBorder,
+} from './PaperTemplate';
 
 export interface EstimatePaperTemplateProps extends PaperTemplateProps {
   // # Company
@@ -242,33 +247,40 @@ export function EstimatePaperTemplate({
               <PaperTemplate.TotalLine
                 label={subtotalLabel}
                 amount={subtotal}
+                border={PaperTemplateTotalBorder.Gray}
+                style={{ fontWeight: 500 }}
               />
             )}
-            {showDiscount && discount && (
+            {showDiscount && !isEmpty(discount) && (
               <PaperTemplate.TotalLine
                 label={discountLabel}
                 amount={discount}
               />
             )}
-            {showAdjustment && adjustment && (
+            {showAdjustment && !isEmpty(adjustment) && (
               <PaperTemplate.TotalLine
                 label={adjustmentLabel}
                 amount={adjustment}
               />
             )}
             {showTotal && (
-              <PaperTemplate.TotalLine label={totalLabel} amount={total} />
+              <PaperTemplate.TotalLine
+                label={totalLabel}
+                amount={total}
+                border={PaperTemplateTotalBorder.Dark}
+                style={{ fontWeight: 500 }}
+              />
             )}
           </PaperTemplate.Totals>
         </Stack>
 
         <Stack spacing={0}>
-          {showCustomerNote && (
+          {showCustomerNote && !isEmpty(customerNote) && (
             <PaperTemplate.Statement label={customerNoteLabel}>
               {customerNote}
             </PaperTemplate.Statement>
           )}
-          {showTermsConditions && (
+          {showTermsConditions && !isEmpty(termsConditions) && (
             <PaperTemplate.Statement label={termsConditionsLabel}>
               {termsConditions}
             </PaperTemplate.Statement>

diff --git a/shared/pdf-templates/src/components/ReceiptPaperTemplate.tsx b/shared/pdf-templates/src/components/ReceiptPaperTemplate.tsx
@@ -1,8 +1,13 @@
+import isEmpty from 'lodash/isEmpty';
 import { Box } from '../lib/layout/Box';
 import { Text } from '../lib/text/Text';
 import { Stack } from '../lib/layout/Stack';
 import { Group } from '../lib/layout/Group';
-import { PaperTemplate, PaperTemplateProps } from './PaperTemplate';
+import {
+  PaperTemplate,
+  PaperTemplateProps,
+  PaperTemplateTotalBorder,
+} from './PaperTemplate';
 import {
   DefaultPdfTemplateTerms,
   DefaultPdfTemplateItemDescription,
@@ -230,6 +235,8 @@ export function ReceiptPaperTemplate({
               <PaperTemplate.TotalLine
                 label={subtotalLabel}
                 amount={subtotal}
+                border={PaperTemplateTotalBorder.Gray}
+                style={{ fontWeight: 500 }}
               />
             )}
             {showDiscount && discount && (
@@ -245,18 +252,24 @@ export function ReceiptPaperTemplate({
               />
             )}
             {showTotal && (
-              <PaperTemplate.TotalLine label={totalLabel} amount={total} />
+              <PaperTemplate.TotalLine
+                label={totalLabel}
+                amount={total}
+                border={PaperTemplateTotalBorder.Gray}
+                style={{ fontWeight: 500 }}
+              />
             )}
           </PaperTemplate.Totals>
         </Stack>
 
         <Stack spacing={0}>
-          {showCustomerNote && (
+          {showCustomerNote && !isEmpty(customerNote) && (
             <PaperTemplate.Statement label={customerNoteLabel}>
               {customerNote}
             </PaperTemplate.Statement>
           )}
-          {showTermsConditions && (
+
+          {showTermsConditions && !isEmpty(termsConditions) && (
             <PaperTemplate.Statement label={termsConditionsLabel}>
               {termsConditions}
             </PaperTemplate.Statement>