Skip to content

Commit 903d626

Browse files
fix: issue of something went wrong due to quick send
1 parent 70ae1e2 commit 903d626

File tree

5 files changed

+35
-16
lines changed

5 files changed

+35
-16
lines changed

apps/OpenSign/src/json/ReportJson.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ export default function reportJson(id) {
33
const head = ["Sr.No", "Title", "Note", "Folder", "File", "Owner", "Signers"];
44
const contactbook = ["Sr.No", "Title", "Email", "Phone"];
55
const dashboardReportHead = ["Title", "File", "Owner", "Signers"];
6-
const templateReport = ["Sr.No", "Title", "File", "Owner", "Roles"];
6+
const templateReport = ["Sr.No", "Title", "File", "Owner", "Signers"];
77
switch (id) {
88
// draft documents report
99
case "ByHuevtCFY":

apps/OpenSign/src/pages/PdfRequestFiles.js

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -821,12 +821,19 @@ function PdfRequestFiles() {
821821
localStorage.getItem("parseAppId"),
822822
sessionToken: localStorage.getItem("accesstoken")
823823
};
824-
const objectId = user.objectId;
824+
const objectId = user?.objectId;
825825
const hostUrl = window.location.origin;
826826
//encode this url value `${pdfDetails?.[0].objectId}/${user.Email}/${objectId}` to base64 using `btoa` function
827-
const encodeBase64 = btoa(
828-
`${pdfDetails?.[0].objectId}/${user.Email}/${objectId}`
829-
);
827+
let encodeBase64;
828+
if (objectId) {
829+
encodeBase64 = btoa(
830+
`${pdfDetails?.[0].objectId}/${user.Email}/${objectId}`
831+
);
832+
} else {
833+
encodeBase64 = btoa(
834+
`${pdfDetails?.[0].objectId}/${user.Email}`
835+
);
836+
}
830837
let signPdf = `${hostUrl}/login/${encodeBase64}`;
831838
const openSignUrl =
832839
"https://www.opensignlabs.com/contact-us";

apps/OpenSign/src/pages/PlanSubscriptions.js

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,17 @@ const PlanSubscriptions = () => {
1616
const navigate = useNavigate();
1717
const [yearlyVisible, setYearlyVisible] = useState(false);
1818
const [isLoader, setIsLoader] = useState(true);
19-
20-
const userDetails = JSON.parse(localStorage.getItem("userDetails"));
19+
const extUser =
20+
localStorage.getItem("Extand_Class") &&
21+
JSON.parse(localStorage.getItem("Extand_Class"))?.[0];
22+
const user = {
23+
name: extUser?.Name,
24+
email: extUser?.Email,
25+
company: extUser?.Company,
26+
phone: extUser?.Phone
27+
};
28+
const userDetails = JSON.parse(localStorage.getItem("userDetails")) || user;
29+
// console.log("userDetails ", userDetails);
2130
const name =
2231
userDetails && userDetails.name
2332
? "first_name=" + encodeURIComponent(userDetails.name)

apps/OpenSign/src/primitives/GetReportDisplay.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -922,7 +922,7 @@ const ReportTable = (props) => {
922922
<thead className="text-white h-[38px] sticky top-0 bg-[#32a3ac]">
923923
<tr>
924924
{props.ReportName === "Templates" && (
925-
<th className="p-2">Roles</th>
925+
<th className="p-2 pl-3">Roles</th>
926926
)}
927927
<th className="p-2">Signers</th>
928928
</tr>
@@ -934,11 +934,11 @@ const ReportTable = (props) => {
934934
className="text-sm font-normal text-black odd:bg-white even:bg-gray-200"
935935
>
936936
{props.ReportName === "Templates" && (
937-
<td className="text-[13px] md:text-sm font-semibold p-2 ">
937+
<td className="text-[12px] p-2 pl-3">
938938
{x.Role && x.Role}
939939
</td>
940940
)}
941-
<td className="text-[13px] md:text-sm p-2 break-all">
941+
<td className="text-[12px] p-2 break-all">
942942
{x.email
943943
? x.email
944944
: x?.signerPtr?.Email || "-"}

apps/OpenSignServer/cloud/parsefunction/ZohoDetails.js

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,15 @@ export default async function ZohoDetails(request) {
2626
// console.log("Access Token:", res.data);
2727
if (res.data.access_token) {
2828
const hostedpages = request.params.hostedpagesId;
29-
const userData = await axios.get('https://billing.zoho.in/api/v1/hostedpages/' + hostedpages, {
30-
headers: {
31-
Authorization: 'Zoho-oauthtoken ' + res.data.access_token,
32-
'X-com-zoho-subscriptions-organizationid': process.env.ZOHO_BILLING_ORG_ID,
33-
},
34-
});
29+
const userData = await axios.get(
30+
'https://www.zohoapis.in/billing/v1/hostedpages/' + hostedpages,
31+
{
32+
headers: {
33+
Authorization: 'Zoho-oauthtoken ' + res.data.access_token,
34+
'X-com-zoho-subscriptions-organizationid': process.env.ZOHO_BILLING_ORG_ID,
35+
},
36+
}
37+
);
3538

3639
const first_name = userData.data.data.subscription.contactpersons[0].first_name || '';
3740
const last_name = userData.data.data.subscription.contactpersons[0].last_name || '';

0 commit comments

Comments
 (0)