diff --git a/apps/OpenSign/package-lock.json b/apps/OpenSign/package-lock.json index 5571578e4..16c09673d 100644 --- a/apps/OpenSign/package-lock.json +++ b/apps/OpenSign/package-lock.json @@ -79,7 +79,7 @@ "eslint-plugin-react": "^7.34.3", "lint-staged": "^15.2.8", "mini-css-extract-plugin": "^2.9.1", - "postcss": "^8.4.41", + "postcss": "^8.4.44", "prettier": "^3.3.3", "pretty-quick": "^4.0.0", "tailwindcss": "^3.4.10", @@ -18207,9 +18207,9 @@ } }, "node_modules/postcss": { - "version": "8.4.41", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.41.tgz", - "integrity": "sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==", + "version": "8.4.44", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.44.tgz", + "integrity": "sha512-Aweb9unOEpQ3ezu4Q00DPvvM2ZTUitJdNKeP/+uQgr1IBIqu574IaZoURId7BKtWMREwzKa9OgzPzezWGPWFQw==", "funding": [ { "type": "opencollective", diff --git a/apps/OpenSign/package.json b/apps/OpenSign/package.json index f33c5aba4..79712fa1e 100644 --- a/apps/OpenSign/package.json +++ b/apps/OpenSign/package.json @@ -111,7 +111,7 @@ "eslint-plugin-react": "^7.34.3", "lint-staged": "^15.2.8", "mini-css-extract-plugin": "^2.9.1", - "postcss": "^8.4.41", + "postcss": "^8.4.44", "prettier": "^3.3.3", "pretty-quick": "^4.0.0", "tailwindcss": "^3.4.10", diff --git a/apps/OpenSign/public/locales/en/translation.json b/apps/OpenSign/public/locales/en/translation.json index 02df68661..32ad1ce69 100644 --- a/apps/OpenSign/public/locales/en/translation.json +++ b/apps/OpenSign/public/locales/en/translation.json @@ -40,6 +40,7 @@ "upgrade-now": "Upgrade now", "upgrade-to": "Upgrade to", "plan": "Plan", + "subscribe-card-teamplan":"Unlock the full power of collaboration! Create unlimited organizations, teams, and hierarchies. Share templates seamlessly across teams and assign custom user roles. Elevate your workflow today!", "subscribe-card-plan": "Unlock premium features starting at just {{premiumPrice}}/month. Enjoy enhanced performance and only {{addonPrice}} per additional credit after your included premium credits.", "user-name-limit-char": "To have a username less than 8 character please subscribe", "tour-content": "Don't show this again", @@ -216,8 +217,8 @@ "initials": "Initials", "API": "API", "api-token": "API Token", - "regenerate-token": "Regenerate Token", - "generate-token": "Generate Token", + "regenerate-token": "Regenerate Live Token", + "generate-token": "Generate Live Token", "view-docs": "View Docs", "generate-token-alert": "Are you sure you want to regenerate token it will expire old token?", "yes": "Yes", diff --git a/apps/OpenSign/public/locales/fr/translation.json b/apps/OpenSign/public/locales/fr/translation.json index 4faac0193..36c089f83 100644 --- a/apps/OpenSign/public/locales/fr/translation.json +++ b/apps/OpenSign/public/locales/fr/translation.json @@ -42,6 +42,7 @@ "upgrade-to": "Mettre à niveau vers", "pro": "PRO", "plan": "Offre", + "subscribe-card-teamplan":"Libérez toute la puissance de la collaboration ! Créez un nombre illimité d'organisations, d'équipes et de hiérarchies. Partagez des modèles de manière transparente entre les équipes et attribuez des rôles d'utilisateur personnalisés. Améliorez votre flux de travail dès aujourd'hui !", "subscribe-card-plan": "Débloquez des fonctionnalités premium à partir de seulement {{premiumPrice}}/mois. Bénéficiez de performances améliorées et de seulement {{addonPrice}} par crédit supplémentaire après vos crédits premium inclus.", "user-name-limit-char": "Pour avoir un nom d'utilisateur de moins de 8 caractères s'il vous plaît s'abonner", "tour-content": "Ne plus afficher", @@ -216,8 +217,8 @@ "initials": "Initiales", "API": "API", "api-token": "Jeton API", - "regenerate-token": "Régénérer le jeton", - "generate-token": "Générer un jeton", + "regenerate-token": "Régénérer en direct jeton", + "generate-token": "Générer en direct jeton", "view-docs": "Afficher les documents", "generate-token-alert": "Êtes-vous sûr de vouloir régénérer le jeton, votre ancien jeton sera supprimer?", "yes": "Oui", diff --git a/apps/OpenSign/src/pages/GenerateToken.js b/apps/OpenSign/src/pages/GenerateToken.js index 89aea8dfc..d5fa82ac6 100644 --- a/apps/OpenSign/src/pages/GenerateToken.js +++ b/apps/OpenSign/src/pages/GenerateToken.js @@ -260,7 +260,7 @@ function GenerateToken() { @@ -332,14 +332,14 @@ function GenerateToken() { "https://docs.opensignlabs.com/docs/API-docs/opensign-api-v-1" ) } - className="op-btn op-btn-secondary mt-2 md:mb-3 px-8 w-[200px] md:w-auto" + className="op-btn op-btn-secondary mt-2 md:mb-3 px-8 w-[210px] md:w-auto" > {t("view-docs")} @@ -420,9 +420,9 @@ function GenerateToken() { - {isSubscribe?.plan === "freeplan" && isEnableSubscription && ( + {isEnableSubscription && isSubscribe?.plan === "freeplan" && (
- +
)} diff --git a/apps/OpenSign/src/pages/TeamList.js b/apps/OpenSign/src/pages/TeamList.js index d2d57f479..1e0f1d07d 100644 --- a/apps/OpenSign/src/pages/TeamList.js +++ b/apps/OpenSign/src/pages/TeamList.js @@ -467,13 +467,9 @@ const TeamList = () => { )} )} - {!validplan[isSubscribe.plan] && isEnableSubscription && !isLoader && ( + {isEnableSubscription && !validplan[isSubscribe.plan] && !isLoader && (
- +
)} diff --git a/apps/OpenSign/src/pages/UpdateExistUserAdmin.js b/apps/OpenSign/src/pages/UpdateExistUserAdmin.js index 089dd9acb..be5920cdc 100644 --- a/apps/OpenSign/src/pages/UpdateExistUserAdmin.js +++ b/apps/OpenSign/src/pages/UpdateExistUserAdmin.js @@ -21,7 +21,7 @@ const UpdateExistUserAdmin = () => { try { const isAdminExist = await Parse.Cloud.run("checkadminexist"); if (isAdminExist !== "not_exist") { - console.log("isAdminExist ", isAdminExist); + // console.log("isAdminExist ", isAdminExist); setErrMsg("Admin already exists."); } } catch (err) { diff --git a/apps/OpenSign/src/pages/UserList.js b/apps/OpenSign/src/pages/UserList.js index 3a1d0b8f6..6ae622e9d 100644 --- a/apps/OpenSign/src/pages/UserList.js +++ b/apps/OpenSign/src/pages/UserList.js @@ -421,13 +421,9 @@ const UserList = () => { )} )} - {!validplan[isSubscribe.plan] && isEnableSubscription && !isLoader && ( + {isEnableSubscription && !validplan[isSubscribe.plan] && !isLoader && (
- +
)} diff --git a/apps/OpenSign/src/pages/Webhook.js b/apps/OpenSign/src/pages/Webhook.js index 939d8ea5c..abc75d382 100644 --- a/apps/OpenSign/src/pages/Webhook.js +++ b/apps/OpenSign/src/pages/Webhook.js @@ -177,9 +177,9 @@ function Webhook() { - {!isSubscribe?.isValid && isEnableSubscription && ( + {isEnableSubscription && !isSubscribe?.isValid && (
- +
)} diff --git a/apps/OpenSign/src/primitives/GetReportDisplay.js b/apps/OpenSign/src/primitives/GetReportDisplay.js index f0542233b..9171b52a7 100644 --- a/apps/OpenSign/src/primitives/GetReportDisplay.js +++ b/apps/OpenSign/src/primitives/GetReportDisplay.js @@ -1661,8 +1661,8 @@ const ReportTable = (props) => { )} )} - {!validplan[isSubscribe.plan] && - isEnableSubscription && ( + {isEnableSubscription && + !validplan[isSubscribe.plan] && ( <>
{ > ✕
- + )} - {validplan[isSubscribe.plan] && - !isEnableSubscription && ( + {!isEnableSubscription && + validplan[isSubscribe.plan] && ( <>

{t("share-with")} diff --git a/apps/OpenSign/src/primitives/QuotaCard.js b/apps/OpenSign/src/primitives/QuotaCard.js index 1a29bbbd3..dc686230b 100644 --- a/apps/OpenSign/src/primitives/QuotaCard.js +++ b/apps/OpenSign/src/primitives/QuotaCard.js @@ -18,7 +18,7 @@ const QuotaCard = ({ isSignyourself, handlClose }) => {

{t("upgrade-to") + " Paid " + t("plan")}

-

{t("quotamailselfsign")}

+

{t("quotamailselfsign")}