diff --git a/actions/dealsActions.js b/actions/dealsActions.js index 55991fc..a411392 100644 --- a/actions/dealsActions.js +++ b/actions/dealsActions.js @@ -292,7 +292,7 @@ export const getDealContracts = ({ dispatch, deal_id }) => }); } -export const attachDealDocument = ({ deal_id, document_id, index, lastModified, filename, file, type }) => +export const attachDealDocument = ({ deal_id, document_id, document_name, index, lastModified, filename, file, type }) => { return new Promise((resolve, reject) => { @@ -302,6 +302,7 @@ export const attachDealDocument = ({ deal_id, document_id, index, lastModified, const payload = new URLSearchParams({ deal_id, document_id, + document_name, filename, index, lastModified, diff --git a/components/DealsStatus/components/DocumentsForm.js b/components/DealsStatus/components/DocumentsForm.js index 2e46f68..9941304 100644 --- a/components/DealsStatus/components/DocumentsForm.js +++ b/components/DealsStatus/components/DocumentsForm.js @@ -93,10 +93,12 @@ export default class DocumentsForm extends Step }) } - _handle_onAddFile = (document_id, files, update) => + _handle_onAddFile = ({ document_id, document_name, files, update }) => { const existed_files = { ...this.state.uploaded }; + console.log({ document_id, document_name, files, update }); console.log("_handle_onAddFile", { existed_files }); + const document_files = existed_files[ document_id ] === undefined ? [] : existed_files[ document_id ].files; if(existed_files[ document_id ] === undefined) @@ -125,6 +127,7 @@ export default class DocumentsForm extends Step // files[nf].index = new_index; files[nf].group = document_id; + files[nf].group_name = document_name; files[nf].uploaded = false; files[nf].update = update; @@ -145,6 +148,7 @@ export default class DocumentsForm extends Step const payload = { deal_id: opp_number, document_id: file.group, + document_name: file.group_name, filename: file.name, lastModified: file.lastModified, type: file.type, @@ -346,7 +350,7 @@ export default class DocumentsForm extends Step statuscode_id={ statuscode_id } uploading={ uploading } uploaded={ uploaded[ document.doc_id ] !== undefined ? uploaded[ document.doc_id ] : { files: [] } } - onAddFile={ (file, update) => { this._handle_onAddFile(document.doc_id, file, update) } } + onAddFile={ (files, update) => { this._handle_onAddFile({ document_id: document.doc_id, document_name: document.name, files, update }) } } onDeleteFile={ this._handle_onDeleteFile } document={ document } /> diff --git a/components/DealsStatus/components/SignPlannedContract.js b/components/DealsStatus/components/SignPlannedContract.js index a01d925..eda5dd3 100644 --- a/components/DealsStatus/components/SignPlannedContract.js +++ b/components/DealsStatus/components/SignPlannedContract.js @@ -133,7 +133,7 @@ export default class SignPlannedContract extends React.Component PDF
-

{ contract.name } [{ status }]

+

{ contract.name }

{ moment(contract.date).format("DD.MM.YYYY") } { contract.brand_name } diff --git a/pages/api/deals/file/attach.js b/pages/api/deals/file/attach.js index 85c6723..cd29de9 100644 --- a/pages/api/deals/file/attach.js +++ b/pages/api/deals/file/attach.js @@ -34,7 +34,9 @@ export default async function handler(req, res) upload.single("file")(req, {}, async (err) => { const { file, } = req; - const { deal_id, document_id, type, index, lastModified, } = req.query; + const { deal_id, document_id, document_name, type, index, lastModified, } = req.query; + + console.log({ deal_id, document_id, document_name, type, index, lastModified, }); const local_filename = `${ client_jwt_decoded.acc_number }_${ deal_id }_${ document_id }_${ index }`; @@ -83,6 +85,7 @@ export default async function handler(req, res) else { uploaded[ document_id ] = { + name: document_name, files: [ file_payload ], } } diff --git a/pages/api/deals/upload.js b/pages/api/deals/upload.js index 73c6329..2111899 100644 --- a/pages/api/deals/upload.js +++ b/pages/api/deals/upload.js @@ -160,13 +160,13 @@ export default async function handler(req, res) eachSeries(Object.keys(deals[ deal_id ].uploaded), (group, callback) => { const document = deals[ deal_id ].uploaded[ group ]; - console.log({ group, document }); + console.log({ group, document, }); if(document.files.length === 1) { const file = document.files[0]; - uploadFile({ deal_id, filename: file.filename, name: file.name, group, crm_jwt }) + uploadFile({ deal_id, filename: file.filename, name: document.name, group, crm_jwt }) .then(() => { callback();