From 903d626c27438ba6e6bf6834f7e928ae840af60b Mon Sep 17 00:00:00 2001
From: prafull-opensignlabs <prafull.navkar@nxglabs.com>
Date: Wed, 29 May 2024 13:05:57 +0530
Subject: [PATCH] fix: issue of something went wrong due to quick send

---
 apps/OpenSign/src/json/ReportJson.js              |  2 +-
 apps/OpenSign/src/pages/PdfRequestFiles.js        | 15 +++++++++++----
 apps/OpenSign/src/pages/PlanSubscriptions.js      | 13 +++++++++++--
 apps/OpenSign/src/primitives/GetReportDisplay.js  |  6 +++---
 .../cloud/parsefunction/ZohoDetails.js            | 15 +++++++++------
 5 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/apps/OpenSign/src/json/ReportJson.js b/apps/OpenSign/src/json/ReportJson.js
index e0cceda69..705ce8fb9 100644
--- a/apps/OpenSign/src/json/ReportJson.js
+++ b/apps/OpenSign/src/json/ReportJson.js
@@ -3,7 +3,7 @@ export default function reportJson(id) {
   const head = ["Sr.No", "Title", "Note", "Folder", "File", "Owner", "Signers"];
   const contactbook = ["Sr.No", "Title", "Email", "Phone"];
   const dashboardReportHead = ["Title", "File", "Owner", "Signers"];
-  const templateReport = ["Sr.No", "Title", "File", "Owner", "Roles"];
+  const templateReport = ["Sr.No", "Title", "File", "Owner", "Signers"];
   switch (id) {
     // draft documents report
     case "ByHuevtCFY":
diff --git a/apps/OpenSign/src/pages/PdfRequestFiles.js b/apps/OpenSign/src/pages/PdfRequestFiles.js
index 505b4b493..b0be26095 100644
--- a/apps/OpenSign/src/pages/PdfRequestFiles.js
+++ b/apps/OpenSign/src/pages/PdfRequestFiles.js
@@ -821,12 +821,19 @@ function PdfRequestFiles() {
                           localStorage.getItem("parseAppId"),
                         sessionToken: localStorage.getItem("accesstoken")
                       };
-                      const objectId = user.objectId;
+                      const objectId = user?.objectId;
                       const hostUrl = window.location.origin;
                       //encode this url value `${pdfDetails?.[0].objectId}/${user.Email}/${objectId}` to base64 using `btoa` function
-                      const encodeBase64 = btoa(
-                        `${pdfDetails?.[0].objectId}/${user.Email}/${objectId}`
-                      );
+                      let encodeBase64;
+                      if (objectId) {
+                        encodeBase64 = btoa(
+                          `${pdfDetails?.[0].objectId}/${user.Email}/${objectId}`
+                        );
+                      } else {
+                        encodeBase64 = btoa(
+                          `${pdfDetails?.[0].objectId}/${user.Email}`
+                        );
+                      }
                       let signPdf = `${hostUrl}/login/${encodeBase64}`;
                       const openSignUrl =
                         "https://www.opensignlabs.com/contact-us";
diff --git a/apps/OpenSign/src/pages/PlanSubscriptions.js b/apps/OpenSign/src/pages/PlanSubscriptions.js
index 1eeccd4ab..a8bfbd480 100644
--- a/apps/OpenSign/src/pages/PlanSubscriptions.js
+++ b/apps/OpenSign/src/pages/PlanSubscriptions.js
@@ -16,8 +16,17 @@ const PlanSubscriptions = () => {
   const navigate = useNavigate();
   const [yearlyVisible, setYearlyVisible] = useState(false);
   const [isLoader, setIsLoader] = useState(true);
-
-  const userDetails = JSON.parse(localStorage.getItem("userDetails"));
+  const extUser =
+    localStorage.getItem("Extand_Class") &&
+    JSON.parse(localStorage.getItem("Extand_Class"))?.[0];
+  const user = {
+    name: extUser?.Name,
+    email: extUser?.Email,
+    company: extUser?.Company,
+    phone: extUser?.Phone
+  };
+  const userDetails = JSON.parse(localStorage.getItem("userDetails")) || user;
+  // console.log("userDetails ", userDetails);
   const name =
     userDetails && userDetails.name
       ? "first_name=" + encodeURIComponent(userDetails.name)
diff --git a/apps/OpenSign/src/primitives/GetReportDisplay.js b/apps/OpenSign/src/primitives/GetReportDisplay.js
index 412cb6550..e898384ad 100644
--- a/apps/OpenSign/src/primitives/GetReportDisplay.js
+++ b/apps/OpenSign/src/primitives/GetReportDisplay.js
@@ -922,7 +922,7 @@ const ReportTable = (props) => {
                                 <thead className="text-white h-[38px] sticky top-0 bg-[#32a3ac]">
                                   <tr>
                                     {props.ReportName === "Templates" && (
-                                      <th className="p-2">Roles</th>
+                                      <th className="p-2 pl-3">Roles</th>
                                     )}
                                     <th className="p-2">Signers</th>
                                   </tr>
@@ -934,11 +934,11 @@ const ReportTable = (props) => {
                                       className="text-sm font-normal text-black odd:bg-white even:bg-gray-200"
                                     >
                                       {props.ReportName === "Templates" && (
-                                        <td className="text-[13px] md:text-sm font-semibold p-2 ">
+                                        <td className="text-[12px] p-2 pl-3">
                                           {x.Role && x.Role}
                                         </td>
                                       )}
-                                      <td className="text-[13px] md:text-sm p-2 break-all">
+                                      <td className="text-[12px] p-2 break-all">
                                         {x.email
                                           ? x.email
                                           : x?.signerPtr?.Email || "-"}
diff --git a/apps/OpenSignServer/cloud/parsefunction/ZohoDetails.js b/apps/OpenSignServer/cloud/parsefunction/ZohoDetails.js
index f8ec7fb17..e926877ab 100644
--- a/apps/OpenSignServer/cloud/parsefunction/ZohoDetails.js
+++ b/apps/OpenSignServer/cloud/parsefunction/ZohoDetails.js
@@ -26,12 +26,15 @@ export default async function ZohoDetails(request) {
   //   console.log("Access Token:", res.data);
   if (res.data.access_token) {
     const hostedpages = request.params.hostedpagesId;
-    const userData = await axios.get('https://billing.zoho.in/api/v1/hostedpages/' + hostedpages, {
-      headers: {
-        Authorization: 'Zoho-oauthtoken ' + res.data.access_token,
-        'X-com-zoho-subscriptions-organizationid': process.env.ZOHO_BILLING_ORG_ID,
-      },
-    });
+    const userData = await axios.get(
+      'https://www.zohoapis.in/billing/v1/hostedpages/' + hostedpages,
+      {
+        headers: {
+          Authorization: 'Zoho-oauthtoken ' + res.data.access_token,
+          'X-com-zoho-subscriptions-organizationid': process.env.ZOHO_BILLING_ORG_ID,
+        },
+      }
+    );
 
     const first_name = userData.data.data.subscription.contactpersons[0].first_name || '';
     const last_name = userData.data.data.subscription.contactpersons[0].last_name || '';