Skip to content

[Cleanup] Filtering Active Payment Terms #3171

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.

Sign up for GitHub

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

Open
Civolilah wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

[Cleanup] Filtering Active Payment Terms #3171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8db1d9d
Added status query parameter for payment terms
Civolilah May 22, 2026
846ae20
Added payment terms filtering
Civolilah May 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/common/queries/payment-terms.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,12 @@ export function usePaymentTermsQuery(params: Params) {
request(
'GET',
endpoint(
'/api/v1/payment_terms?per_page=:perPage&page=:currentPage&sort=:sort',
'/api/v1/payment_terms?per_page=:perPage&page=:currentPage&sort=:sort&status=:status',
{
perPage: params.perPage ?? 1000,
currentPage: params.currentPage,
sort: params.sort ?? 'id|asc',
status: params.status ?? 'all',
}
)
),
Expand Down
38 changes: 29 additions & 9 deletions src/pages/clients/common/components/Settings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ export default function Settings() {
const currencies = useCurrencies();
const { data: statics } = useStaticsQuery();

const { data: paymentTermsResponse } = usePaymentTermsQuery({});
const { data: paymentTermsResponse } = usePaymentTermsQuery({
status: ['active'],
});

const handleChange = (property: string, value: string | number | boolean) => {
const $client = cloneDeep(client)!;
Expand Down Expand Up @@ -115,13 +117,22 @@ export default function Settings() {
withBlank
customSelector
>
{paymentTermsResponse.data.data.map(
(paymentTerm: PaymentTerm, index: number) => (
{paymentTermsResponse.data.data
.filter(
(
paymentTerm: PaymentTerm,
index: number,
terms: PaymentTerm[]
) =>
terms.findIndex(
(t) => t.num_days === paymentTerm.num_days
) === index
)
.map((paymentTerm: PaymentTerm, index: number) => (
<option key={index} value={paymentTerm.num_days.toString()}>
{paymentTerm.name}
</option>
)
)}
))}
</SelectField>
</Element>
)}
Expand All @@ -138,13 +149,22 @@ export default function Settings() {
withBlank
customSelector
>
{paymentTermsResponse.data.data.map(
(paymentTerm: PaymentTerm, index: number) => (
{paymentTermsResponse.data.data
.filter(
(
paymentTerm: PaymentTerm,
index: number,
terms: PaymentTerm[]
) =>
terms.findIndex(
(t) => t.num_days === paymentTerm.num_days
) === index
)
.map((paymentTerm: PaymentTerm, index: number) => (
<option key={index} value={paymentTerm.num_days.toString()}>
{paymentTerm.name}
</option>
)
)}
))}
</SelectField>
</Element>
)}
Expand Down
38 changes: 29 additions & 9 deletions src/pages/clients/edit/components/AdditionalInfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@ export function AdditionalInfo({ client, errors, setClient }: Props) {
const hasPermission = useHasPermission();
const entityAssigned = useEntityAssigned();

const { data: paymentTermsResponse } = usePaymentTermsQuery({});
const { data: paymentTermsResponse } = usePaymentTermsQuery({
status: ['active'],
});

const { data: statics } = useStaticsQuery();
const { id } = useParams();
Expand Down Expand Up @@ -148,13 +150,22 @@ export function AdditionalInfo({ client, errors, setClient }: Props) {
withBlank
customSelector
>
{paymentTermsResponse.data.data.map(
(paymentTerm: PaymentTerm, index: number) => (
{paymentTermsResponse.data.data
.filter(
(
paymentTerm: PaymentTerm,
index: number,
terms: PaymentTerm[]
) =>
terms.findIndex(
(t) => t.num_days === paymentTerm.num_days
) === index
)
.map((paymentTerm: PaymentTerm, index: number) => (
<option key={index} value={paymentTerm.num_days.toString()}>
{paymentTerm.name}
</option>
)
)}
))}
</SelectField>
</Element>
)}
Expand All @@ -171,13 +182,22 @@ export function AdditionalInfo({ client, errors, setClient }: Props) {
withBlank
customSelector
>
{paymentTermsResponse.data.data.map(
(paymentTerm: PaymentTerm, index: number) => (
{paymentTermsResponse.data.data
.filter(
(
paymentTerm: PaymentTerm,
index: number,
terms: PaymentTerm[]
) =>
terms.findIndex(
(t) => t.num_days === paymentTerm.num_days
) === index
)
.map((paymentTerm: PaymentTerm, index: number) => (
<option key={index} value={paymentTerm.num_days.toString()}>
{paymentTerm.name}
</option>
)
)}
))}
</SelectField>
</Element>
)}
Expand Down
38 changes: 29 additions & 9 deletions src/pages/invoices/common/components/ClientCreate.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,9 @@ export function ClientCreate({
refetchOnWindowFocus: false,
});

const { data: paymentTermsResponse } = usePaymentTermsQuery({});
const { data: paymentTermsResponse } = usePaymentTermsQuery({
status: ['active'],
});

const handleChange = (property: keyof Client, value: string) => {
setErrors(undefined);
Expand Down Expand Up @@ -371,16 +373,25 @@ export function ClientCreate({
withBlank
customSelector
>
{paymentTermsResponse.data.data.map(
(paymentTerm: PaymentTerm, index: number) => (
{paymentTermsResponse.data.data
.filter(
(
paymentTerm: PaymentTerm,
index: number,
terms: PaymentTerm[]
) =>
terms.findIndex(
(t) => t.num_days === paymentTerm.num_days
) === index
)
.map((paymentTerm: PaymentTerm, index: number) => (
<option
key={index}
value={paymentTerm.num_days.toString()}
>
{paymentTerm.name}
</option>
)
)}
))}
</SelectField>
)}

Expand All @@ -395,16 +406,25 @@ export function ClientCreate({
withBlank
customSelector
>
{paymentTermsResponse.data.data.map(
(paymentTerm: PaymentTerm, index: number) => (
{paymentTermsResponse.data.data
.filter(
(
paymentTerm: PaymentTerm,
index: number,
terms: PaymentTerm[]
) =>
terms.findIndex(
(t) => t.num_days === paymentTerm.num_days
) === index
)
.map((paymentTerm: PaymentTerm, index: number) => (
<option
key={index}
value={paymentTerm.num_days.toString()}
>
{paymentTerm.name}
</option>
)
)}
))}
</SelectField>
)}

Expand Down
33 changes: 22 additions & 11 deletions src/pages/settings/online-payments/OnlinePayments.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export function OnlinePayments() {
const company = useInjectCompanyChanges();
const { data: statics } = useStaticsQuery();
const errors = useAtomValue(companySettingsErrorsAtom);
const { data: termsResponse } = usePaymentTermsQuery({});
const { data: termsResponse } = usePaymentTermsQuery({ status: ['active'] });
const { isCompanySettingsActive } = useCurrentSettingsLevel();
const isFormBusy = useAtomValue(isCompanySettingsFormBusy);

Expand Down Expand Up @@ -300,11 +300,17 @@ export function OnlinePayments() {
customSelector
withBlank
>
{paymentTerms.map((type: PaymentTerm) => (
<option key={type.id} value={type.num_days.toString()}>
{type.name}
</option>
))}
{paymentTerms
.filter(
(type: PaymentTerm, index, terms) =>
terms.findIndex((t) => t.num_days === type.num_days) ===
index
)
.map((type: PaymentTerm) => (
<option key={type.id} value={type.num_days.toString()}>
{type.name}
</option>
))}
</SelectField>
</Element>
)}
Expand Down Expand Up @@ -366,11 +372,16 @@ export function OnlinePayments() {
errorMessage={errors?.errors['settings.valid_until']}
customSelector
>
{paymentTerms?.map((type: PaymentTerm) => (
<option key={type.id} value={type.num_days.toString()}>
{type.name}
</option>
))}
{paymentTerms
?.filter(
(type: PaymentTerm, index, terms) =>
terms.findIndex((t) => t.num_days === type.num_days) === index
)
.map((type: PaymentTerm) => (
<option key={type.id} value={type.num_days.toString()}>
{type.name}
</option>
))}
</SelectField>
</Element>

Expand Down
Loading