diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js index dcca4ba24..a682e8787 100644 --- a/apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js +++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js @@ -81,6 +81,7 @@ export default async function createDocumentWithTemplate(request, response) { objectId: extUser.get('TenantId').id, }); subscription.include('ExtUserPtr'); + subscription.greaterThanOrEqualTo('Next_billing_date', new Date()); const resSub = await subscription.first({ useMasterKey: true }); if (resSub) { const _resSub = JSON.parse(JSON.stringify(resSub)); @@ -404,7 +405,9 @@ export default async function createDocumentWithTemplate(request, response) { .json({ error: 'Quota reached, Please buy credits and try again later.' }); } } else { - return response.status(400).json({ error: 'Please buy subscriptions.' }); + return response.status(400).json({ + error: 'Please purchase or renew your subscription.', + }); } } else { return response.status(405).json({ error: 'Invalid API Token!' }); diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/createDocumentwithCoordinate.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/createDocumentwithCoordinate.js index cb6a95e29..b69655c8b 100644 --- a/apps/OpenSignServer/cloud/customRoute/v1/routes/createDocumentwithCoordinate.js +++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/createDocumentwithCoordinate.js @@ -95,6 +95,7 @@ export default async function createDocumentwithCoordinate(request, response) { objectId: extUser.get('TenantId').id, }); subscription.include('ExtUserPtr'); + subscription.greaterThanOrEqualTo('Next_billing_date', new Date()); const resSub = await subscription.first({ useMasterKey: true }); if (resSub) { const _resSub = JSON.parse(JSON.stringify(resSub)); @@ -422,7 +423,9 @@ export default async function createDocumentwithCoordinate(request, response) { .json({ error: 'Quota reached, Please buy credits and try again later.' }); } } else { - return response.status(400).json({ error: 'Please buy subscriptions.' }); + return response.status(400).json({ + error: 'Please purchase or renew your subscription.', + }); } } else { return response.status(405).json({ error: 'Invalid API Token!' }); diff --git a/apps/OpenSignServer/cloud/parsefunction/createBatchDocs.js b/apps/OpenSignServer/cloud/parsefunction/createBatchDocs.js index f6ba12a4f..0742fdd4e 100644 --- a/apps/OpenSignServer/cloud/parsefunction/createBatchDocs.js +++ b/apps/OpenSignServer/cloud/parsefunction/createBatchDocs.js @@ -211,6 +211,7 @@ export default async function createBatchDocs(request) { objectId: _resExt.TenantId.objectId, }); subscription.include('ExtUserPtr'); + subscription.greaterThanOrEqualTo('Next_billing_date', new Date()); const resSub = await subscription.first({ useMasterKey: true }); if (resSub) { const _resSub = JSON.parse(JSON.stringify(resSub)); @@ -240,7 +241,10 @@ export default async function createBatchDocs(request) { ); } } else { - throw new Parse.Error(Parse.Error.INVALID_QUERY, 'Please buy subscriptions.'); + throw new Parse.Error( + Parse.Error.INVALID_QUERY, + 'Please purchase or renew your subscription.' + ); } } else { const response = await axios.post('batch', { requests: requests[0] }, parseConfig);