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

refactor: update estimate and receipt forms to use new subtotal and total formatting utilities

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2024-12-01 18:19:09 +02:00
parent 000c3e40e1
commit 03b0d2519b
4 changed files with 47 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/webapp/src/containers/Sales/Estimates/EstimateForm/utils.tsx
View File

@@ -10,6 +10,7 @@ import {
repeatValue,
transformToForm,
formattedAmount,
toSafeNumber,
} from '@/utils';
import { useEstimateFormContext } from './EstimateFormProvider';
import {
@@ -272,9 +273,11 @@ export const useEstimateSubtotalFormatted = () => {
*/
export const useEstimateDiscount = () => {
const { values } = useFormikContext();
const discountAmount = parseFloat(values.discount);
const discount = toSafeNumber(values.discount);
return discountAmount;
return values?.discount_type === 'percentage'
? (subtotal * discount) / 100
: discount;
};
/**
@@ -296,7 +299,7 @@ export const useEstimateDiscountFormatted = () => {
*/
export const useEstimateAdjustment = () => {
const { values } = useFormikContext();
const adjustmentAmount = parseFloat(values.adjustment);
const adjustmentAmount = toSafeNumber(values.adjustment);
return adjustmentAmount;
};