{ comment }
++
Перейти в раздел «Документы по договору»
+diff --git a/actions/contractActions.js b/actions/contractActions.js index 87a35b1..3bed94a 100644 --- a/actions/contractActions.js +++ b/actions/contractActions.js @@ -397,8 +397,9 @@ export const getContractGraphicChangeSignatories = ({ dispatch, number }) => .catch((error) => { console.error("ACTION", "getContractGraphicChangeSignatories", "error"); - console.error(error); - reject(); + console.error(error.response.data); + + reject(error.response.data); }); }); } @@ -425,8 +426,9 @@ export const getContractGraphicChangeVariants = ({ dispatch, number, variants = .catch((error) => { console.error("ACTION", "getContractGraphicChangeVariants", "error"); - console.error(error); - reject(); + console.error(error.response.data); + + reject(error.response.data); }); }); } @@ -451,8 +453,9 @@ export const getContractGraphicChangeCalculationsList = ({ dispatch, number }) = .catch((error) => { console.error("ACTION", "getContractGraphicChangeCalculationsList", "error"); - console.error(error); - reject(); + console.error(error.response.data); + + reject(error.response.data); }); }); } @@ -479,15 +482,16 @@ export const getContractGraphicChangeOptions = ({ dispatch, number, variants }) .catch((error) => { console.error("ACTION", "getContractGraphicChangeOptions", "error"); - console.error(error); - reject(); + console.error(error.response.data); + + reject(error.response.data); }); }); } export const getContractGraphicChangeCalculate = (calculation) => { - console.log("ACTION", "getContractGraphicChangeCurrent", calculation); + console.log("ACTION", "getContractGraphicChangeCalculate", calculation); return new Promise((resolve, reject) => { @@ -498,14 +502,15 @@ export const getContractGraphicChangeCalculate = (calculation) => }) .then(async (response) => { - console.log("ACTION", "getContractGraphicChangeCurrent", "response.data", response.data); + console.log("ACTION", "getContractGraphicChangeCalculate", "response.data", response.data); resolve(response.data); }) .catch((error) => { - console.error("ACTION", "getContractGraphicChangeCurrent", "error"); - console.error(error); - reject(); + console.error("ACTION", "getContractGraphicChangeCalculate", "error"); + console.error(error.response.data); + + reject(error.response.data); }); }); } @@ -530,8 +535,9 @@ export const getContractGraphicChangeGetCurrent = ({ dispatch, number }) => .catch((error) => { console.error("ACTION", "getContractGraphicChangeGetCurrent", "error"); - console.error(error); - reject(); + console.error(error.response.data); + + reject(error.response.data); }); }); } @@ -556,8 +562,9 @@ export const getContractGraphicChangeGetCalculated = ({ dispatch, calculation }) .catch((error) => { console.error("ACTION", "getContractGraphicChangeGetCalculated", "error"); - console.error(error); - reject(); + console.error(error.response.data); + + reject(error.response.data); }); }); } @@ -580,8 +587,9 @@ export const signContractGraphicChange = (params) => .catch((error) => { console.error("ACTION", "signContractGraphicChange", "error"); - console.error(error); - reject(); + console.error(error.response.data); + + reject(error.response.data); }); }); } \ No newline at end of file diff --git a/actions/supportActions.js b/actions/supportActions.js index 70e01f0..e594195 100644 --- a/actions/supportActions.js +++ b/actions/supportActions.js @@ -99,35 +99,30 @@ export const getSupportThemes = ({ dispatch, query, }) => }); } -export const sendNewAppeal = ({ name, phone, email, company }) => +export const sendNewAppeal = (appeal) => { + console.log("ACTION", "support", "sendNewAppeal", appeal); + return new Promise((resolve, reject) => { - var formData = new FormData(); - formData.append("form", "FORM_LEASING_REQUESTS"); - formData.append("FORM_FIELD_FIO", name); - formData.append("FORM_FIELD_PHONE", phone); - formData.append("FORM_FIELD_EMAIL", email); - formData.append("FORM_FIELD_COMPANY", company); - formData.append("FORM_FIELD_PAGE_NAME", document.title); - formData.append("FORM_FIELD_PAGE_URL", window.location.href); - - axios.post(`${ process.env.NEXT_PUBLIC_API_HOST }/api/forms/`, formData) - .then((response) => + return new Promise((resolve, reject) => { - if(response.data.status === "complete") + axios.post(`${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/support/request`, { + query + }, { + withCredentials: true, + }) + .then(async (response) => + { + console.log("sendNewAppeal", "response.data", response.data); resolve(); - } - else + }) + .catch((error) => { + console.error(error); reject(); - } - }) - .catch((error) => - { - console.error(error); - reject(); - }); + }); + }); }); } \ No newline at end of file diff --git a/lib/CRMRequestGet/index.js b/lib/CRMRequestGet/index.js index 8b5b29f..e62f5e1 100644 --- a/lib/CRMRequestGet/index.js +++ b/lib/CRMRequestGet/index.js @@ -52,13 +52,16 @@ export default async function CRMRequestGet(req, res, path, params) .catch((error) => { console.error(error); - res.status(500); + console.error("-".repeat(30), "error.response.data:"); + console.error(error.response.data); + + res.status(500).json(error.response.data); }); } catch(e) { console.error(e); - res.status(500); + res.status(500).send(e); } } else diff --git a/lib/CRMRequestPost/index.js b/lib/CRMRequestPost/index.js index 0c6ac99..c80c88a 100644 --- a/lib/CRMRequestPost/index.js +++ b/lib/CRMRequestPost/index.js @@ -51,13 +51,16 @@ export default async function CRMRequestPost(req, res, path, params) .catch((error) => { console.error(error); - res.status(500); + console.error("-".repeat(30), "error.response.data:"); + console.error(error.response.data); + + res.status(500).json(error.response.data); }); } catch(e) { console.error(e); - res.status(500); + res.status(500).send(e); } } else diff --git a/package.json b/package.json index 724abc9..2231f5b 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "react": "17.0.2", "react-cookie": "^4.1.1", "react-dom": "17.0.2", + "react-dropzone": "^14.2.2", "react-redux": "^7.2.6", "react-slick": "^0.29.0", "react-widgets": "^5.5.1", diff --git a/pages/api/contract/change/graphic/calculate.js b/pages/api/contract/change/graphic/calculate.js index a498d9a..e0f2bb6 100644 --- a/pages/api/contract/change/graphic/calculate.js +++ b/pages/api/contract/change/graphic/calculate.js @@ -3,7 +3,9 @@ import CRMRequestPost from '../../../../../lib/CRMRequestPost'; export default async function handler(req, res) { - console.log("WTF BODY"); + console.log("API", "contract", "change", "graphic", "calculate"); console.log(req.body); + console.log("-".repeat(50)); + await CRMRequestPost(req, res, `${ process.env.CRM_API_HOST }/lk/add-contract/CreateCalculation?contract_number=${ req.body.contract_number }`, req.body); } \ No newline at end of file diff --git a/pages/api/contract/change/graphic/calculation.js b/pages/api/contract/change/graphic/calculation.js index 5d17c96..0be6cc9 100644 --- a/pages/api/contract/change/graphic/calculation.js +++ b/pages/api/contract/change/graphic/calculation.js @@ -3,5 +3,9 @@ import CRMRequestGet from '../../../../../lib/CRMRequestGet'; export default async function handler(req, res) { + console.log("API", "contract", "change", "graphic", "calculation"); + console.log(req.body); + console.log("-".repeat(50)); + await CRMRequestGet(req, res, `${ process.env.CRM_API_HOST }/lk/add-contract/GetPreCalculationGraph`, { addcontract_number: req.body.calculation }); } \ No newline at end of file diff --git a/pages/api/contract/change/graphic/current.js b/pages/api/contract/change/graphic/current.js index 84abf45..5f21d36 100644 --- a/pages/api/contract/change/graphic/current.js +++ b/pages/api/contract/change/graphic/current.js @@ -3,5 +3,9 @@ import CRMRequestGet from '../../../../../lib/CRMRequestGet'; export default async function handler(req, res) { + console.log("API", "contract", "change", "graphic", "current"); + console.log(req.body); + console.log("-".repeat(50)); + await CRMRequestGet(req, res, `${ process.env.CRM_API_HOST }/lk/add-contract/GetCurrentGraph`, { contract_number: req.body.number }); } \ No newline at end of file diff --git a/pages/api/contract/change/graphic/sign.js b/pages/api/contract/change/graphic/sign.js index 7a3a32d..10c01cd 100644 --- a/pages/api/contract/change/graphic/sign.js +++ b/pages/api/contract/change/graphic/sign.js @@ -3,5 +3,9 @@ import CRMRequestPost from '../../../../../lib/CRMRequestPost'; export default async function handler(req, res) { + console.log("API", "contract", "change", "graphic", "sign"); + console.log(req.body); + console.log("-".repeat(50)); + await CRMRequestPost(req, res, `${ process.env.CRM_API_HOST }/lk/add-contract/Signing?addcontract_number=${ req.body.addcontract_number }`, req.body); } \ No newline at end of file diff --git a/pages/api/contract/change/options.js b/pages/api/contract/change/options.js index d957d1f..974e4f8 100644 --- a/pages/api/contract/change/options.js +++ b/pages/api/contract/change/options.js @@ -3,9 +3,8 @@ import CRMRequestGet from '../../../../lib/CRMRequestGet'; export default async function handler(req, res) { - console.log("-".repeat(50)); - console.log("API", "contract", "change", "options", "req.body.variants"); - console.log(req.body.variants); + console.log("API", "contract", "change", "options"); + console.log(req.body); console.log("-".repeat(50)); await CRMRequestGet(req, res, `${ process.env.CRM_API_HOST }/lk/add-contract/GetTypeOptions`, { ...{ contract_number: req.body.number }, ...req.body.variants }); diff --git a/pages/api/contract/change/variants.js b/pages/api/contract/change/variants.js index 798fb8c..4434cdc 100644 --- a/pages/api/contract/change/variants.js +++ b/pages/api/contract/change/variants.js @@ -3,8 +3,8 @@ import CRMRequestGet from '../../../../lib/CRMRequestGet'; export default async function handler(req, res) { - console.log("req.body.variantsreq.body.variantsreq.body.variantsreq.body.variants"); - console.log(req.body.variants); + console.log("API", "contract", "change", "variants"); + console.log(req.body); console.log("-".repeat(50)); await CRMRequestGet(req, res, `${ process.env.CRM_API_HOST }/lk/add-contract/GetAvaliableGraphChangeTypes`, { ...{ contract_number: req.body.number }, ...req.body.variants }); diff --git a/pages/api/support/attachment.js b/pages/api/support/attachment.js new file mode 100644 index 0000000..b7c08bf --- /dev/null +++ b/pages/api/support/attachment.js @@ -0,0 +1,55 @@ +// Next.js API route support: https://nextjs.org/docs/api-routes/introduction +import axios from 'axios'; +import { Cookies } from 'react-cookie'; +import cookie from 'cookie'; +import moment from 'moment'; +import jwt from 'jsonwebtoken'; +import { cors } from '../../../lib/cors'; + +export default async function handler(req, res) +{ + await cors(req, res); + + console.log("API", "support", "request"); + console.log(req.body); + console.log("-".repeat(50)); + + if(req.headers.cookie !== undefined) + { + const cookies = cookie.parse(req.headers?.cookie ? req.headers?.cookie : ""); + if(cookies.jwt !== undefined && cookies.jwt !== null) + { + if(jwt.verify(cookies.jwt, process.env.JWT_SECRET_CLIENT)) + { + const response = await new Promise((resolve, reject) => + { + axios.post(`${ process.env.CRM_API_HOST }/lk/incident/UploadDocument`, req.body) + .then((api_response) => + { + console.log("RESPONSE"); + console.log(api_response.data); + + resolve(api_response.data); + }) + .catch((error) => + { + console.log("error"); + console.error(error); + + reject([]); + }); + }); + + res.status(200).json(response); + } + else + { + res.status(403); + } + } + else + { + res.status(403); + } + } +} \ No newline at end of file diff --git a/pages/api/support/request.js b/pages/api/support/request.js new file mode 100644 index 0000000..b5a4705 --- /dev/null +++ b/pages/api/support/request.js @@ -0,0 +1,11 @@ +// Next.js API route support: https://nextjs.org/docs/api-routes/introduction +import CRMRequestPost from '../../../lib/CRMRequestPost'; + +export default async function handler(req, res) +{ + console.log("API", "support", "request"); + console.log(req.body); + console.log("-".repeat(50)); + + await CRMRequestPost(req, res, `${ process.env.CRM_API_HOST }/lk/incident/CreateRequestClient`, req.body); +} \ No newline at end of file diff --git a/pages/contract/change/components/Final/index.js b/pages/contract/change/components/FinalMessage/index.js similarity index 88% rename from pages/contract/change/components/Final/index.js rename to pages/contract/change/components/FinalMessage/index.js index d49c37d..f7560c4 100644 --- a/pages/contract/change/components/Final/index.js +++ b/pages/contract/change/components/FinalMessage/index.js @@ -1,7 +1,7 @@ import React from "react"; import Link from "next/link"; -export default class Comparison extends React.Component +export default class FinalMessage extends React.Component { constructor(props) { diff --git a/pages/contract/change/components/Options/index.js b/pages/contract/change/components/Options/index.js index 7911ecf..3a6d3f4 100644 --- a/pages/contract/change/components/Options/index.js +++ b/pages/contract/change/components/Options/index.js @@ -548,14 +548,14 @@ export default class Options extends React.Component getContractGraphicChangeCalculate(payload) .then((calculation) => { - console.log("calculationcalculationcalculationcalculationcalculation"); - console.log(calculation); - onCalculate(calculation.addcontract_number); }) .catch(() => { - this.setState({ sending: false, }); + this.setState({ sending: false, }, () => + { + alert("К сожаление при расчете возникла ошибка."); + }); }); }); } diff --git a/pages/contract/change/index.js b/pages/contract/change/index.js index 058eebe..029822d 100644 --- a/pages/contract/change/index.js +++ b/pages/contract/change/index.js @@ -19,7 +19,7 @@ import SignatoriesList from "./components/SignatoriesList"; import CalculationsList from "./components/CalculationsList"; import VariantsList from "./components/VariantsList"; -import Final from "./components/Final"; +import FinalMessage from "./components/FinalMessage"; import { getContractInfo, @@ -225,7 +225,10 @@ class ChangeGraphicPage extends React.Component }) .catch(() => { - this.setState({ loading: false, }); + this.setState({ loading: false, }, () => + { + alert("К сожаление при формировании документа возникла ошибка."); + }); }); }); } @@ -305,7 +308,7 @@ class ChangeGraphicPage extends React.Component <> { mode_final ? (
{ company.title }
+{ company.title }
)) }{ comment }
+Перейти в раздел «Документы по договору»
++ Перенесите файлы на экран для быстрой загрузки или выберите файл с компьютера +
+ +- Перенесите файлы на экран для быстрой загрузки или выберите файл с компьютера -
- -{ theme.name }
- -{ question.title }
- -Процедура
- -Документы
- -Документы
-{ template.filename }Скачать шаблон
-{ theme.name }
+ +{ question.title }
+ +Процедура
+ +Документы
+ +Документы
+{ template.filename }Скачать шаблон
+