Skip to content

show currency for non auth donations #73

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

Merged
jzongker merged 2 commits into from
Jan 2, 2026
Merged

show currency for non auth donations #73

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
72e70bd
show currency for non auth donations
Himali-Malvawala Dec 29, 2025
5f446c0
show different currency symbol and fee calculation
Himali-Malvawala Jan 2, 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
7 changes: 4 additions & 3 deletions packages/donations/src/components/FundDonation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
"use client";

import React from "react";
import { FundDonationInterface, FundInterface } from "@churchapps/helpers";
import { FormControl, Grid, InputLabel, MenuItem, Select, TextField } from "@mui/material";
import { FundDonationInterface, FundInterface, CurrencyHelper } from "@churchapps/helpers";
import { FormControl, Grid, Icon, InputLabel, MenuItem, Select, TextField, Typography } from "@mui/material";
import type { SelectChangeEvent } from "@mui/material";
import { Locale } from "../helpers";

Expand All @@ -12,6 +12,7 @@ interface Props {
index: number,
updatedFunction: (fundDonation: FundDonationInterface, index: number) => void,
params?: any,
currency?: string,
}

export const FundDonation: React.FC<Props> = (props) => {
Expand Down Expand Up @@ -42,7 +43,7 @@ export const FundDonation: React.FC<Props> = (props) => {
<>
<Grid container spacing={3}>
<Grid size={{ xs: 12, md: 6 }}>
<TextField fullWidth name="amount" label={Locale.label("donation.fundDonations.amount")} type="number" disabled={props.params?.amount && props.params.amount !== ""} aria-label="amount" lang="en-150" value={props.fundDonation.amount || ""} onChange={handleChange} />
<TextField fullWidth name="amount" label={Locale.label("donation.fundDonations.amount")} type="number" disabled={props.params?.amount && props.params.amount !== ""} aria-label="amount" lang="en-150" value={props.fundDonation.amount || ""} onChange={handleChange} InputProps={{ startAdornment: <Icon><Typography>{props.currency ? CurrencyHelper.getCurrencySymbol(props.currency) : "$"}</Typography></Icon> }} />
</Grid>
<Grid size={{ xs: 12, md: 6 }}>
<FormControl fullWidth>
Expand Down
4 changes: 2 additions & 2 deletions packages/donations/src/components/FundDonations.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { FundDonation } from ".";
import { FundDonationInterface, FundInterface } from "@churchapps/helpers";
import { Locale } from "../helpers";

interface Props { fundDonations: FundDonationInterface[], funds: FundInterface[], params?: any, updatedFunction: (fundDonations: FundDonationInterface[]) => void }
interface Props { fundDonations: FundDonationInterface[], funds: FundInterface[], params?: any, updatedFunction: (fundDonations: FundDonationInterface[]) => void, currency?: string }

export const FundDonations: React.FC<Props> = (props) => {
const handleUpdated = (fundDonation: FundDonationInterface, index: number) => {
Expand All @@ -26,7 +26,7 @@ export const FundDonations: React.FC<Props> = (props) => {
const result = [];
for (let i = 0; i < props.fundDonations.length; i++) {
const fd = props.fundDonations[i];
result.push(<FundDonation fundDonation={fd} funds={props.funds} updatedFunction={handleUpdated} params={props?.params} key={fd.fundId || i} index={i} />);
result.push(<FundDonation fundDonation={fd} funds={props.funds} updatedFunction={handleUpdated} params={props?.params} key={fd.fundId || i} index={i} currency={props?.currency} />);
}

return result;
Expand Down
193 changes: 97 additions & 96 deletions packages/donations/src/components/NonAuthDonationInner.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { ApiHelper, DateHelper, CurrencyHelper } from "@churchapps/helpers";
import { Locale, DonationHelper, StripePaymentMethod } from "../helpers";
import { FundDonationInterface, FundInterface, PersonInterface, StripeDonationInterface, UserInterface, ChurchInterface } from "@churchapps/helpers";
import {
Grid, Alert, TextField, Button, FormControl, InputLabel, Select, MenuItem, FormGroup, FormControlLabel, Checkbox, Typography
Grid, Alert, TextField, Button, FormControl, InputLabel, Select, MenuItem, FormGroup, FormControlLabel, Checkbox, Typography
} from "@mui/material";
import type { PaperProps } from "@mui/material/Paper";

Expand Down Expand Up @@ -208,7 +208,8 @@ export const NonAuthDonationInner: React.FC<Props> = ({ mainContainerCssProps, s
...donation,
church: churchObj,
provider: gateway?.provider || "stripe",
gatewayId: gateway?.id
gatewayId: gateway?.id,
currency: gateway?.currency || "USD"
};
if (donationType === "once") results = await ApiHelper.post("/donate/charge", donationPayload, "GivingApi");
if (donationType === "recurring") results = await ApiHelper.post("/donate/subscribe", donationPayload, "GivingApi");
Expand Down Expand Up @@ -281,7 +282,7 @@ export const NonAuthDonationInner: React.FC<Props> = ({ mainContainerCssProps, s
try {
const response = await ApiHelper.post(
"/donate/fee?churchId=" + props.churchId,
{ amount, provider: gateway?.provider || "stripe", gatewayId: gateway?.id },
{ amount, provider: gateway?.provider || "stripe", gatewayId: gateway?.id, currency: gateway?.currency || "USD" },
"GivingApi"
);
return response.calculatedFee;
Expand All @@ -298,104 +299,104 @@ export const NonAuthDonationInner: React.FC<Props> = ({ mainContainerCssProps, s
return (<>
<hr />
<h4>{Locale.label("donation.donationForm.funds")}</h4>
<FundDonations fundDonations={fundDonations} funds={funds} params={searchParams} updatedFunction={handleFundDonationsChange} />
<FundDonations fundDonations={fundDonations} funds={funds} params={searchParams} updatedFunction={handleFundDonationsChange} currency={gateway?.currency} />
</>);
}
};

useEffect(init, []); //eslint-disable-line


if (donationComplete) return <Alert severity="success">{Locale.label("donation.donationForm.thankYou")}</Alert>;
else {
return (
<InputBox headerIcon={showHeader ? "volunteer_activism" : ""} headerText={showHeader ? "Donate" : ""} saveFunction={handleSave} saveText="Donate" isSubmitting={processing} mainContainerCssProps={mainContainerCssProps}>
<ErrorMessages errors={errors} />
<Grid container spacing={3}>
<Grid size={{ xs: 12, md: 6 }}>
<Button aria-label="single-donation" size="small" fullWidth style={{ minHeight: "50px" }} variant={donationType === "once" ? "contained" : "outlined"} onClick={() => setDonationType("once")}>{Locale.label("donation.donationForm.make")}</Button>
</Grid>
<Grid size={{ xs: 12, md: 6 }}>
<Button aria-label="recurring-donation" size="small" fullWidth style={{ minHeight: "50px" }} variant={donationType === "recurring" ? "contained" : "outlined"} onClick={() => setDonationType("recurring")}>{Locale.label("donation.donationForm.makeRecurring")}</Button>
</Grid>
<Grid size={{ xs: 12, md: 6 }}>
<TextField fullWidth label={Locale.label("person.firstName")} name="firstName" value={firstName} onChange={handleChange} />
</Grid>
<Grid size={{ xs: 12, md: 6 }}>
<TextField fullWidth label={Locale.label("person.lastName")} name="lastName" value={lastName} onChange={handleChange} />
</Grid>
<Grid size={{ xs: 12, md: 6 }}>
<TextField fullWidth label={Locale.label("person.email")} name="email" value={email} onChange={handleChange} />
</Grid>
<Grid size={{ xs: 12, md: 6 }}>
<ReCAPTCHA
sitekey={props.recaptchaSiteKey}
ref={captchaRef}
onChange={handleCaptchaChange}
onExpired={() => {
setCaptchaResponse("");
}}
onErrored={() => {
setCaptchaResponse("error");
}}
/>
</Grid>
</Grid>
{gateway?.provider?.toLowerCase() === "stripe" && (
<Grid container spacing={3} style={{ marginTop: 10 }}>
<Grid size={12}>
<div style={{ padding: 10, border: "1px solid #CCC", borderRadius: 5 }}>
<CardNumberElement options={formStyling} />
</div>
</Grid>
<Grid size={{ xs: 12, md: 6 }}>
<div style={{ padding: 10, border: "1px solid #CCC", borderRadius: 5 }}>
<CardExpiryElement options={formStyling} />
</div>
</Grid>
<Grid size={{ xs: 12, md: 6 }}>
<div style={{ padding: 10, border: "1px solid #CCC", borderRadius: 5 }}>
<CardCvcElement options={formStyling} />
</div>
</Grid>
</Grid>
)}
{donationType === "recurring"
&& <Grid container spacing={3} style={{ marginTop: 0 }}>
<Grid size={{ xs: 12, md: 6 }}>
<FormControl fullWidth>
<InputLabel>{Locale.label("donation.donationForm.frequency")}</InputLabel>
<Select label="Frequency" name="interval" aria-label="interval" value={interval} onChange={(e) => { setInterval(e.target.value); }}>
<MenuItem value="one_week">{Locale.label("donation.donationForm.weekly")}</MenuItem>
<MenuItem value="two_week">{Locale.label("donation.donationForm.biWeekly")}</MenuItem>
<MenuItem value="one_month">{Locale.label("donation.donationForm.monthly")}</MenuItem>
<MenuItem value="three_month">{Locale.label("donation.donationForm.quarterly")}</MenuItem>
<MenuItem value="one_year">{Locale.label("donation.donationForm.annually")}</MenuItem>
</Select>
</FormControl>
</Grid>
<Grid size={{ xs: 12, md: 6 }}>
<TextField fullWidth name="startDate" type="date" aria-label="startDate" label={Locale.label("donation.donationForm.startDate")} value={DateHelper.formatHtml5Date(startDate ? new Date(startDate) : new Date())} onChange={handleChange} />
</Grid>
</Grid>
}
{getFundList()}
<TextField fullWidth label="Memo (optional)" multiline aria-label="note" name="notes" value={notes} onChange={handleChange} style={{ marginTop: 10, marginBottom: 10 }} />
<div>
{fundsTotal > 0
&& <>
{(gateway?.payFees === true)
? <Typography fontSize={14} fontStyle="italic">*{Locale.label("donation.donationForm.fees").replace("{}", CurrencyHelper.formatCurrency(transactionFee))}</Typography>
: (
<FormGroup>
<FormControlLabel control={<Checkbox checked={coverFees} />} name="transaction-fee" label={Locale.label("donation.donationForm.cover").replace("{}", CurrencyHelper.formatCurrency(transactionFee))} onChange={handleCheckChange} />
</FormGroup>
)}
<p>Total Donation Amount: ${total}</p>
</>
}
</div>
</InputBox>
);
}
if (donationComplete) return <Alert severity="success">{Locale.label("donation.donationForm.thankYou")}</Alert>;
else {
return (
<InputBox headerIcon={showHeader ? "volunteer_activism" : ""} headerText={showHeader ? "Donate" : ""} saveFunction={handleSave} saveText="Donate" isSubmitting={processing} mainContainerCssProps={mainContainerCssProps}>
<ErrorMessages errors={errors} />
<Grid container spacing={3}>
<Grid size={{ xs: 12, md: 6 }}>
<Button aria-label="single-donation" size="small" fullWidth style={{ minHeight: "50px" }} variant={donationType === "once" ? "contained" : "outlined"} onClick={() => setDonationType("once")}>{Locale.label("donation.donationForm.make")}</Button>
</Grid>
<Grid size={{ xs: 12, md: 6 }}>
<Button aria-label="recurring-donation" size="small" fullWidth style={{ minHeight: "50px" }} variant={donationType === "recurring" ? "contained" : "outlined"} onClick={() => setDonationType("recurring")}>{Locale.label("donation.donationForm.makeRecurring")}</Button>
</Grid>
<Grid size={{ xs: 12, md: 6 }}>
<TextField fullWidth label={Locale.label("person.firstName")} name="firstName" value={firstName} onChange={handleChange} />
</Grid>
<Grid size={{ xs: 12, md: 6 }}>
<TextField fullWidth label={Locale.label("person.lastName")} name="lastName" value={lastName} onChange={handleChange} />
</Grid>
<Grid size={{ xs: 12, md: 6 }}>
<TextField fullWidth label={Locale.label("person.email")} name="email" value={email} onChange={handleChange} />
</Grid>
<Grid size={{ xs: 12, md: 6 }}>
<ReCAPTCHA
sitekey={props.recaptchaSiteKey}
ref={captchaRef}
onChange={handleCaptchaChange}
onExpired={() => {
setCaptchaResponse("");
}}
onErrored={() => {
setCaptchaResponse("error");
}}
/>
</Grid>
</Grid>
{gateway?.provider?.toLowerCase() === "stripe" && (
<Grid container spacing={3} style={{ marginTop: 10 }}>
<Grid size={12}>
<div style={{ padding: 10, border: "1px solid #CCC", borderRadius: 5 }}>
<CardNumberElement options={formStyling} />
</div>
</Grid>
<Grid size={{ xs: 12, md: 6 }}>
<div style={{ padding: 10, border: "1px solid #CCC", borderRadius: 5 }}>
<CardExpiryElement options={formStyling} />
</div>
</Grid>
<Grid size={{ xs: 12, md: 6 }}>
<div style={{ padding: 10, border: "1px solid #CCC", borderRadius: 5 }}>
<CardCvcElement options={formStyling} />
</div>
</Grid>
</Grid>
)}
{donationType === "recurring"
&& <Grid container spacing={3} style={{ marginTop: 0 }}>
<Grid size={{ xs: 12, md: 6 }}>
<FormControl fullWidth>
<InputLabel>{Locale.label("donation.donationForm.frequency")}</InputLabel>
<Select label="Frequency" name="interval" aria-label="interval" value={interval} onChange={(e) => { setInterval(e.target.value); }}>
<MenuItem value="one_week">{Locale.label("donation.donationForm.weekly")}</MenuItem>
<MenuItem value="two_week">{Locale.label("donation.donationForm.biWeekly")}</MenuItem>
<MenuItem value="one_month">{Locale.label("donation.donationForm.monthly")}</MenuItem>
<MenuItem value="three_month">{Locale.label("donation.donationForm.quarterly")}</MenuItem>
<MenuItem value="one_year">{Locale.label("donation.donationForm.annually")}</MenuItem>
</Select>
</FormControl>
</Grid>
<Grid size={{ xs: 12, md: 6 }}>
<TextField fullWidth name="startDate" type="date" aria-label="startDate" label={Locale.label("donation.donationForm.startDate")} value={DateHelper.formatHtml5Date(startDate ? new Date(startDate) : new Date())} onChange={handleChange} />
</Grid>
</Grid>
}
{getFundList()}
<TextField fullWidth label="Memo (optional)" multiline aria-label="note" name="notes" value={notes} onChange={handleChange} style={{ marginTop: 10, marginBottom: 10 }} />
<div>
{fundsTotal > 0
&& <>
{(gateway?.payFees === true)
? <Typography fontSize={14} fontStyle="italic">*{Locale.label("donation.donationForm.fees").replace("{}", CurrencyHelper.formatCurrencyWithLocale(transactionFee, gateway?.currency || "USD"))}</Typography>
: (
<FormGroup>
<FormControlLabel control={<Checkbox checked={coverFees} />} name="transaction-fee" label={Locale.label("donation.donationForm.cover").replace("{}", CurrencyHelper.formatCurrencyWithLocale(transactionFee, gateway?.currency || "USD"))} onChange={handleCheckChange} />
</FormGroup>
)}
<p>Total Donation Amount: {CurrencyHelper.formatCurrencyWithLocale(total, gateway?.currency || "USD")}</p>
</>
}
</div>
</InputBox>
);
}
};
1 change: 1 addition & 0 deletions packages/donations/src/helpers/PaymentMethod.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ export interface PaymentGateway {
productId?: string;
payFees?: boolean;
enabled?: boolean;
currency?: string;
}