Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(DEV-13054): add create counterparts from payables and approval policies #576

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ import {
ApprovalPoliciesOperator,
AmountTuple,
} from '@/components/approvalPolicies/useApprovalPolicyTrigger';
import {
CounterpartAutocomplete,
CounterpartsAutocompleteOptionProps,
} from '@/components/counterparts/CounterpartAutocomplete';
import { getCounterpartName } from '@/components/counterparts/helpers';
import { RHFTextField } from '@/components/RHF/RHFTextField';
import { useMoniteContext } from '@/core/context/MoniteContext';
import { useCurrencies } from '@/core/hooks';
Expand Down Expand Up @@ -44,7 +49,6 @@ import * as yup from 'yup';

import { ConditionsTable } from '../ConditionsTable';
import { RulesTable } from '../RulesTable';
import { AutocompleteCounterparts } from './AutocompleteCounterparts';
import { AutocompleteTags } from './AutocompleteTags';
import { AutocompleteUsers } from './AutocompleteUsers';

Expand All @@ -70,7 +74,7 @@ export interface FormValues {
triggers: {
was_created_by_user_id?: components['schemas']['EntityUserResponse'][];
tags?: components['schemas']['TagReadSchema'][];
counterpart_id?: components['schemas']['CounterpartResponse'][];
counterpart_id?: CounterpartsAutocompleteOptionProps[];
amount?: {
currency: components['schemas']['CurrencyEnum'];
value: AmountTuple[];
Expand Down Expand Up @@ -358,11 +362,14 @@ export const ApprovalPolicyForm = ({
setValue('triggers.tags', tagsForTriggers?.data);
}

if (
counterpartsForTriggers?.data &&
counterpartsForTriggers?.data.length > 0
) {
setValue('triggers.counterpart_id', counterpartsForTriggers?.data);
if ((counterpartsForTriggers?.data?.length ?? 0) > 0) {
setValue(
'triggers.counterpart_id',
counterpartsForTriggers?.data.map((counterpart) => ({
id: counterpart.id,
label: getCounterpartName(counterpart),
}))
);
}

if (triggers.amount && triggers.amount?.value?.length > 0) {
Expand Down Expand Up @@ -912,10 +919,11 @@ export const ApprovalPolicyForm = ({
{(triggerInEdit === 'counterpart_id' ||
(isAddingTrigger &&
currentTriggerType === 'counterpart_id')) && (
<AutocompleteCounterparts
<CounterpartAutocomplete
control={control}
name="triggers.counterpart_id"
label={t(i18n)`Counterparts`}
multiple
/>
)}
{(triggerInEdit === 'amount' ||
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React, { ReactNode, useMemo } from 'react';
import { ReactNode, useMemo } from 'react';

import { User } from '@/components/approvalPolicies/ApprovalPolicyDetails/ApprovalPolicyView/User';
import { getCounterpartName } from '@/components/counterparts/helpers';
import { t } from '@lingui/macro';
import { useLingui } from '@lingui/react';
import AddCircleOutlineIcon from '@mui/icons-material/AddCircleOutline';
Expand Down Expand Up @@ -69,12 +68,11 @@ export const ConditionsTable = ({
case 'counterpart_id':
triggerValue = (
<Stack direction="row" gap={1} sx={{ flexWrap: 'wrap' }}>
{triggers.counterpart_id?.map((counterpart) => (
<Chip
key={counterpart.id}
label={getCounterpartName(counterpart)}
/>
))}
{triggers.counterpart_id?.map((counterpart) => {
return (
<Chip key={counterpart.id} label={counterpart.label} />
);
})}
</Stack>
);
break;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { AllowedCountries } from '@/enums/AllowedCountries';

export enum CounterpartDataTestId {
OrganizationView = 'OrganizationView',
OrganizationForm = 'OrganizationForm',
Expand Down Expand Up @@ -27,3 +29,29 @@ export type CounterpartShowCategories = {
*/
showCategories: boolean;
};

interface BaseCounterpartOCR {
email: string;
phone?: string;
isCustomer: boolean;
isVendor: boolean;
line1: string;
line2: string;
city: string;
state: string;
postalCode: string;
country?: keyof typeof AllowedCountries;
}

export interface DefaultValuesOCR<T extends BaseCounterpartOCR> {
tax_id: string;
counterpart: T;
}

export type DefaultValuesOCRIndividual = DefaultValuesOCR<
BaseCounterpartOCR & { firstName?: string; lastName?: string }
>;

export type DefaultValuesOCROrganization = DefaultValuesOCR<
BaseCounterpartOCR & { companyName: string }
>;
Loading
Loading