fix: display adjustment in minues

bigcapitalhq · Dec 8, 2024 · 11d7a40 · 11d7a40
1 parent 46719ef
commit 11d7a40
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 8 deletions.
diff --git a/packages/server/src/models/Bill.ts b/packages/server/src/models/Bill.ts
@@ -136,7 +136,7 @@ export default class Bill extends mixin(TenantModel, [
 
     return R.compose(
       R.add(adjustmentAmount),
-      R.subtract(this.discountAmount),
+      R.subtract(R.__, this.discountAmount),
       R.when(R.always(this.isInclusiveTax), R.add(this.taxAmountWithheld))
     )(this.subtotal);
   }

diff --git a/packages/server/src/models/SaleReceipt.ts b/packages/server/src/models/SaleReceipt.ts
@@ -49,6 +49,9 @@ export default class SaleReceipt extends mixin(TenantModel, [
       'total',
       'totalLocal',
 
+      'adjustment',
+      'adjustmentLocal',
+
       'discountAmount',
       'discountPercentage',
 
@@ -119,6 +122,14 @@ export default class SaleReceipt extends mixin(TenantModel, [
     return this.total * this.exchangeRate;
   }
 
+  /**
+   * Adjustment amount in local currency.
+   * @returns {number}
+   */
+  get adjustmentLocal() {
+    return this.adjustment * this.exchangeRate;
+  }
+
   /**
    * Detarmine whether the sale receipt closed.
    * @return {boolean}

diff --git a/packages/server/src/services/Purchases/VendorCredits/VendorCreditTransformer.ts b/packages/server/src/services/Purchases/VendorCredits/VendorCreditTransformer.ts
@@ -20,6 +20,7 @@ export class VendorCreditTransformer extends Transformer {
       'discountAmountFormatted',
       'discountPercentageFormatted',
       'adjustmentFormatted',
+      'totalFormatted',
       'entries',
       'attachments',
     ];
@@ -118,6 +119,15 @@ export class VendorCreditTransformer extends Transformer {
     });
   };
 
+  /**
+   * Retrieves the formatted total.
+   * @param {IVendorCredit} credit
+   * @returns {string}
+   */
+  protected totalFormatted = (credit) => {
+    return formatNumber(credit.total, { currencyCode: credit.currencyCode });
+  };
+
   /**
    * Retrieves the entries of the bill.
    * @param {IVendorCredit} vendorCredit

diff --git a/packages/webapp/src/containers/Drawers/BillDrawer/BillDetailTableFooter.tsx b/packages/webapp/src/containers/Drawers/BillDrawer/BillDetailTableFooter.tsx
@@ -42,7 +42,7 @@ export function BillDetailTableFooter() {
             textStyle={TotalLineTextStyle.Regular}
           />
         )}
-        {bill.adjustment > 0 && (
+        {bill.adjustment_formatted && (
           <TotalLine
             title={'Adjustment'}
             value={bill.adjustment_formatted}

diff --git a/...ages/webapp/src/containers/Drawers/CreditNoteDetailDrawer/CreditNoteDetailTableFooter.tsx b/...ages/webapp/src/containers/Drawers/CreditNoteDetailDrawer/CreditNoteDetailTableFooter.tsx
@@ -33,7 +33,7 @@ export default function CreditNoteDetailTableFooter() {
             value={creditNote.discount_amount_formatted}
           />
         )}
-        {creditNote.adjustment > 0 && (
+        {creditNote.adjustment_formatted && (
           <TotalLine
             title={'Adjustment'}
             value={creditNote.adjustment_formatted}

diff --git a/packages/webapp/src/containers/Drawers/ReceiptDetailDrawer/ReceiptDetailTableFooter.tsx b/packages/webapp/src/containers/Drawers/ReceiptDetailDrawer/ReceiptDetailTableFooter.tsx
@@ -36,7 +36,7 @@ export default function ReceiptDetailTableFooter() {
             textStyle={TotalLineTextStyle.Regular}
           />
         )}
-        {receipt.adjustment > 0 && (
+        {receipt.adjustment_formatted && (
           <TotalLine
             title={'Adjustment'}
             value={receipt.adjustment_formatted}

diff --git a/...webapp/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetailDrawerFooter.tsx b/...webapp/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetailDrawerFooter.tsx
@@ -45,7 +45,7 @@ export default function VendorCreditDetailDrawerFooter() {
         )}
         <TotalLine
           title={<T id={'vendor_credit.drawer.label_total'} />}
-          value={vendorCredit.formatted_amount}
+          value={vendorCredit.total_formatted}
           borderStyle={TotalLineBorderStyle.DoubleDark}
           textStyle={TotalLineTextStyle.Bold}
         />

diff --git a/packages/webapp/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetailHeader.tsx b/packages/webapp/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetailHeader.tsx
@@ -5,7 +5,6 @@ import styled from 'styled-components';
 import { defaultTo } from 'lodash';
 
 import {
-  FormatDate,
   T,
   Row,
   Col,
@@ -29,13 +28,14 @@ export default function VendorCreditDetailHeader() {
       <CommercialDocTopHeader>
         <DetailsMenu>
           <AmountItem label={intl.get('amount')}>
-            <span class="big-number">{vendorCredit.formatted_amount}</span>
+            <span class="big-number">{vendorCredit.total_formatted}</span>
           </AmountItem>
           <StatusItem>
             <VendorCreditDetailsStatus vendorCredit={vendorCredit} />
           </StatusItem>
         </DetailsMenu>
       </CommercialDocTopHeader>
+
       <Row>
         <Col xs={6}>
           <DetailsMenu direction={'horizantal'} minLabelSize={'180px'}>

diff --git a/packages/webapp/src/containers/Sales/Invoices/InvoiceForm/utils.tsx b/packages/webapp/src/containers/Sales/Invoices/InvoiceForm/utils.tsx
@@ -455,7 +455,7 @@ export const useInvoiceTotal = () => {
   return R.compose(
     R.when(R.always(isExclusiveTax), R.add(totalTaxAmount)),
     R.subtract(R.__, discountAmount),
-    R.add(R.__, adjustmentAmount),
+    R.add(adjustmentAmount),
   )(subtotal);
 };