diff --git a/actions/index.js b/actions/index.js index 11e93743..6d2f9205 100644 --- a/actions/index.js +++ b/actions/index.js @@ -1740,6 +1740,7 @@ export const sendCaseCompleteMessage = async (containerID, caseReference) => { return axios(config) .then((res) => { + console.log("sendCaseCompleteMessage: ", res.data); return res.data; }) .catch((error) => { diff --git a/components/myportal/awaitingsubmissionfromblob.js b/components/myportal/awaitingsubmissionfromblob.js index 2982bd66..17f80f5f 100644 --- a/components/myportal/awaitingsubmissionfromblob.js +++ b/components/myportal/awaitingsubmissionfromblob.js @@ -78,7 +78,7 @@ const AwaitingSubmissionFromBlob = (props) => {
{t("myportal:temp-reference")}: {showTopThreeArr[key].hasOwnProperty( - "appealCompletes" + "appealComplete" ) ? ( {showTopThreeArr[index].pinswg_name} diff --git a/components/newappeal/buildchecksection.js b/components/newappeal/buildchecksection.js index 4c753c6d..0273cbec 100644 --- a/components/newappeal/buildchecksection.js +++ b/components/newappeal/buildchecksection.js @@ -18,7 +18,7 @@ import { getThumbnailIconByExtension, bytesToSize, } from "../utils"; -import { generateAppealPDF } from "../../actions"; +import { generateAppealPDF, sendCaseCompleteMessage } from "../../actions"; let BuildCheckSection = (props) => { useEffect(() => { @@ -118,6 +118,29 @@ let BuildCheckSection = (props) => { return labelTrans; }; + const finaliseAppeal = async () => { + console.log("finalising appeal:"); + await generateAppealPDF( + pdfObj, + props.props.accountDetails.containerID, + props.appealType.caseReference.ticketnumber, + router.query.appealtypes, + pdfObj.filesList + // props.appealType.fileList + ) + .then((data) => { + console.log("have generated pdf:", data); + sendCaseCompleteMessage( + props.props.accountDetails.containerID, + props.appealType.caseReference.ticketnumber + ); + }) + .then((data) => { + console.log("have sent comple message :", data); + setCurrentSection(9999); + }); + }; + return (
@@ -254,15 +277,7 @@ let BuildCheckSection = (props) => { className="govuk-button" data-module="govuk-button" onClick={() => { - generateAppealPDF( - pdfObj, - props.props.accountDetails.containerID, - props.appealType.caseReference.ticketnumber, - router.query.appealtypes, - pdfObj.filesList - // props.appealType.fileList - ), - setCurrentSection(9999); + finaliseAppeal(); }} > {t("newappeal:submit-appeal-button")} diff --git a/components/newappeal/complete.js b/components/newappeal/complete.js index 3c5dafc6..29d9c1a8 100644 --- a/components/newappeal/complete.js +++ b/components/newappeal/complete.js @@ -62,10 +62,10 @@ let CompleteAppeal = (props) => { }; sendEmail(templateId, emailAddress, personalisation, reference); - sendCaseCompleteMessage( - props.props.accountDetails.containerID, - props.appealType.caseReference.ticketnumber - ); + // sendCaseCompleteMessage( + // props.props.accountDetails.containerID, + // props.appealType.caseReference.ticketnumber + // ); console.log("patching///////////////"); // diff --git a/pages/api/file/createappealcompletemessage_api.js b/pages/api/file/createappealcompletemessage_api.js index 67186452..eb28303f 100644 --- a/pages/api/file/createappealcompletemessage_api.js +++ b/pages/api/file/createappealcompletemessage_api.js @@ -27,28 +27,48 @@ ApiProxy.get(async (req, res) => { "&tempcaseref=" + tempCaseRef; - // const blobProgress = await getProgressBlobs( - // containerName, - // tempCaseRef - // ).then((data) => { - // return downloadProgressFile(containerName, data.path, tempCaseRef); - // }); + const blobProgress = await getProgressBlobs( + containerName, + tempCaseRef + ).then((data) => { + return downloadProgressFile(containerName, data.path, tempCaseRef); + }); - // Object.assign(blobProgress, { - // "appealComplete": true, - // }); + Object.assign(blobProgress, { + "appealComplete": true, + }); //http: if (hashAPIPath(checkquerypath) == "&hash=" + checkHash) { - await createCaseCompleteMessage(containerName, tempCaseRef) - .then((data) => { - //createBlob(JSON.stringify(blobProgress), containerName, tempCaseRef); + + await createBlob(JSON.stringify(blobProgress), containerName, tempCaseRef) + .then(() => { + createCaseCompleteMessage(containerName, tempCaseRef); return res.status(200).json(data); }) .catch((error) => { - //console.log(error); - + console.log( + "///////////////////////\n createCaseCompleteMessage:", + error, + "///////////////////////\n" + ); return res.status(400).json(error); }); + + // await createCaseCompleteMessage(containerName, tempCaseRef) + // .then((data) => { + // console.log(data); + // createBlob( + // JSON.stringify(blobProgress), + // containerName, + // tempCaseRef + // ); + // return res.status(200).json(data); + // }) + // .catch((error) => { + // console.log(error); + + // return res.status(400).json(error); + // }); }); export const config = { diff --git a/pages/api/file/generateappealpdf.js b/pages/api/file/generateappealpdf.js index 47abd0c5..d0282e64 100644 --- a/pages/api/file/generateappealpdf.js +++ b/pages/api/file/generateappealpdf.js @@ -186,8 +186,8 @@ export default async function handler(req, res) { blobProgress.pinswg_name ).then((data) => { console.log( - "///////////////////////////////////\nfile created: " + data, - `/files/${blobProgress.pinswg_name}.pdf`, + "///////////////////////////////////\nfile created: " + + `/files/${blobProgress.pinswg_name}.pdf`, "\n/////////////////////////" ); return res.status(200).json({