QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-18 05:40:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: update financial forms to use new formatted amount utilities and add adjustment fields

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2024-12-03 17:53:37 +02:00
parent 542763ddf5
commit 3a19518440
21 changed files with 128 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/webapp/src/containers/Purchases/Bills/BillForm/utils.tsx
View File

@@ -325,7 +325,7 @@ export const useBillSubtotal = () => {
*/
export const useBillSubtotalFormatted = () => {
const subtotal = useBillSubtotal();
const { values} = useFormikContext();
const { values } = useFormikContext();
return formattedAmount(subtotal, values.currency_code);
};
@@ -336,8 +336,12 @@ export const useBillSubtotalFormatted = () => {
*/
export const useBillDiscountAmount = () => {
const { values } = useFormikContext();
const subtotal = useBillSubtotal();
const discount = toSafeNumber(values.discount);
return toSafeNumber(values.discount);
return values?.discount_type === 'percentage'
? (subtotal * discount) / 100
: discount;
};
/**
@@ -384,7 +388,6 @@ export const useBillTotalTaxAmount = () => {
.filter((entry) => entry.tax_amount)
.sumBy('tax_amount')
.value();
}, [values.entries]);
};