diff --git a/apps/OpenSign/src/components/Header.js b/apps/OpenSign/src/components/Header.js index 236120820..f1516d6ba 100644 --- a/apps/OpenSign/src/components/Header.js +++ b/apps/OpenSign/src/components/Header.js @@ -13,9 +13,9 @@ const Header = ({ showSidebar }) => { let applogo = localStorage.getItem("appLogo") || ""; let username = localStorage.getItem("username"); const image = localStorage.getItem("profileImg") || dp; - const [isOpen, setIsOpen] = useState(false); const [isSubscribe, setIsSubscribe] = useState(true); + const [isPro, setIsPro]= useState(false) const toggleDropdown = () => { setIsOpen(!isOpen); @@ -27,6 +27,7 @@ const Header = ({ showSidebar }) => { async function checkSubscription() { if (isEnableSubscription) { const getIsSubscribe = await checkIsSubscribed(); + setIsPro(getIsSubscribe) setIsSubscribe(getIsSubscribe); } } @@ -105,6 +106,11 @@ const Header = ({ showSidebar }) => { )} + {isPro && ( +
+ PRO +
+ )}
diff --git a/apps/OpenSign/src/pages/Login.js b/apps/OpenSign/src/pages/Login.js index ba1714abb..eeaa76447 100644 --- a/apps/OpenSign/src/pages/Login.js +++ b/apps/OpenSign/src/pages/Login.js @@ -1164,25 +1164,12 @@ function Login() {
{(appInfo.fbAppId || appInfo.googleClietId) && ( -
-
- +
+
+ OR -
+
)}
diff --git a/apps/OpenSign/src/pages/PlanSubscriptions.js b/apps/OpenSign/src/pages/PlanSubscriptions.js index d68a85fc6..db225563c 100644 --- a/apps/OpenSign/src/pages/PlanSubscriptions.js +++ b/apps/OpenSign/src/pages/PlanSubscriptions.js @@ -92,7 +92,7 @@ const PlanSubscriptions = () => { maxHeight: "100%" }} > -
+
{
    {plansArr.map((item) => (
  • -
    +

    {item.planName}

    @@ -133,7 +133,7 @@ const PlanSubscriptions = () => { alt="freeimg" />
    -
    +
    {item.currency && {item.currency}} {yearlyVisible @@ -143,13 +143,7 @@ const PlanSubscriptions = () => {

    {yearlyVisible ? "Billed Yearly" : "Billed Monthly"}

    -
    +
    { : item.url + details : item.url } - className="bg-[#002862] w-full mt-1 text-white py-2 rounded uppercase hover:no-underline hover:text-white cursor-pointer" + className="bg-[#002862] w-full text-white py-2 rounded uppercase hover:no-underline hover:text-white cursor-pointer" target={item.target} > {item.btnText} ) : (
-
-
- - or - -
+
+
+ or +

diff --git a/apps/OpenSignServer/cloud/parsefunction/reportsJson.js b/apps/OpenSignServer/cloud/parsefunction/reportsJson.js index 2aa126dd5..be55bcd98 100644 --- a/apps/OpenSignServer/cloud/parsefunction/reportsJson.js +++ b/apps/OpenSignServer/cloud/parsefunction/reportsJson.js @@ -164,19 +164,10 @@ export default function reportJson(id, userId) { IsDeclined: { $ne: true }, IsArchive: { $ne: true }, Type: { $ne: 'Folder' }, - $and: [ - { - $or: [ - { Signers: { $ne: null }, SignedUrl: { $ne: null } }, - { Placeholders: { $ne: null } }, - ], - }, - { - ExpiryDate: { - $lt: { __type: 'Date', iso: new Date().toISOString() }, - }, - }, - ], + SignedUrl: { $ne: null }, + ExpiryDate: { + $lt: { __type: 'Date', iso: new Date().toISOString() }, + }, CreatedBy: { __type: 'Pointer', className: '_User',