From e8aaab99f979b453c53110f821a3184aa405ee2d Mon Sep 17 00:00:00 2001 From: prafull-opensignlabs Date: Mon, 1 Apr 2024 16:54:26 +0530 Subject: [PATCH] fix: change message of already subscribed --- apps/OpenSign/src/components/Header.js | 1 + apps/OpenSign/src/pages/PlanSubscriptions.js | 2 +- apps/OpenSignServer/cloud/parsefunction/SubscribeFree.js | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/OpenSign/src/components/Header.js b/apps/OpenSign/src/components/Header.js index 268cf883b..17e5e2dcd 100644 --- a/apps/OpenSign/src/components/Header.js +++ b/apps/OpenSign/src/components/Header.js @@ -22,6 +22,7 @@ const Header = ({ showSidebar }) => { }; useEffect(() => { checkIsSubscribed(); + // eslint-disable-next-line react-hooks/exhaustive-deps }, []); async function checkIsSubscribed() { const currentUser = Parse.User.current(); diff --git a/apps/OpenSign/src/pages/PlanSubscriptions.js b/apps/OpenSign/src/pages/PlanSubscriptions.js index 954cc432d..7c56f6e37 100644 --- a/apps/OpenSign/src/pages/PlanSubscriptions.js +++ b/apps/OpenSign/src/pages/PlanSubscriptions.js @@ -51,7 +51,7 @@ const PlanSubscriptions = () => { const res = await Parse.Cloud.run("freesubscription", params); if (res.status === "success" && res.result === "already subscribed!") { setIsLoader(false); - alert("You have already subscription of free plan"); + alert("You have already subscribed to plan!"); } else if (res.status === "success") { setIsLoader(false); navigate("/"); diff --git a/apps/OpenSignServer/cloud/parsefunction/SubscribeFree.js b/apps/OpenSignServer/cloud/parsefunction/SubscribeFree.js index 674d56223..03c4fb95f 100644 --- a/apps/OpenSignServer/cloud/parsefunction/SubscribeFree.js +++ b/apps/OpenSignServer/cloud/parsefunction/SubscribeFree.js @@ -19,6 +19,8 @@ export default async function SubscribeFree(request) { console.log('err ', err); return { status: 'error', result: err.message }; } + } else if (extUser?.get('Next_billing_date') > new Date()) { + return { status: 'success', result: 'already subscribed!' }; } else { try { const extUpdate = new Parse.Object('contracts_Users');