From a52f3a933fe6073e5fee16d41971e03a0feeebf9 Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Mon, 29 Jan 2024 19:19:46 +0200 Subject: [PATCH] fix(webapp): inconsistency in currency of universal search items --- .../CreditNotes/VendorCreditIUniversalSearchBind.tsx | 4 ++-- .../Purchases/PaymentMades/PaymentMadeUniversalSearch.tsx | 1 + .../Sales/CreditNotes/CreditNoteUniversalSearch.tsx | 2 +- .../src/containers/Sales/Invoices/InvoiceUniversalSearch.tsx | 2 +- .../src/containers/Sales/Receipts/ReceiptUniversalSearch.tsx | 2 +- .../webapp/src/containers/Vendors/VendorsUniversalSearch.tsx | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/webapp/src/containers/Purchases/CreditNotes/VendorCreditIUniversalSearchBind.tsx b/packages/webapp/src/containers/Purchases/CreditNotes/VendorCreditIUniversalSearchBind.tsx index fa82987e3..a360ab617 100644 --- a/packages/webapp/src/containers/Purchases/CreditNotes/VendorCreditIUniversalSearchBind.tsx +++ b/packages/webapp/src/containers/Purchases/CreditNotes/VendorCreditIUniversalSearchBind.tsx @@ -22,7 +22,7 @@ function VendorCreditUniversalSearchSelectComponent({ openDrawer, }) { if (resourceType === RESOURCES_TYPES.VENDOR_CREDIT) { - openDrawer(DRAWERS.VENDOR_CREDIT_DETAIL_DRAWER, { + openDrawer(DRAWERS.VENDOR_CREDIT_DETAILS, { vendorCreditId: resourceId, }); onAction && onAction(); @@ -83,7 +83,7 @@ export function VendorCreditUniversalSearchItem( } label={ <> -
${item.reference.amount}
+
{item.reference.formatted_amount}
} diff --git a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentMadeUniversalSearch.tsx b/packages/webapp/src/containers/Purchases/PaymentMades/PaymentMadeUniversalSearch.tsx index f1cdc60ce..890401038 100644 --- a/packages/webapp/src/containers/Purchases/PaymentMades/PaymentMadeUniversalSearch.tsx +++ b/packages/webapp/src/containers/Purchases/PaymentMades/PaymentMadeUniversalSearch.tsx @@ -7,6 +7,7 @@ import { Icon } from '@/components'; import { RESOURCES_TYPES } from '@/constants/resourcesTypes'; import { highlightText } from '@/utils'; import { AbilitySubject, PaymentMadeAction } from '@/constants/abilityOption'; +import { DRAWERS } from '@/constants/drawers'; import withDrawerActions from '@/containers/Drawer/withDrawerActions'; /** diff --git a/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteUniversalSearch.tsx b/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteUniversalSearch.tsx index 2c495f802..8407a4f39 100644 --- a/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteUniversalSearch.tsx +++ b/packages/webapp/src/containers/Sales/CreditNotes/CreditNoteUniversalSearch.tsx @@ -82,7 +82,7 @@ export function CreditNoteUniversalSearchItem( } label={ <> -
${item.reference.amount}
+
{item.reference.formatted_amount}
} diff --git a/packages/webapp/src/containers/Sales/Invoices/InvoiceUniversalSearch.tsx b/packages/webapp/src/containers/Sales/Invoices/InvoiceUniversalSearch.tsx index 1656b9bc7..a86141612 100644 --- a/packages/webapp/src/containers/Sales/Invoices/InvoiceUniversalSearch.tsx +++ b/packages/webapp/src/containers/Sales/Invoices/InvoiceUniversalSearch.tsx @@ -89,7 +89,7 @@ export function InvoiceUniversalSearchItem( } label={ <> -
${item.reference.total_formatted}
+
{item.reference.total_formatted}
} diff --git a/packages/webapp/src/containers/Sales/Receipts/ReceiptUniversalSearch.tsx b/packages/webapp/src/containers/Sales/Receipts/ReceiptUniversalSearch.tsx index 2eb9405ac..abaea4004 100644 --- a/packages/webapp/src/containers/Sales/Receipts/ReceiptUniversalSearch.tsx +++ b/packages/webapp/src/containers/Sales/Receipts/ReceiptUniversalSearch.tsx @@ -75,7 +75,7 @@ export function ReceiptUniversalSearchItem( } label={ <> -
${item.reference.formatted_amount}
+
{item.reference.formatted_amount}
} diff --git a/packages/webapp/src/containers/Vendors/VendorsUniversalSearch.tsx b/packages/webapp/src/containers/Vendors/VendorsUniversalSearch.tsx index 84ccdfcb7..8134cc25c 100644 --- a/packages/webapp/src/containers/Vendors/VendorsUniversalSearch.tsx +++ b/packages/webapp/src/containers/Vendors/VendorsUniversalSearch.tsx @@ -34,7 +34,7 @@ const VendorUniversalSearchSelectAction = withDrawerActions( const vendorToSearch = (contact) => ({ id: contact.id, text: contact.display_name, - label: contact.balance > 0 ? contact.formatted_balance + '' : '', + label: contact.formatted_balance, reference: contact, });