@churchapps/apphelper 0.3.47 → 0.3.49
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/components/wrapper/ChurchList.d.ts.map +1 -1
- package/dist/components/wrapper/ChurchList.js +7 -11
- package/dist/components/wrapper/ChurchList.js.map +1 -1
- package/dist/components/wrapper/UserMenu.d.ts.map +1 -1
- package/dist/components/wrapper/UserMenu.js +8 -3
- package/dist/components/wrapper/UserMenu.js.map +1 -1
- package/dist/donationComponents/DonationPage.d.ts.map +1 -1
- package/dist/donationComponents/DonationPage.js +55 -36
- package/dist/donationComponents/DonationPage.js.map +1 -1
- package/package.json +1 -1
- package/src/components/wrapper/ChurchList.tsx +16 -19
- package/src/components/wrapper/UserMenu.tsx +10 -3
- package/src/donationComponents/DonationPage.tsx +58 -33
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChurchList.d.ts","sourceRoot":"","sources":["../../../src/components/wrapper/ChurchList.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAmB,MAAM,OAAO,CAAC;AACxC,OAAO,EAAE,wBAAwB,EAAE,oBAAoB,EAAe,MAAM,qBAAqB,CAAC;AAMlG,MAAM,WAAW,KAAK;IAAG,YAAY,EAAE,wBAAwB,EAAE,CAAC;IAAC,iBAAiB,EAAE,wBAAwB,CAAC;IAAC,OAAO,EAAE,oBAAoB,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;CAAE;AAEtK,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"ChurchList.d.ts","sourceRoot":"","sources":["../../../src/components/wrapper/ChurchList.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAmB,MAAM,OAAO,CAAC;AACxC,OAAO,EAAE,wBAAwB,EAAE,oBAAoB,EAAe,MAAM,qBAAqB,CAAC;AAMlG,MAAM,WAAW,KAAK;IAAG,YAAY,EAAE,wBAAwB,EAAE,CAAC;IAAC,iBAAiB,EAAE,wBAAwB,CAAC;IAAC,OAAO,EAAE,oBAAoB,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;CAAE;AAEtK,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAgCtC,CAAC"}
|
|
@@ -23,17 +23,13 @@ const ChurchList = props => {
|
|
|
23
23
|
props?.onDelete();
|
|
24
24
|
}
|
|
25
25
|
};
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
result.push((0, jsx_runtime_1.jsx)(NavItem_1.NavItem, { selected: (uc.church.id === props.currentUserChurch.church.id) && true, onClick: () => UserHelper_1.UserHelper.selectChurch(props.context, userChurch.church.id, null), label: churchName, icon: "church", deleteIcon: uc.church.id !== props.currentUserChurch.church.id ? "delete" : null, deleteLabel: helpers_2.Locale.label("wrapper.deleteChurch"), deleteFunction: () => { handleDelete(uc); } }, userChurch.church.id));
|
|
34
|
-
});
|
|
35
|
-
return (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: result });
|
|
36
|
-
}
|
|
26
|
+
let result = [];
|
|
27
|
+
userChurches.forEach(uc => {
|
|
28
|
+
const userChurch = uc;
|
|
29
|
+
const churchName = uc.church.name;
|
|
30
|
+
result.push((0, jsx_runtime_1.jsx)(NavItem_1.NavItem, { selected: (uc.church.id === props.currentUserChurch.church.id) && true, onClick: () => UserHelper_1.UserHelper.selectChurch(props.context, userChurch.church.id, null), label: churchName, icon: "church", deleteIcon: uc.church.id !== props.currentUserChurch.church.id ? "delete" : null, deleteLabel: helpers_2.Locale.label("wrapper.deleteChurch"), deleteFunction: () => { handleDelete(uc); } }, userChurch.church.id));
|
|
31
|
+
});
|
|
32
|
+
return (0, jsx_runtime_1.jsx)(jsx_runtime_1.Fragment, { children: result });
|
|
37
33
|
};
|
|
38
34
|
exports.ChurchList = ChurchList;
|
|
39
35
|
//# sourceMappingURL=ChurchList.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChurchList.js","sourceRoot":"","sources":["../../../src/components/wrapper/ChurchList.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;AAEb,iCAAwC;AACxC,iDAAkG;AAClG,uDAAoD;AACpD,yDAAsD;AACtD,uCAAoC;AACpC,2CAAuC;AAIhC,MAAM,UAAU,GAAoB,KAAK,CAAC,EAAE;IACjD,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,IAAA,gBAAQ,EAAC,uBAAU,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;IAE3G,MAAM,YAAY,GAAG,KAAK,EAAE,EAA4B,EAAE,EAAE;QAC1D,MAAM,KAAK,GAAG,gBAAM,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;QACpG,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YAC1B,MAAM,qBAAS,CAAC,MAAM,CAAC,sBAAsB,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,eAAe,CAAC,CAAC;YACvH,MAAM,qBAAS,CAAC,MAAM,CAAC,qBAAqB,EAAE,CAAC,MAAM,CAAC,EAAE,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,eAAe,CAAC,CAAC;YACtG,oCAAoC;YACpC,MAAM,GAAG,GAAG,qBAAW,CAAC,QAAQ,CAAC,uBAAU,CAAC,YAAY,EAAE,WAAW,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACrF,IAAI,GAAG,GAAG,CAAC,CAAC;gBAAE,uBAAU,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;YACrD,KAAK,EAAE,QAAQ,EAAE,CAAC;QACpB,CAAC;IACH,CAAC,CAAA;IAED,IAAI,
|
|
1
|
+
{"version":3,"file":"ChurchList.js","sourceRoot":"","sources":["../../../src/components/wrapper/ChurchList.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;AAEb,iCAAwC;AACxC,iDAAkG;AAClG,uDAAoD;AACpD,yDAAsD;AACtD,uCAAoC;AACpC,2CAAuC;AAIhC,MAAM,UAAU,GAAoB,KAAK,CAAC,EAAE;IACjD,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,IAAA,gBAAQ,EAAC,uBAAU,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;IAE3G,MAAM,YAAY,GAAG,KAAK,EAAE,EAA4B,EAAE,EAAE;QAC1D,MAAM,KAAK,GAAG,gBAAM,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;QACpG,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YAC1B,MAAM,qBAAS,CAAC,MAAM,CAAC,sBAAsB,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,eAAe,CAAC,CAAC;YACvH,MAAM,qBAAS,CAAC,MAAM,CAAC,qBAAqB,EAAE,CAAC,MAAM,CAAC,EAAE,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,eAAe,CAAC,CAAC;YACtG,oCAAoC;YACpC,MAAM,GAAG,GAAG,qBAAW,CAAC,QAAQ,CAAC,uBAAU,CAAC,YAAY,EAAE,WAAW,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACrF,IAAI,GAAG,GAAG,CAAC,CAAC;gBAAE,uBAAU,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;YACrD,KAAK,EAAE,QAAQ,EAAE,CAAC;QACpB,CAAC;IACH,CAAC,CAAA;IAED,IAAI,MAAM,GAAkB,EAAE,CAAC;IAC/B,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;QACxB,MAAM,UAAU,GAAG,EAAE,CAAC;QACtB,MAAM,UAAU,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC;QAClC,MAAM,CAAC,IAAI,CAAC,uBAAC,iBAAO,IAElB,QAAQ,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,IAAI,EACtE,OAAO,EAAE,GAAG,EAAE,CAAC,uBAAU,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,EACjF,KAAK,EAAE,UAAU,EACjB,IAAI,EAAC,QAAQ,EACb,UAAU,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,EAChF,WAAW,EAAE,gBAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,EACjD,cAAc,EAAE,GAAG,EAAE,GAAG,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAPtC,UAAU,CAAC,MAAM,CAAC,EAAE,CAQzB,CAAC,CAAC;IACN,CAAC,CAAC,CAAC;IAEH,OAAO,2DAAG,MAAM,GAAI,CAAC;AACvB,CAAC,CAAC;AAhCW,QAAA,UAAU,cAgCrB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserMenu.d.ts","sourceRoot":"","sources":["../../../src/components/wrapper/UserMenu.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAC;AAK1B,OAAO,EAAE,wBAAwB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"UserMenu.d.ts","sourceRoot":"","sources":["../../../src/components/wrapper/UserMenu.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAC;AAK1B,OAAO,EAAE,wBAAwB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAUrF,UAAU,KAAK;IACd,kBAAkB,EAAE;QAAE,iBAAiB,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IACnE,UAAU,EAAE,MAAM,IAAI,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,wBAAwB,EAAE,CAAC;IACzC,iBAAiB,EAAE,wBAAwB,CAAC;IAC5C,OAAO,EAAE,oBAAoB,CAAC;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CACnC;AAED,eAAO,MAAM,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CA2HpC,CAAC"}
|
|
@@ -17,12 +17,14 @@ const TabPanel_1 = require("../TabPanel");
|
|
|
17
17
|
const helpers_1 = require("../../helpers");
|
|
18
18
|
const PrivateMessages_1 = require("./PrivateMessages");
|
|
19
19
|
const Notifications_1 = require("./Notifications");
|
|
20
|
+
const react_cookie_1 = require("react-cookie");
|
|
20
21
|
const UserMenu = (props) => {
|
|
21
22
|
const userName = props.userName;
|
|
22
23
|
const [anchorEl, setAnchorEl] = react_1.default.useState(null);
|
|
23
24
|
const [showPM, setShowPM] = react_1.default.useState(false);
|
|
24
25
|
const [showNotifications, setShowNotifications] = react_1.default.useState(false);
|
|
25
26
|
const [refreshKey, setRefreshKey] = react_1.default.useState(0);
|
|
27
|
+
const [, , removeCookie] = (0, react_cookie_1.useCookies)(["lastChurchId"]);
|
|
26
28
|
const open = Boolean(anchorEl);
|
|
27
29
|
const handleClick = (e) => {
|
|
28
30
|
e.preventDefault();
|
|
@@ -32,6 +34,10 @@ const UserMenu = (props) => {
|
|
|
32
34
|
setTabIndex(0);
|
|
33
35
|
setAnchorEl(null);
|
|
34
36
|
};
|
|
37
|
+
const handleSwitchChurch = () => {
|
|
38
|
+
removeCookie("lastChurchId", { path: "/" });
|
|
39
|
+
setTabIndex(2);
|
|
40
|
+
};
|
|
35
41
|
const getMainLinks = () => {
|
|
36
42
|
const jwt = ApiHelper_1.ApiHelper.getConfig("MembershipApi").jwt;
|
|
37
43
|
const churchId = UserHelper_1.UserHelper.currentUserChurch.church.id;
|
|
@@ -45,8 +51,7 @@ const UserMenu = (props) => {
|
|
|
45
51
|
result.push((0, jsx_runtime_1.jsx)(_1.NavItem, { url: "/logout", label: helpers_1.Locale.label("wrapper.logout"), icon: "logout", onNavigate: props.onNavigate }, "/logout"));
|
|
46
52
|
result.push((0, jsx_runtime_1.jsx)("div", { style: { borderTop: "1px solid #CCC", paddingTop: 2, paddingBottom: 2 } }));
|
|
47
53
|
result.push((0, jsx_runtime_1.jsx)(_1.NavItem, { label: "Switch App", icon: "apps", onClick: () => { setTabIndex(1); } }, helpers_1.Locale.label("wrapper.switchApp")));
|
|
48
|
-
|
|
49
|
-
result.push((0, jsx_runtime_1.jsx)(_1.NavItem, { label: helpers_1.Locale.label("wrapper.switchChurch"), icon: "church", onClick: () => { setTabIndex(2); } }, "Switch Church"));
|
|
54
|
+
result.push((0, jsx_runtime_1.jsx)(_1.NavItem, { label: helpers_1.Locale.label("wrapper.switchChurch"), icon: "church", onClick: handleSwitchChurch }, "Switch Church"));
|
|
50
55
|
return result;
|
|
51
56
|
};
|
|
52
57
|
const getProfilePic = () => {
|
|
@@ -69,7 +74,7 @@ const UserMenu = (props) => {
|
|
|
69
74
|
console.log(e);
|
|
70
75
|
};
|
|
71
76
|
const [tabIndex, setTabIndex] = react_1.default.useState(0);
|
|
72
|
-
const getTabs = () => ((0, jsx_runtime_1.jsxs)(material_1.Box, { sx: { borderBottom: 1, borderColor: "divider" }, children: [(0, jsx_runtime_1.jsx)(TabPanel_1.TabPanel, { value: tabIndex, index: 0, children: getMainLinks() }), (0, jsx_runtime_1.jsxs)(TabPanel_1.TabPanel, { value: tabIndex, index: 1, children: [(0, jsx_runtime_1.jsx)(_1.NavItem, { label: "Back", icon: "arrow_back", onClick: () => { setTabIndex(0); } }, "AppBack"), (0, jsx_runtime_1.jsx)(_1.AppList, { currentUserChurch: props.currentUserChurch, appName: props.appName, onNavigate: props.onNavigate })] }),
|
|
77
|
+
const getTabs = () => ((0, jsx_runtime_1.jsxs)(material_1.Box, { sx: { borderBottom: 1, borderColor: "divider" }, children: [(0, jsx_runtime_1.jsx)(TabPanel_1.TabPanel, { value: tabIndex, index: 0, children: getMainLinks() }), (0, jsx_runtime_1.jsxs)(TabPanel_1.TabPanel, { value: tabIndex, index: 1, children: [(0, jsx_runtime_1.jsx)(_1.NavItem, { label: "Back", icon: "arrow_back", onClick: () => { setTabIndex(0); } }, "AppBack"), (0, jsx_runtime_1.jsx)(_1.AppList, { currentUserChurch: props.currentUserChurch, appName: props.appName, onNavigate: props.onNavigate })] }), (0, jsx_runtime_1.jsx)(TabPanel_1.TabPanel, { value: tabIndex, index: 2, children: (0, jsx_runtime_1.jsxs)("div", { style: { maxHeight: '70vh', overflowY: "auto" }, children: [(0, jsx_runtime_1.jsx)(_1.NavItem, { label: "Back", icon: "arrow_back", onClick: () => { setTabIndex(0); } }, "ChurchBack"), (0, jsx_runtime_1.jsx)(ChurchList_1.ChurchList, { userChurches: props.userChurches, currentUserChurch: props.currentUserChurch, context: props.context, onDelete: handleClose })] }) })] }));
|
|
73
78
|
const getModals = () => {
|
|
74
79
|
if (showPM)
|
|
75
80
|
return ((0, jsx_runtime_1.jsxs)(material_1.Dialog, { open: true, onClose: () => setShowPM(false), maxWidth: "md", fullWidth: true, children: [(0, jsx_runtime_1.jsx)(material_1.DialogTitle, { children: helpers_1.Locale.label("wrapper.messages") }), (0, jsx_runtime_1.jsx)(material_1.DialogContent, { children: (0, jsx_runtime_1.jsx)(PrivateMessages_1.PrivateMessages, { context: props.context, refreshKey: refreshKey, onUpdate: props.loadCounts }) })] }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserMenu.js","sourceRoot":"","sources":["../../../src/components/wrapper/UserMenu.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;AAEb,kDAA0B;AAC1B,uDAAoD;AACpD,yDAAsD;AACtD,4CAA8H;AAC9H,wBAAqC;AAErC,6CAA0C;AAC1C,mFAAgF;AAChF,0CAAuC;AACvC,2CAAuC;AACvC,uDAAoD;AACpD,mDAAgD;
|
|
1
|
+
{"version":3,"file":"UserMenu.js","sourceRoot":"","sources":["../../../src/components/wrapper/UserMenu.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DonationPage.d.ts","sourceRoot":"","sources":["../../src/donationComponents/DonationPage.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAC;AAK1B,OAAO,EAA2D,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAK/G,UAAU,KAAK;IAAG,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,eAAe,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE;AAErG,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"DonationPage.d.ts","sourceRoot":"","sources":["../../src/donationComponents/DonationPage.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAC;AAK1B,OAAO,EAA2D,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAK/G,UAAU,KAAK;IAAG,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,eAAe,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE;AAErG,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAuMxC,CAAA"}
|
|
@@ -29,43 +29,60 @@ const DonationPage = (props) => {
|
|
|
29
29
|
const handleClose = () => {
|
|
30
30
|
setAnchorEl(null);
|
|
31
31
|
};
|
|
32
|
-
const
|
|
32
|
+
const loadPaymentMethods = async () => {
|
|
33
|
+
try {
|
|
34
|
+
const data = await helpers_1.ApiHelper.get("/paymentmethods/personid/" + props.personId, "GivingApi");
|
|
35
|
+
if (!data.length) {
|
|
36
|
+
setPaymentMethods([]);
|
|
37
|
+
return;
|
|
38
|
+
}
|
|
39
|
+
const cards = data[0].cards.data.map((card) => new helpers_2.StripePaymentMethod(card));
|
|
40
|
+
const banks = data[0].banks.data.map((bank) => new helpers_2.StripePaymentMethod(bank));
|
|
41
|
+
setCustomerId(data[0].customer.id);
|
|
42
|
+
setPaymentMethods(cards.concat(banks));
|
|
43
|
+
}
|
|
44
|
+
catch (error) {
|
|
45
|
+
console.error("Error loading payment methods:", error);
|
|
46
|
+
setPaymentMethods([]);
|
|
47
|
+
}
|
|
48
|
+
};
|
|
49
|
+
const loadPersonData = async () => {
|
|
50
|
+
try {
|
|
51
|
+
const data = await helpers_1.ApiHelper.get("/people/" + props.personId, "MembershipApi");
|
|
52
|
+
setPerson(data);
|
|
53
|
+
}
|
|
54
|
+
catch (error) {
|
|
55
|
+
console.error("Error loading person data:", error);
|
|
56
|
+
}
|
|
57
|
+
};
|
|
58
|
+
const loadStripeData = async (gatewayData) => {
|
|
59
|
+
if (!gatewayData.length || !gatewayData[0]?.publicKey) {
|
|
60
|
+
setPaymentMethods([]);
|
|
61
|
+
return;
|
|
62
|
+
}
|
|
63
|
+
setStripe((0, stripe_js_1.loadStripe)(gatewayData[0].publicKey));
|
|
64
|
+
await Promise.all([
|
|
65
|
+
loadPersonData(),
|
|
66
|
+
loadPaymentMethods()
|
|
67
|
+
]);
|
|
68
|
+
};
|
|
69
|
+
const loadData = async () => {
|
|
33
70
|
if (props?.appName)
|
|
34
71
|
setAppName(props.appName);
|
|
35
|
-
if (
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
}
|
|
50
|
-
if (!results.length)
|
|
51
|
-
setPaymentMethods([]);
|
|
52
|
-
else {
|
|
53
|
-
let cards = results[0].cards.data.map((card) => new helpers_2.StripePaymentMethod(card));
|
|
54
|
-
let banks = results[0].banks.data.map((bank) => new helpers_2.StripePaymentMethod(bank));
|
|
55
|
-
let methods = cards.concat(banks);
|
|
56
|
-
setCustomerId(results[0].customer.id);
|
|
57
|
-
setPaymentMethods(methods);
|
|
58
|
-
}
|
|
59
|
-
});
|
|
60
|
-
helpers_1.ApiHelper.get("/people/" + props.personId, "MembershipApi").then(data => {
|
|
61
|
-
if (isMounted()) {
|
|
62
|
-
setPerson(data);
|
|
63
|
-
}
|
|
64
|
-
});
|
|
65
|
-
}
|
|
66
|
-
else
|
|
67
|
-
setPaymentMethods([]);
|
|
68
|
-
});
|
|
72
|
+
if (helpers_1.UniqueIdHelper.isMissing(props.personId))
|
|
73
|
+
return;
|
|
74
|
+
try {
|
|
75
|
+
const [donationsData, gatewaysData] = await Promise.all([
|
|
76
|
+
helpers_1.ApiHelper.get("/donations?personId=" + props.personId, "GivingApi"),
|
|
77
|
+
helpers_1.ApiHelper.get("/gateways", "GivingApi")
|
|
78
|
+
]);
|
|
79
|
+
setDonations(donationsData);
|
|
80
|
+
await loadStripeData(gatewaysData);
|
|
81
|
+
}
|
|
82
|
+
catch (error) {
|
|
83
|
+
console.error("Error loading donation data:", error);
|
|
84
|
+
setDonations([]);
|
|
85
|
+
setPaymentMethods([]);
|
|
69
86
|
}
|
|
70
87
|
};
|
|
71
88
|
const handleDataUpdate = (message) => {
|
|
@@ -111,7 +128,9 @@ const DonationPage = (props) => {
|
|
|
111
128
|
}
|
|
112
129
|
return rows;
|
|
113
130
|
};
|
|
114
|
-
react_1.default.useEffect(
|
|
131
|
+
react_1.default.useEffect(() => {
|
|
132
|
+
loadData();
|
|
133
|
+
}, [props.personId]); //eslint-disable-line
|
|
115
134
|
const getTable = () => {
|
|
116
135
|
if (!donations)
|
|
117
136
|
return (0, jsx_runtime_1.jsx)(components_2.Loading, {});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DonationPage.js","sourceRoot":"","sources":["../../src/donationComponents/DonationPage.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;AAEb,kDAA0B;AAC1B,iDAAuD;AACvD,6CAAgF;AAChF,8CAAgE;AAChE,wCAA2F;AAC3F,iDAA+G;AAC/G,uDAAuC;AACvC,4CAAqH;AACrH,8DAA2D;AAIpD,MAAM,YAAY,GAAoB,CAAC,KAAK,EAAE,EAAE;IACrD,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAsB,IAAI,CAAC,CAAC;IAC5E,MAAM,CAAC,aAAa,EAAE,SAAS,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAkB,IAAI,CAAC,CAAC;IACzE,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAwB,IAAI,CAAC,CAAC;IACxF,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACzD,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAkB,IAAI,CAAC,CAAC;IAClE,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAS,IAAI,CAAC,CAAC;IAC3D,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAS,EAAE,CAAC,CAAC;IACzD,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAqB,IAAI,CAAC,CAAC;IACzE,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC/B,MAAM,SAAS,GAAG,IAAA,iCAAe,GAAE,CAAC;IAEpC,MAAM,WAAW,GAAG,GAAG,EAAE;QACvB,WAAW,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC,CAAA;IAED,MAAM,
|
|
1
|
+
{"version":3,"file":"DonationPage.js","sourceRoot":"","sources":["../../src/donationComponents/DonationPage.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;;;AAEb,kDAA0B;AAC1B,iDAAuD;AACvD,6CAAgF;AAChF,8CAAgE;AAChE,wCAA2F;AAC3F,iDAA+G;AAC/G,uDAAuC;AACvC,4CAAqH;AACrH,8DAA2D;AAIpD,MAAM,YAAY,GAAoB,CAAC,KAAK,EAAE,EAAE;IACrD,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAsB,IAAI,CAAC,CAAC;IAC5E,MAAM,CAAC,aAAa,EAAE,SAAS,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAkB,IAAI,CAAC,CAAC;IACzE,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAwB,IAAI,CAAC,CAAC;IACxF,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACzD,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAkB,IAAI,CAAC,CAAC;IAClE,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAS,IAAI,CAAC,CAAC;IAC3D,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAS,EAAE,CAAC,CAAC;IACzD,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,eAAK,CAAC,QAAQ,CAAqB,IAAI,CAAC,CAAC;IACzE,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC/B,MAAM,SAAS,GAAG,IAAA,iCAAe,GAAE,CAAC;IAEpC,MAAM,WAAW,GAAG,GAAG,EAAE;QACvB,WAAW,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC,CAAA;IAED,MAAM,kBAAkB,GAAG,KAAK,IAAI,EAAE;QACpC,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,mBAAS,CAAC,GAAG,CAAC,2BAA2B,GAAG,KAAK,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;YAC5F,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACjB,iBAAiB,CAAC,EAAE,CAAC,CAAC;gBACtB,OAAO;YACT,CAAC;YAED,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,6BAAmB,CAAC,IAAI,CAAC,CAAC,CAAC;YACnF,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,6BAAmB,CAAC,IAAI,CAAC,CAAC,CAAC;YACnF,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YACnC,iBAAiB,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACzC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,gCAAgC,EAAE,KAAK,CAAC,CAAC;YACvD,iBAAiB,CAAC,EAAE,CAAC,CAAC;QACxB,CAAC;IACH,CAAC,CAAA;IAED,MAAM,cAAc,GAAG,KAAK,IAAI,EAAE;QAChC,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,mBAAS,CAAC,GAAG,CAAC,UAAU,GAAG,KAAK,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;YAC/E,SAAS,CAAC,IAAI,CAAC,CAAC;QAClB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,4BAA4B,EAAE,KAAK,CAAC,CAAC;QACrD,CAAC;IACH,CAAC,CAAA;IAED,MAAM,cAAc,GAAG,KAAK,EAAE,WAAgB,EAAE,EAAE;QAChD,IAAI,CAAC,WAAW,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC;YACtD,iBAAiB,CAAC,EAAE,CAAC,CAAC;YACtB,OAAO;QACT,CAAC;QAED,SAAS,CAAC,IAAA,sBAAU,EAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;QAChD,MAAM,OAAO,CAAC,GAAG,CAAC;YAChB,cAAc,EAAE;YAChB,kBAAkB,EAAE;SACrB,CAAC,CAAC;IACL,CAAC,CAAA;IAED,MAAM,QAAQ,GAAG,KAAK,IAAI,EAAE;QAC1B,IAAI,KAAK,EAAE,OAAO;YAAE,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC9C,IAAI,wBAAc,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC;YAAE,OAAO;QAErD,IAAI,CAAC;YACH,MAAM,CAAC,aAAa,EAAE,YAAY,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBACtD,mBAAS,CAAC,GAAG,CAAC,sBAAsB,GAAG,KAAK,CAAC,QAAQ,EAAE,WAAW,CAAC;gBACnE,mBAAS,CAAC,GAAG,CAAC,WAAW,EAAE,WAAW,CAAC;aACxC,CAAC,CAAC;YAEH,YAAY,CAAC,aAAa,CAAC,CAAC;YAC5B,MAAM,cAAc,CAAC,YAAY,CAAC,CAAC;QACrC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,8BAA8B,EAAE,KAAK,CAAC,CAAC;YACrD,YAAY,CAAC,EAAE,CAAC,CAAC;YACjB,iBAAiB,CAAC,EAAE,CAAC,CAAC;QACxB,CAAC;IACH,CAAC,CAAA;IAED,MAAM,gBAAgB,GAAG,CAAC,OAAgB,EAAE,EAAE;QAC5C,UAAU,CAAC,OAAO,CAAC,CAAA;QACnB,iBAAiB,CAAC,IAAI,CAAC,CAAC;QACxB,QAAQ,EAAE,CAAC;IACb,CAAC,CAAA;IAED,MAAM,cAAc,GAAG,GAAG,EAAE;QAC1B,MAAM,MAAM,GAAkB,EAAE,CAAC;QACjC,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QACxB,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QACpC,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;QAErC,MAAM,YAAY,GAAG,CAAC,SAAS,CAAC,MAAM,GAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,YAAY,IAAI,YAAY,CAAC,CAAC,WAAW,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5I,MAAM,SAAS,GAAG,CAAC,SAAS,CAAC,MAAM,GAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,YAAY,IAAI,YAAY,CAAC,CAAC,WAAW,EAAE,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACtI,MAAM,aAAa,GAAG;YACpB,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE;YAClC,EAAE,KAAK,EAAE,cAAc,EAAE,GAAG,EAAE,cAAc,EAAE;YAC9C,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,EAAE,WAAW,EAAE;YACvC,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAC;YACjC,EAAE,KAAK,EAAE,eAAe,EAAE,GAAG,EAAE,eAAe,EAAC;SAChD,CAAA;QAED,MAAM,CAAC,IAAI,CAAC,6DACV,uBAAC,iBAAM,IACL,EAAE,EAAC,iBAAiB,mBACL,IAAI,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS,mBACnC,MAAM,mBACL,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,EACxC,OAAO,EAAE,CAAC,CAAsC,EAAE,EAAE;wBAClD,WAAW,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;oBAC/B,CAAC,YAED,uBAAC,eAAI,2BAAgB,GACd,EACT,wBAAC,eAAI,IACH,EAAE,EAAC,eAAe,EAClB,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,WAAW,EACpB,aAAa,EAAE,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,aAEvD,uBAAC,mBAAQ,IAAC,OAAO,EAAE,WAAW,EAAE,KAAK,kBAAC,uBAAC,uBAAU,IAAC,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAC,wBAAwB,EAAC,aAAa,EAAE,aAAa,EAAE,IAAI,EAAC,oBAAoB,EAAC,IAAI,EAAC,aAAa,GAAG,GAAW,EAChM,uBAAC,mBAAQ,IAAC,OAAO,EAAE,WAAW,EAAE,KAAK,kBAAC,uBAAC,uBAAI,IAAC,EAAE,EAAE,mBAAmB,GAAG,MAAM,EAAE,EAAE,YAAE,wBAAC,iBAAM,eAAC,uBAAC,eAAI,wBAAa,oCAAqC,GAAO,GAAW,EACnK,uBAAC,mBAAQ,IAAC,OAAO,EAAE,WAAW,EAAE,KAAK,kBAAC,uBAAC,uBAAU,IAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAC,qBAAqB,EAAC,aAAa,EAAE,aAAa,EAAE,IAAI,EAAC,iBAAiB,EAAC,IAAI,EAAC,aAAa,GAAG,GAAW,EACvL,uBAAC,mBAAQ,IAAC,OAAO,EAAE,WAAW,EAAE,KAAK,kBAAC,uBAAC,uBAAI,IAAC,EAAE,EAAE,mBAAmB,GAAG,MAAM,EAAE,EAAE,GAAG,SAAS,YAAE,wBAAC,iBAAM,eAAC,uBAAC,eAAI,wBAAa,iCAAkC,GAAO,GAAW,IACvK,IACN,CAAC,CAAC;QAEL,OAAO,MAAM,CAAC;IAChB,CAAC,CAAA;IAED,MAAM,OAAO,GAAG,GAAG,EAAE;QACnB,IAAI,IAAI,GAAkB,EAAE,CAAC;QAE7B,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3B,IAAI,CAAC,IAAI,CAAC,uBAAC,mBAAQ,cAAS,uBAAC,oBAAS,cAAE,gBAAM,CAAC,KAAK,CAAC,0BAA0B,CAAC,GAAa,IAArE,GAAG,CAA6E,CAAC,CAAC;YAC1G,OAAO,IAAI,CAAC;QACd,CAAC;QAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC1C,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;YACrB,IAAI,CAAC,IAAI,CACP,wBAAC,mBAAQ,eACN,OAAO,KAAK,OAAO,IAAI,uBAAC,oBAAS,cAAC,uBAAC,uBAAI,IAAC,EAAE,EAAE,aAAa,GAAG,CAAC,CAAC,OAAO,YAAG,CAAC,CAAC,OAAO,GAAQ,GAAY,EACtG,uBAAC,oBAAS,cAAE,oBAAU,CAAC,UAAU,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,GAAa,EACxE,wBAAC,oBAAS,eAAE,CAAC,CAAC,MAAM,SAAK,CAAC,CAAC,aAAa,IAAa,EACrD,uBAAC,oBAAS,cAAE,CAAC,CAAC,IAAI,CAAC,IAAI,GAAa,EACpC,uBAAC,oBAAS,cAAE,wBAAc,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,GAAa,KALxD,CAAC,CAML,CACZ,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAA;IAED,MAAM,cAAc,GAAG,GAAG,EAAE;QAC1B,MAAM,IAAI,GAAkB,EAAE,CAAA;QAE9B,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,IAAI,CACP,wBAAC,mBAAQ,IAAc,EAAE,EAAE,EAAC,SAAS,EAAE,MAAM,EAAC,aAC3C,OAAO,KAAK,OAAO,IAAI,yCAAK,gBAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,GAAM,EACtE,yCAAK,gBAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,GAAM,EAC7C,yCAAK,gBAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,GAAM,EAC/C,yCAAK,gBAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,GAAM,EAC7C,yCAAK,gBAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,GAAM,KALnC,QAAQ,CAMX,CACZ,CAAC;QACJ,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAA;IAED,eAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACnB,QAAQ,EAAE,CAAC;IACb,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,qBAAqB;IAE3C,MAAM,QAAQ,GAAG,GAAG,EAAE;QACpB,IAAI,CAAC,SAAS;YAAE,OAAO,uBAAC,oBAAO,KAAG,CAAC;;YAC9B,OAAO,CAAC,wBAAC,gBAAK,eACjB,uBAAC,oBAAS,cAAE,cAAc,EAAE,GAAa,EACzC,uBAAC,oBAAS,cAAE,OAAO,EAAE,GAAa,IAC5B,CAAC,CAAC;IACZ,CAAC,CAAA;IAED,MAAM,0BAA0B,GAAG,GAAG,EAAE;QACtC,IAAI,CAAC,cAAc,IAAI,CAAC,SAAS;YAAE,OAAO,uBAAC,oBAAO,KAAG,CAAC;;YACjD,OAAO,CACV,6DACE,uBAAC,yBAAY,IAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,cAAc,EAAE,cAAc,EAAE,aAAa,EAAE,aAAa,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,GAAI,EAC/M,uBAAC,uBAAU,IAAC,UAAU,EAAC,UAAU,EAAC,UAAU,EAAC,WAAW,EAAC,WAAW,EAAE,cAAc,EAAE,YACnF,QAAQ,EAAE,GACA,EACb,uBAAC,+BAAkB,IAAC,UAAU,EAAE,UAAU,EAAE,cAAc,EAAE,cAAc,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,gBAAgB,GAAI,EAC9H,uBAAC,2BAAc,IAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,cAAc,EAAE,cAAc,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,UAAU,EAAE,gBAAgB,GAAI,IACvK,CACJ,CAAC;IACJ,CAAC,CAAA;IAED,OAAO,CACL,6DACG,cAAc,IAAI,OAAO,IAAI,uBAAC,gBAAK,IAAC,QAAQ,EAAC,SAAS,YAAE,OAAO,GAAS,EACxE,0BAA0B,EAAE,IAC5B,CACJ,CAAC;AACJ,CAAC,CAAA;AAvMY,QAAA,YAAY,gBAuMxB"}
|
package/package.json
CHANGED
|
@@ -24,24 +24,21 @@ export const ChurchList: React.FC<Props> = props => {
|
|
|
24
24
|
}
|
|
25
25
|
}
|
|
26
26
|
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
/>);
|
|
43
|
-
});
|
|
27
|
+
let result: JSX.Element[] = [];
|
|
28
|
+
userChurches.forEach(uc => {
|
|
29
|
+
const userChurch = uc;
|
|
30
|
+
const churchName = uc.church.name;
|
|
31
|
+
result.push(<NavItem
|
|
32
|
+
key={userChurch.church.id}
|
|
33
|
+
selected={(uc.church.id === props.currentUserChurch.church.id) && true}
|
|
34
|
+
onClick={() => UserHelper.selectChurch(props.context, userChurch.church.id, null)}
|
|
35
|
+
label={churchName}
|
|
36
|
+
icon="church"
|
|
37
|
+
deleteIcon={uc.church.id !== props.currentUserChurch.church.id ? "delete" : null}
|
|
38
|
+
deleteLabel={Locale.label("wrapper.deleteChurch")}
|
|
39
|
+
deleteFunction={() => { handleDelete(uc); }}
|
|
40
|
+
/>);
|
|
41
|
+
});
|
|
44
42
|
|
|
45
|
-
|
|
46
|
-
}
|
|
43
|
+
return <>{result}</>;
|
|
47
44
|
};
|
|
@@ -12,6 +12,7 @@ import { TabPanel } from "../TabPanel";
|
|
|
12
12
|
import { Locale } from "../../helpers";
|
|
13
13
|
import { PrivateMessages } from "./PrivateMessages";
|
|
14
14
|
import { Notifications } from "./Notifications";
|
|
15
|
+
import { useCookies } from "react-cookie";
|
|
15
16
|
|
|
16
17
|
|
|
17
18
|
interface Props {
|
|
@@ -32,6 +33,7 @@ export const UserMenu: React.FC<Props> = (props) => {
|
|
|
32
33
|
const [showPM, setShowPM] = React.useState(false);
|
|
33
34
|
const [showNotifications, setShowNotifications] = React.useState(false);
|
|
34
35
|
const [refreshKey, setRefreshKey] = React.useState(0);
|
|
36
|
+
const [, , removeCookie] = useCookies(["lastChurchId"]);
|
|
35
37
|
const open = Boolean(anchorEl);
|
|
36
38
|
|
|
37
39
|
|
|
@@ -45,6 +47,11 @@ export const UserMenu: React.FC<Props> = (props) => {
|
|
|
45
47
|
setAnchorEl(null);
|
|
46
48
|
};
|
|
47
49
|
|
|
50
|
+
const handleSwitchChurch = () => {
|
|
51
|
+
removeCookie("lastChurchId", { path: "/" });
|
|
52
|
+
setTabIndex(2);
|
|
53
|
+
};
|
|
54
|
+
|
|
48
55
|
const getMainLinks = () => {
|
|
49
56
|
const jwt = ApiHelper.getConfig("MembershipApi").jwt;
|
|
50
57
|
const churchId = UserHelper.currentUserChurch.church.id;
|
|
@@ -60,7 +67,7 @@ export const UserMenu: React.FC<Props> = (props) => {
|
|
|
60
67
|
result.push(<NavItem url="/logout" label={Locale.label("wrapper.logout")} icon="logout" key="/logout" onNavigate={props.onNavigate} />);
|
|
61
68
|
result.push(<div style={{borderTop:"1px solid #CCC", paddingTop:2, paddingBottom:2}}></div>)
|
|
62
69
|
result.push(<NavItem label="Switch App" key={Locale.label("wrapper.switchApp")} icon="apps" onClick={() => { setTabIndex(1); }} />);
|
|
63
|
-
|
|
70
|
+
result.push(<NavItem label={Locale.label("wrapper.switchChurch")} key="Switch Church" icon="church" onClick={handleSwitchChurch} />);
|
|
64
71
|
return result;
|
|
65
72
|
}
|
|
66
73
|
|
|
@@ -95,12 +102,12 @@ export const UserMenu: React.FC<Props> = (props) => {
|
|
|
95
102
|
<NavItem label="Back" key="AppBack" icon="arrow_back" onClick={() => { setTabIndex(0); }} />
|
|
96
103
|
<AppList currentUserChurch={props.currentUserChurch} appName={props.appName} onNavigate={props.onNavigate} />
|
|
97
104
|
</TabPanel>
|
|
98
|
-
|
|
105
|
+
<TabPanel value={tabIndex} index={2}>
|
|
99
106
|
<div style={{ maxHeight: '70vh', overflowY: "auto" }}>
|
|
100
107
|
<NavItem label="Back" key="ChurchBack" icon="arrow_back" onClick={() => { setTabIndex(0); }} />
|
|
101
108
|
<ChurchList userChurches={props.userChurches} currentUserChurch={props.currentUserChurch} context={props.context} onDelete={handleClose} />
|
|
102
109
|
</div>
|
|
103
|
-
</TabPanel>
|
|
110
|
+
</TabPanel>
|
|
104
111
|
|
|
105
112
|
</Box>
|
|
106
113
|
);
|
|
@@ -28,39 +28,62 @@ export const DonationPage: React.FC<Props> = (props) => {
|
|
|
28
28
|
setAnchorEl(null);
|
|
29
29
|
}
|
|
30
30
|
|
|
31
|
-
const
|
|
31
|
+
const loadPaymentMethods = async () => {
|
|
32
|
+
try {
|
|
33
|
+
const data = await ApiHelper.get("/paymentmethods/personid/" + props.personId, "GivingApi");
|
|
34
|
+
if (!data.length) {
|
|
35
|
+
setPaymentMethods([]);
|
|
36
|
+
return;
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
const cards = data[0].cards.data.map((card: any) => new StripePaymentMethod(card));
|
|
40
|
+
const banks = data[0].banks.data.map((bank: any) => new StripePaymentMethod(bank));
|
|
41
|
+
setCustomerId(data[0].customer.id);
|
|
42
|
+
setPaymentMethods(cards.concat(banks));
|
|
43
|
+
} catch (error) {
|
|
44
|
+
console.error("Error loading payment methods:", error);
|
|
45
|
+
setPaymentMethods([]);
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
const loadPersonData = async () => {
|
|
50
|
+
try {
|
|
51
|
+
const data = await ApiHelper.get("/people/" + props.personId, "MembershipApi");
|
|
52
|
+
setPerson(data);
|
|
53
|
+
} catch (error) {
|
|
54
|
+
console.error("Error loading person data:", error);
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
const loadStripeData = async (gatewayData: any) => {
|
|
59
|
+
if (!gatewayData.length || !gatewayData[0]?.publicKey) {
|
|
60
|
+
setPaymentMethods([]);
|
|
61
|
+
return;
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
setStripe(loadStripe(gatewayData[0].publicKey));
|
|
65
|
+
await Promise.all([
|
|
66
|
+
loadPersonData(),
|
|
67
|
+
loadPaymentMethods()
|
|
68
|
+
]);
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
const loadData = async () => {
|
|
32
72
|
if (props?.appName) setAppName(props.appName);
|
|
33
|
-
if (
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
if (!results.length) setPaymentMethods([]);
|
|
48
|
-
else {
|
|
49
|
-
let cards = results[0].cards.data.map((card: any) => new StripePaymentMethod(card));
|
|
50
|
-
let banks = results[0].banks.data.map((bank: any) => new StripePaymentMethod(bank));
|
|
51
|
-
let methods = cards.concat(banks);
|
|
52
|
-
setCustomerId(results[0].customer.id);
|
|
53
|
-
setPaymentMethods(methods);
|
|
54
|
-
}
|
|
55
|
-
});
|
|
56
|
-
ApiHelper.get("/people/" + props.personId, "MembershipApi").then(data => {
|
|
57
|
-
if(isMounted()) {
|
|
58
|
-
setPerson(data);
|
|
59
|
-
}
|
|
60
|
-
});
|
|
61
|
-
}
|
|
62
|
-
else setPaymentMethods([]);
|
|
63
|
-
});
|
|
73
|
+
if (UniqueIdHelper.isMissing(props.personId)) return;
|
|
74
|
+
|
|
75
|
+
try {
|
|
76
|
+
const [donationsData, gatewaysData] = await Promise.all([
|
|
77
|
+
ApiHelper.get("/donations?personId=" + props.personId, "GivingApi"),
|
|
78
|
+
ApiHelper.get("/gateways", "GivingApi")
|
|
79
|
+
]);
|
|
80
|
+
|
|
81
|
+
setDonations(donationsData);
|
|
82
|
+
await loadStripeData(gatewaysData);
|
|
83
|
+
} catch (error) {
|
|
84
|
+
console.error("Error loading donation data:", error);
|
|
85
|
+
setDonations([]);
|
|
86
|
+
setPaymentMethods([]);
|
|
64
87
|
}
|
|
65
88
|
}
|
|
66
89
|
|
|
@@ -156,7 +179,9 @@ export const DonationPage: React.FC<Props> = (props) => {
|
|
|
156
179
|
return rows;
|
|
157
180
|
}
|
|
158
181
|
|
|
159
|
-
React.useEffect(
|
|
182
|
+
React.useEffect(() => {
|
|
183
|
+
loadData();
|
|
184
|
+
}, [props.personId]); //eslint-disable-line
|
|
160
185
|
|
|
161
186
|
const getTable = () => {
|
|
162
187
|
if (!donations) return <Loading />;
|