diff --git a/apps/OpenSign/src/components/AddSigner.js b/apps/OpenSign/src/components/AddSigner.js index f5e070e82..a44a80026 100644 --- a/apps/OpenSign/src/components/AddSigner.js +++ b/apps/OpenSign/src/components/AddSigner.js @@ -56,11 +56,11 @@ const AddSigner = (props) => { contactQuery.set("Email", email); contactQuery.set("UserRole", "contracts_Guest"); - if (localStorage.getItem("TenetId")) { + if (localStorage.getItem("TenantId")) { contactQuery.set("TenantId", { __type: "Pointer", className: "partners_Tenant", - objectId: localStorage.getItem("TenetId") + objectId: localStorage.getItem("TenantId") }); } diff --git a/apps/OpenSign/src/components/AddUser.js b/apps/OpenSign/src/components/AddUser.js index 67d6095e0..d812a1cd0 100644 --- a/apps/OpenSign/src/components/AddUser.js +++ b/apps/OpenSign/src/components/AddUser.js @@ -48,11 +48,11 @@ const AddUser = (props) => { contactQuery.set("Email", email); contactQuery.set("UserRole", "contracts_User"); - if (localStorage.getItem("TenetId")) { + if (localStorage.getItem("TenantId")) { contactQuery.set("TenantId", { __type: "Pointer", className: "partners_Tenant", - objectId: localStorage.getItem("TenetId") + objectId: localStorage.getItem("TenantId") }); } diff --git a/apps/OpenSign/src/constant/const.js b/apps/OpenSign/src/constant/const.js index a046b4ae1..43691ac98 100644 --- a/apps/OpenSign/src/constant/const.js +++ b/apps/OpenSign/src/constant/const.js @@ -9,4 +9,4 @@ export const modalSubmitBtnColor = "#17a2b8"; export const modalCancelBtnColor = "white"; export const themeColor = "#47a3ad"; export const iconColor = "#686968"; -export const isEnableSubscription = process.env.REACT_APP_ENABLE_SUBSCRIPTION; +export const isEnableSubscription = false//process.env.REACT_APP_ENABLE_SUBSCRIPTION; diff --git a/apps/OpenSign/src/constant/saveFileSize.js b/apps/OpenSign/src/constant/saveFileSize.js index 56927ff05..51c71d31d 100644 --- a/apps/OpenSign/src/constant/saveFileSize.js +++ b/apps/OpenSign/src/constant/saveFileSize.js @@ -2,17 +2,25 @@ import axios from "axios"; const parseAppId = localStorage.getItem("parseAppId"); const serverUrl = localStorage.getItem("baseUrl"); -export const SaveFileSize = async (size, imageUrl) => { +export const SaveFileSize = async (size, imageUrl, tenantId) => { //checking server url and save file's size - + const tenantPtr = { + __type: "Pointer", + className: "partners_Tenant", + objectId: tenantId + }; + const _tenantPtr = JSON.stringify(tenantPtr); try { const response = await axios - .get(`${serverUrl}classes/partners_TenantCredits`, { - headers: { - "Content-Type": "application/json", - "X-Parse-Application-Id": parseAppId + .get( + `${serverUrl}classes/partners_TenantCredits?where={"PartnersTenant":${_tenantPtr}}`, + { + headers: { + "Content-Type": "application/json", + "X-Parse-Application-Id": parseAppId + } } - }) + ) .then((result) => { const res = result.data; // console.log("res", res); @@ -49,9 +57,7 @@ export const SaveFileSize = async (size, imageUrl) => { console.log("axois err ", err); }); } else { - data = { - usedStorage: size - }; + data = { usedStorage: size, PartnersTenant: tenantPtr }; await axios .post(`${serverUrl}classes/partners_TenantCredits`, data, { headers: { @@ -70,14 +76,15 @@ export const SaveFileSize = async (size, imageUrl) => { } catch (e) { console.log("org app error", e); } - saveDataFile(size, imageUrl); + saveDataFile(size, imageUrl, tenantPtr); }; //function for save fileUrl and file size in particular client db class partners_DataFiles -const saveDataFile = async (size, imageUrl) => { +const saveDataFile = async (size, imageUrl, tenantPtr) => { const data = { FileUrl: imageUrl, - FileSize: size + FileSize: size, + TenantPtr: tenantPtr }; // console.log("data save",file, data) @@ -88,9 +95,9 @@ const saveDataFile = async (size, imageUrl) => { "X-Parse-Application-Id": parseAppId } }) - .then(() => { - // const res = result.data; - // console.log("res", res); + .then((result) => { + const res = result.data; + console.log("res", res); }) .catch((err) => { console.log("axois err ", err); diff --git a/apps/OpenSign/src/pages/Form.js b/apps/OpenSign/src/pages/Form.js index 4ab1a09f2..c726ad1cb 100644 --- a/apps/OpenSign/src/pages/Form.js +++ b/apps/OpenSign/src/pages/Form.js @@ -10,6 +10,7 @@ import SelectFolder from "../components/shared/fields/SelectFolder"; import SignersInput from "../components/shared/fields/SignersInput"; import Title from "../components/Title"; import PageNotFound from "./PageNotFound"; +import { SaveFileSize } from "../constant/saveFileSize"; // `Form` render all type of Form on this basis of their provided in path function Form() { @@ -82,6 +83,7 @@ const Forms = (props) => { const handleFileUpload = async (file) => { setfileload(true); const fileName = file.name; + const size = file.size; const name = sanitizeFileName(fileName); const pdfFile = file; const parseFile = new Parse.File(name, pdfFile); @@ -101,6 +103,8 @@ const Forms = (props) => { setFileUpload(response.url()); setfileload(false); if (response.url()) { + const tenantId = localStorage.getItem("TenantId"); + SaveFileSize(size, response.url(), tenantId); return response.url(); } } catch (error) { @@ -113,6 +117,7 @@ const Forms = (props) => { const dropboxSuccess = async (files) => { setfileload(true); const file = files[0]; + const size = file.bytes; const url = file.link; const mb = Math.round(file.bytes / Math.pow(1024, 2)); @@ -141,6 +146,8 @@ const Forms = (props) => { setfileload(false); if (response.url()) { + const tenantId = localStorage.getItem("TenantId"); + SaveFileSize(size, response.url(), tenantId); return response.url(); } } catch (error) { diff --git a/apps/OpenSign/src/pages/Login.js b/apps/OpenSign/src/pages/Login.js index 1d73c0bda..75759aa70 100644 --- a/apps/OpenSign/src/pages/Login.js +++ b/apps/OpenSign/src/pages/Login.js @@ -213,7 +213,7 @@ function Login() { x.TenantId.TenantName || "" }; localStorage.setItem( - "TenetId", + "TenantId", x.TenantId.objectId ); tenentInfo.push(obj); @@ -546,7 +546,7 @@ function Login() { tenentName: x.TenantId.TenantName || "" }; localStorage.setItem( - "TenetId", + "TenantId", x.TenantId.objectId ); tenentInfo.push(obj); @@ -788,7 +788,7 @@ function Login() { tenentName: x.TenantId.TenantName || "" }; localStorage.setItem( - "TenetId", + "TenantId", x.TenantId.objectId ); tenentInfo.push(obj); diff --git a/apps/OpenSign/src/pages/Pgsignup.js b/apps/OpenSign/src/pages/Pgsignup.js index 10b270d1e..f34cf9d7b 100644 --- a/apps/OpenSign/src/pages/Pgsignup.js +++ b/apps/OpenSign/src/pages/Pgsignup.js @@ -353,7 +353,7 @@ const PgSignUp = () => { tenentName: x.TenantId.TenantName || "" }; localStorage.setItem( - "TenetId", + "TenantId", x.TenantId.objectId ); tenentInfo.push(obj); diff --git a/apps/OpenSign/src/pages/Signup.js b/apps/OpenSign/src/pages/Signup.js index ace1b1f75..1099d4a88 100644 --- a/apps/OpenSign/src/pages/Signup.js +++ b/apps/OpenSign/src/pages/Signup.js @@ -296,7 +296,7 @@ const Signup = () => { tenentName: x.TenantId.TenantName || "" }; localStorage.setItem( - "TenetId", + "TenantId", x.TenantId.objectId ); tenentInfo.push(obj); diff --git a/apps/OpenSign/src/pages/UserProfile.js b/apps/OpenSign/src/pages/UserProfile.js index b8d9da22c..45e32a393 100644 --- a/apps/OpenSign/src/pages/UserProfile.js +++ b/apps/OpenSign/src/pages/UserProfile.js @@ -137,7 +137,8 @@ function UserProfile() { setImage(response.url()); localStorage.setItem("profileImg", response.url()); setpercentage(0); - SaveFileSize(size, response.url()); + const tenantId = localStorage.getItem("TenantId"); + SaveFileSize(size, response.url(), tenantId); return response.url(); } } catch (error) { @@ -264,7 +265,11 @@ function UserProfile() {
Disable DocumentId :{" "} - {" "} + {" "} {" "}