diff --git a/apps/OpenSign/src/components/BulkSendUi.js b/apps/OpenSign/src/components/BulkSendUi.js index b46584235..4491a08d3 100644 --- a/apps/OpenSign/src/components/BulkSendUi.js +++ b/apps/OpenSign/src/components/BulkSendUi.js @@ -262,7 +262,7 @@ const BulkSendUi = (props) => { quantity: 500, priceperbulksend: 0.15, price: (75.0).toFixed(2), - totalcredits: _resAddon.addon + totalcredits: obj?.totalcredits + _resAddon.addon })); } } diff --git a/apps/OpenSign/src/pages/PlanSubscriptions.js b/apps/OpenSign/src/pages/PlanSubscriptions.js index bc9b9526a..8428487ef 100644 --- a/apps/OpenSign/src/pages/PlanSubscriptions.js +++ b/apps/OpenSign/src/pages/PlanSubscriptions.js @@ -4,7 +4,7 @@ import checkmark from "../assets/images/checkmark.png"; import plansArr from "../json/plansArr"; import Title from "../components/Title"; import Parse from "parse"; -import { openInNewTab } from "../constant/Utils"; +import { openInNewTab, saveLanguageInLocal } from "../constant/Utils"; import Loader from "../primitives/Loader"; import { useTranslation } from "react-i18next"; const listItemStyle = { @@ -119,6 +119,30 @@ const PlanSubscriptions = () => { } } }; + const handleLogout = async () => { + try { + Parse?.User?.logOut(); + } catch (err) { + console.log("Err", err); + } + let appdata = localStorage.getItem("userSettings"); + let applogo = localStorage.getItem("appLogo"); + let defaultmenuid = localStorage.getItem("defaultmenuid"); + let PageLanding = localStorage.getItem("PageLanding"); + let baseUrl = localStorage.getItem("baseUrl"); + let appid = localStorage.getItem("parseAppId"); + + localStorage.clear(); + saveLanguageInLocal(i18n); + localStorage.setItem("appLogo", applogo); + localStorage.setItem("defaultmenuid", defaultmenuid); + localStorage.setItem("PageLanding", PageLanding); + localStorage.setItem("userSettings", appdata); + localStorage.setItem("baseUrl", baseUrl); + localStorage.setItem("parseAppId", appid); + + navigate("/"); + }; return ( <> @@ -129,7 +153,13 @@ const PlanSubscriptions = () => { ) : ( <div className="overflow-y-auto max-h-full"> <div className="block my-2"> - <div className="flex flex-col justify-center items-center w-full"> + <div className="flex flex-col justify-center items-center w-full relative"> + <button + className="md:hidden op-btn op-btn-primary op-btn-sm h-[40px] w-[250px] shadow-lg" + onClick={() => handleLogout()} + > + Log out + </button> <div role="tablist" className="op-tabs op-tabs-boxed bg-base-100 my-2 shadow-lg transition-all" @@ -150,6 +180,12 @@ const PlanSubscriptions = () => { </a> </div> <ul className="op-card flex flex-col md:flex-row h-full bg-base-100 justify-center shadow-lg"> + <button + className="hidden md:block -top-12 right-1 absolute w-[150px] h-[40px] op-btn op-btn-primary op-btn-sm shadow-lg" + onClick={() => handleLogout()} + > + {t("log-out")} + </button> {plansArr.map((item) => ( <li className="flex flex-col text-center border-collapse border-[1px] border-gray-300 max-w-[250px]" diff --git a/apps/OpenSignServer/cloud/parsefunction/BuyCredits.js b/apps/OpenSignServer/cloud/parsefunction/BuyCredits.js index 0e0e99827..c33134cc2 100644 --- a/apps/OpenSignServer/cloud/parsefunction/BuyCredits.js +++ b/apps/OpenSignServer/cloud/parsefunction/BuyCredits.js @@ -67,7 +67,7 @@ export default async function BuyCredits(request) { updateSub.set('AddonCredits', addonCredits); const resupdateSub = await updateSub.save(null, { useMasterKey: true }); // console.log('resupdateSub ', resupdateSub); - return { status: 'success', addon: addonCredits }; + return { status: 'success', addon: quantity }; } } else { throw new Parse.Error('400', 'Invalid access token.');