diff --git a/actions/adminActions.js b/actions/adminActions.js index 1a8e7d7..e924924 100644 --- a/actions/adminActions.js +++ b/actions/adminActions.js @@ -8,14 +8,16 @@ import * as currentState from '../reducers/initialState'; export const getUsers = ({ dispatch }) => { - console.log("ACTION", "getUsers()"); + //console.log("ACTION", "getUsers()"); + return new Promise((resolve, reject) => { axios.post(`${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/admin/`, {}) .then(async (response) => { - console.log("getContractRules", "response.data", response.data); + //console.log("getContractRules", "response.data", response.data); + dispatch({ type: actionTypes.ADMIN, data: { users: response.data.users } }); resolve(); @@ -32,21 +34,24 @@ export const getUsers = ({ dispatch }) => export const sendInvite = ({ name, email, companies }) => { - console.log("ACTION", "sendInvite()", { name, email, companies }); + //console.log("ACTION", "sendInvite()", { name, email, companies }); + return new Promise((resolve, reject) => { axios.post(`${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/admin/invite`, { name, email, companies }) .then(async (response) => { - console.log("ACTION", "sendInvite()", "response.data", response.data); + //console.log("ACTION", "sendInvite()", "response.data", response.data); + resolve(response.data); }) .catch((error) => { console.error("ACTION", "sendInvite()", "error"); - console.log("error.response.data", error.response.data); + //console.log("error.response.data", error.response.data); + reject(error.response.data); }); @@ -55,14 +60,16 @@ export const sendInvite = ({ name, email, companies }) => export const removeUser = ({ account, emails }) => { - console.log("ACTION", "removeUser()", { account, emails }); + //console.log("ACTION", "removeUser()", { account, emails }); + return new Promise((resolve, reject) => { axios.post(`${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/admin/remove`, { account, emails }) .then(async (response) => { - console.log("ACTION", "removeUser()", "response.data", response.data); + //console.log("ACTION", "removeUser()", "response.data", response.data); + resolve(response.data); }) diff --git a/actions/authActions.js b/actions/authActions.js index a48e836..dda2e42 100644 --- a/actions/authActions.js +++ b/actions/authActions.js @@ -31,8 +31,10 @@ export const sendLoginFormEmail = ({ email, password, dispatch }) => axios.post(`${ process.env.NEXT_PUBLIC_API_HOST }/api/account/auth/email/`, { email, password }) .then((response) => { - console.log("sendLoginFormEmail RESPONSE"); - console.log(response.data); + //console.log("sendLoginFormEmail RESPONSE"); + + //console.log(response.data); + if(response.data.status === "success") { @@ -62,7 +64,8 @@ export const sendLoginFormEmail = ({ email, password, dispatch }) => }) .catch((error) => { - console.log("error"); + //console.log("error"); + console.error(error); reject(); @@ -77,17 +80,21 @@ export const sendLoginFormPhone = ({ phone }) => axios.post(`${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/auth/phone/check`, { phone }) .then((response) => { - console.log("sendLoginFormPhone RESPONSE"); - console.log(response.data); + //console.log("sendLoginFormPhone RESPONSE"); + + //console.log(response.data); + if(response.data) { - console.log("DATA? "); + //console.log("DATA? "); + resolve(); } else { - console.log("DATA ! "); + //console.log("DATA ! "); + reject(); } }) @@ -108,8 +115,10 @@ export const sendSmsCode = ({ dispatch, phone, code }) => axios.post(`${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/auth/phone/code`, { phone, code }) .then((response) => { - console.log("sendSmsCode RESPONSE"); - console.log(response.data); + //console.log("sendSmsCode RESPONSE"); + + //console.log(response.data); + if(response.data.status === "success") { @@ -174,15 +183,18 @@ export const logout = ({ dispatch, redirect = true }) => export const sendOffstageToken = ({ token, dispatch }) => { - console.log("ACTION", "sendOffstageToken()", `${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/auth/offstage/`); + //console.log("ACTION", "sendOffstageToken()", `${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/auth/offstage/`); + return new Promise((resolve, reject) => { axios.post(`${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/auth/offstage/`, { token }) .then((response) => { - console.log("sendOffstageToken RESPONSE"); - console.log(response.data); + //console.log("sendOffstageToken RESPONSE"); + + //console.log(response.data); + if(response.data.status === "success") { @@ -223,7 +235,8 @@ export const sendOffstageToken = ({ token, dispatch }) => export const sendSwitchAccount = ({ dispatch, acc_number }) => { - console.log("ACTION", "sendSwitchAccount()", `${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/auth/switch/`); + //console.log("ACTION", "sendSwitchAccount()", `${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/auth/switch/`); + dispatch({ type: actionTypes.USER, data: {} }); dispatch({ type: actionTypes.COMPANY, data: {} }); @@ -238,8 +251,10 @@ export const sendSwitchAccount = ({ dispatch, acc_number }) => axios.post(`${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/auth/switch/`, { acc_number }) .then((response) => { - console.log("sendSwitchAccount RESPONSE"); - console.log(response.data); + //console.log("sendSwitchAccount RESPONSE"); + + //console.log(response.data); + if(response.data.status === "success") { diff --git a/actions/calendarActions.js b/actions/calendarActions.js index 25fcb3f..d16d91d 100644 --- a/actions/calendarActions.js +++ b/actions/calendarActions.js @@ -26,7 +26,8 @@ if(process.browser) export const getCalendar = ({ dispatch, date_from, date_to }) => { - console.log("getCalendar", date_from, date_to); + //console.log("getCalendar", date_from, date_to); + return new Promise((resolve, reject) => { axios.post(`${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/calendar`, {}, @@ -74,7 +75,8 @@ export const getCalendar = ({ dispatch, date_from, date_to }) => calendar.push({ ...grouped_rows[i], ...{ payments: payments }}); } - console.log("TOTAL calendar", calendar); + //console.log("TOTAL calendar", calendar); + dispatch({ type: actionTypes.CALENDAR, data: { payments: calendar, periods: periods } }); }); }); diff --git a/actions/companyActions.js b/actions/companyActions.js index a8a58a9..1b70f05 100644 --- a/actions/companyActions.js +++ b/actions/companyActions.js @@ -23,7 +23,8 @@ if(process.browser) export const getCompanyInfo = ({ dispatch }) => { - console.log("getCompanyInfo"); + //console.log("getCompanyInfo"); + return new Promise((resolve, reject) => { axios.post(`${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/company`, {}, { @@ -31,14 +32,16 @@ export const getCompanyInfo = ({ dispatch }) => }) .then((response) => { - console.log("getCompanyInfo", "response", response.data); + //console.log("getCompanyInfo", "response", response.data); + dispatch({ type: actionTypes.COMPANY, data: response.data }); resolve(); }) .catch((error) => { - console.log("error"); + //console.log("error"); + console.error(error); reject(); diff --git a/actions/contractActions.js b/actions/contractActions.js index 204c039..8b8ef85 100644 --- a/actions/contractActions.js +++ b/actions/contractActions.js @@ -36,8 +36,10 @@ export const getContract = ({ dispatch, number, }) => }) .then((response) => { - console.log("response.data"); - console.log(response.data); + //console.log("response.data"); + + //console.log(response.data); + dispatch({ type: actionTypes.CONTRACT_PAYMENTS, @@ -217,9 +219,12 @@ export const getContractAgreement = ({ dispatch, number, }) => }, }; - console.log("ACTION", "getContractAgreement", "-".repeat(30)); - console.log("ACTION", "getContractAgreement", "response.data", response.data); - console.log("ACTION", "getContractAgreement", "-".repeat(30)); + //console.log("ACTION", "getContractAgreement", "-".repeat(30)); + + //console.log("ACTION", "getContractAgreement", "response.data", response.data); + + //console.log("ACTION", "getContractAgreement", "-".repeat(30)); + for(let i in response.data) { @@ -238,10 +243,14 @@ export const getContractAgreement = ({ dispatch, number, }) => } } - console.log("ACTION", "getContractAgreement", "-".repeat(30)); - console.log("ACTION", "getContractAgreement", "unsigned", unsigned); - console.log("ACTION", "getContractAgreement", "signed", signed); - console.log("ACTION", "getContractAgreement", "-".repeat(30)); + //console.log("ACTION", "getContractAgreement", "-".repeat(30)); + + //console.log("ACTION", "getContractAgreement", "unsigned", unsigned); + + //console.log("ACTION", "getContractAgreement", "signed", signed); + + //console.log("ACTION", "getContractAgreement", "-".repeat(30)); + dispatch({ type: actionTypes.CONTRACT_AGREEMENT, data: { agreement: { unsigned, signed } } }); @@ -268,7 +277,8 @@ export const getContractDocuments = ({ dispatch, number, }) => .then(async (response) => { - console.log("getDocuments", "response.data", response.data); + //console.log("getDocuments", "response.data", response.data); + const documents = { upd: [], upd_avans: [], fines: [] }; @@ -306,8 +316,10 @@ export const getContractDocuments = ({ dispatch, number, }) => })]) .then(() => { - console.log("documents"); - console.log(documents); + //console.log("documents"); + + //console.log(documents); + dispatch({ type: actionTypes.CONTRACT_DOCUMENTS, data: { documents: documents } }); resolve(); }); @@ -322,7 +334,8 @@ export const getContractDocuments = ({ dispatch, number, }) => export const getContractFines = ({ dispatch, contract, }) => { - console.log("ACTION", "getContractFines", contract); + //console.log("ACTION", "getContractFines", contract); + return new Promise((resolve, reject) => { @@ -334,16 +347,19 @@ export const getContractFines = ({ dispatch, contract, }) => }) .then(async (response) => { - console.log("ACTION", "getContractFines", "response.data", response.data); + //console.log("ACTION", "getContractFines", "response.data", response.data); + let query = nSQL(response.data.fines).query("select"); query = query.orderBy({ date: "desc" }); query.exec().then((rows) => { - console.log(global.store.getState().contract_fines); + //console.log(global.store.getState().contract_fines); + const contract_fines = global.store.getState().contract_fines; - console.log("ACTION", "getContractFines", "contract_fines", contract_fines); + //console.log("ACTION", "getContractFines", "contract_fines", contract_fines); + contract_fines[`${ contract }`] = rows; dispatch({ type: actionTypes.CONTRACT_FINES, data: contract_fines }); @@ -407,7 +423,8 @@ export const getContractMaterials = ({ dispatch, }) => export const getContractPenalties = ({ number, date }) => { - console.log("ACTION", "getContractPenalties", { number, date }); + //console.log("ACTION", "getContractPenalties", { number, date }); + return new Promise((resolve, reject) => { @@ -455,7 +472,8 @@ export const getContractGraphicChange = ({ dispatch, number }) => export const getContractGraphicChangeSignatories = ({ dispatch, number }) => { - console.log("ACTION", "getContractGraphicChangeSignatories", { number }); + //console.log("ACTION", "getContractGraphicChangeSignatories", { number }); + return new Promise((resolve, reject) => { @@ -480,7 +498,8 @@ export const getContractGraphicChangeSignatories = ({ dispatch, number }) => export const getContractGraphicChangeVariants = ({ dispatch, number, variants = {} }) => { - console.log("ACTION", "getContractGraphicChangeVariants", { ...{ number }, ...{ variants: variants } }); + //console.log("ACTION", "getContractGraphicChangeVariants", { ...{ number }, ...{ variants: variants } }); + return new Promise((resolve, reject) => { @@ -505,7 +524,8 @@ export const getContractGraphicChangeVariants = ({ dispatch, number, variants = export const getContractGraphicChangeCalculationsList = ({ dispatch, number }) => { - console.log("ACTION", "getContractGraphicChangeCalculationsList", { number }); + //console.log("ACTION", "getContractGraphicChangeCalculationsList", { number }); + return new Promise((resolve, reject) => { @@ -530,11 +550,13 @@ export const getContractGraphicChangeCalculationsList = ({ dispatch, number }) = export const getContractGraphicChangeOptions = ({ dispatch, number, variants }) => { - console.log("ACTION", "getContractGraphicChangeOptions", { ...{ number }, ...variants }); + //console.log("ACTION", "getContractGraphicChangeOptions", { ...{ number }, ...variants }); + return new Promise((resolve, reject) => { - console.log("{ ...{ number }, ...variants }", { ...{ number }, ...variants }); + //console.log("{ ...{ number }, ...variants }", { ...{ number }, ...variants }); + axios.post(`${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/contract/change/options`, { ...{ number }, ...{ variants: variants } }, { @@ -542,7 +564,8 @@ export const getContractGraphicChangeOptions = ({ dispatch, number, variants }) }) .then(async (response) => { - console.log("ACTION", "getContractGraphicChangeOptions", "response.data", response.data); + //console.log("ACTION", "getContractGraphicChangeOptions", "response.data", response.data); + dispatch({ type: actionTypes.CONTRACT_CHANGE, data: { options: response.data.planpayments[0] } }); resolve(); @@ -559,7 +582,8 @@ export const getContractGraphicChangeOptions = ({ dispatch, number, variants }) export const getContractGraphicChangeCalculate = (calculation) => { - console.log("ACTION", "getContractGraphicChangeCalculate", calculation); + //console.log("ACTION", "getContractGraphicChangeCalculate", calculation); + return new Promise((resolve, reject) => { @@ -570,7 +594,8 @@ export const getContractGraphicChangeCalculate = (calculation) => }) .then(async (response) => { - console.log("ACTION", "getContractGraphicChangeCalculate", "response.data", response.data); + //console.log("ACTION", "getContractGraphicChangeCalculate", "response.data", response.data); + resolve(response.data); }) .catch((error) => @@ -585,7 +610,8 @@ export const getContractGraphicChangeCalculate = (calculation) => export const getContractGraphicChangeGetCurrent = ({ dispatch, number }) => { - console.log("ACTION", "getContractGraphicChangeGetCurrent", { number }); + //console.log("ACTION", "getContractGraphicChangeGetCurrent", { number }); + return new Promise((resolve, reject) => { @@ -595,7 +621,8 @@ export const getContractGraphicChangeGetCurrent = ({ dispatch, number }) => }) .then(async (response) => { - console.log("ACTION", "getContractGraphicChangeGetCurrent", "response.data", response.data); + //console.log("ACTION", "getContractGraphicChangeGetCurrent", "response.data", response.data); + dispatch({ type: actionTypes.CONTRACT_CHANGE, data: { current: { payments: response.data.planpayments, total: response.data.sum_total } } }); resolve(); @@ -612,7 +639,8 @@ export const getContractGraphicChangeGetCurrent = ({ dispatch, number }) => export const getContractGraphicChangeGetCalculated = ({ dispatch, calculation }) => { - console.log("ACTION", "getContractGraphicChangeGetCalculated", { calculation }); + //console.log("ACTION", "getContractGraphicChangeGetCalculated", { calculation }); + return new Promise((resolve, reject) => { @@ -622,7 +650,8 @@ export const getContractGraphicChangeGetCalculated = ({ dispatch, calculation }) }) .then(async (response) => { - console.log("ACTION", "getContractGraphicChangeGetCalculated", "response.data", response.data); + //console.log("ACTION", "getContractGraphicChangeGetCalculated", "response.data", response.data); + dispatch({ type: actionTypes.CONTRACT_CHANGE, data: { calculated: { payments: response.data.planpayments, total: response.data.sum_total } } }); resolve(); @@ -639,7 +668,8 @@ export const getContractGraphicChangeGetCalculated = ({ dispatch, calculation }) export const signContractGraphicChange = (params) => { - console.log("ACTION", "signContractGraphicChange", params); + //console.log("ACTION", "signContractGraphicChange", params); + return new Promise((resolve, reject) => { @@ -649,7 +679,8 @@ export const signContractGraphicChange = (params) => }) .then(async (response) => { - console.log("ACTION", "signContractGraphicChange", "response.data", response.data); + //console.log("ACTION", "signContractGraphicChange", "response.data", response.data); + resolve(response.data.comment); }) .catch((error) => diff --git a/actions/contractsActions.js b/actions/contractsActions.js index bcb5ec6..1781aa9 100644 --- a/actions/contractsActions.js +++ b/actions/contractsActions.js @@ -82,11 +82,13 @@ export const getContractsList = ({ dispatch, order = "date", sort = "desc", page query_total.exec().then((total_rows) => { const total = total_rows[0].total; - console.log("total", total); + //console.log("total", total); + query.exec().then((rows) => { - console.log(rows); // <= [{name: "jeb", age: 27}] + //console.log(rows); + // <= [{name: "jeb", age: 27}] dispatch({ type: actionTypes.CONTRACTS, data: { list: rows, page: page, pages: Math.ceil(total / page_size) } }); }); }); @@ -108,8 +110,10 @@ export const getContractsList = ({ dispatch, order = "date", sort = "desc", page }) .then((response) => { - console.log("getContractsList RESPONSE"); - console.log(response.data); + //console.log("getContractsList RESPONSE"); + + //console.log(response.data); + if(response.data.status === "success") { @@ -122,7 +126,8 @@ export const getContractsList = ({ dispatch, order = "date", sort = "desc", page }) .catch((error) => { - console.log("error"); + //console.log("error"); + console.error(error); reject(); @@ -142,8 +147,10 @@ export const getContractsList = ({ dispatch, order = "date", sort = "desc", page axios.post(`${ process.env.NEXT_PUBLIC_API_HOST }/api/forms/terms/`, fields) .then((response) => { - console.log("sendTermsForm RESPONSE"); - console.log(response.data); + //console.log("sendTermsForm RESPONSE"); + + //console.log(response.data); + if(response.data.status) { @@ -156,7 +163,8 @@ export const getContractsList = ({ dispatch, order = "date", sort = "desc", page }) .catch((error) => { - console.log("error"); + //console.log("error"); + console.error(error); reject(); diff --git a/actions/eventsActions.js b/actions/eventsActions.js index 459746f..0a51262 100644 --- a/actions/eventsActions.js +++ b/actions/eventsActions.js @@ -24,11 +24,13 @@ if(process.browser) export const getEvents = ({ dispatch, type, contract }) => { - console.log("ACTION", "getEvents()"); + //console.log("ACTION", "getEvents()"); + return new Promise((resolve, reject) => { - console.log("global.store.getState()", global.store.getState()); + //console.log("global.store.getState()", global.store.getState()); + if(global.store.getState().events.list === undefined) { @@ -37,18 +39,21 @@ export const getEvents = ({ dispatch, type, contract }) => }) .then((response) => { - console.log("ACTION", "getEvents()", "response", response.data); + //console.log("ACTION", "getEvents()", "response", response.data); + const events = response.data; const filtered_events = []; - console.log("ACTION", "getEvents()", "events", events); + //console.log("ACTION", "getEvents()", "events", events); + dispatch({ type: actionTypes.EVENTS, data: { list: events, loaded: true } }); resolve(); }) .catch((error) => { - console.log("error"); + //console.log("error"); + console.error(error); reject(); @@ -65,7 +70,8 @@ export const getFilteredEvents = ({ dispatch, search, contract }) => { return new Promise((resolve, reject) => { - console.log("getFilteredEvents"); + //console.log("getFilteredEvents"); + const types = { "additional": [ "osago_prolong", "kasko_prolong", "fingap_prolong" ], @@ -76,7 +82,8 @@ export const getFilteredEvents = ({ dispatch, search, contract }) => if((search !== undefined || search !== null || search !== "")) { - console.log(global.store.getState().events); + //console.log(global.store.getState().events); + const events = global.store.getState().events.list; let query = nSQL(events) @@ -97,11 +104,13 @@ export const getFilteredEvents = ({ dispatch, search, contract }) => array_of_queries.push([ "event_type", "=", types[ type ][ i ] ]); if(parseInt(i, 10) < parseInt(types[ type ].length - 1)) { - console.log(parseInt(i, 10), "<", types[ type ].length - 1); + //console.log(parseInt(i, 10), "<", types[ type ].length - 1); + array_of_queries.push("OR"); } } - console.log("array_of_queries", array_of_queries); + //console.log("array_of_queries", array_of_queries); + query.where(array_of_queries); } } @@ -119,8 +128,10 @@ export const getFilteredEvents = ({ dispatch, search, contract }) => query.exec().then((rows) => { - console.log("rows"); - console.log(rows); + //console.log("rows"); + + //console.log(rows); + dispatch({ type: actionTypes.EVENTS_FILTERED, data: { filtered: rows } }); resolve(); @@ -137,12 +148,14 @@ export const getFilteredEvents = ({ dispatch, search, contract }) => export const getContractEvents = ({ dispatch, contract }) => { - console.log("ACTION", "getContractEvents"); + //console.log("ACTION", "getContractEvents"); + return new Promise((resolve, reject) => { const events = global.store.getState().events.list; - console.log("ACTION", "getContractEvents", "events", events); + //console.log("ACTION", "getContractEvents", "events", events); + let query = nSQL(events) .query("select"); @@ -154,8 +167,10 @@ export const getContractEvents = ({ dispatch, contract }) => query.exec().then((rows) => { - console.log("rows"); - console.log(rows); + //console.log("rows"); + + //console.log(rows); + const events_list = {}; events_list[`${ contract }`] = rows; diff --git a/actions/fileActions.js b/actions/fileActions.js index 15ef1ab..c6554e3 100644 --- a/actions/fileActions.js +++ b/actions/fileActions.js @@ -24,8 +24,10 @@ if(process.browser) export const getImage = ({ id }) => { - console.log("getImage\n\n"); - console.log("getImage", `${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/file/image`); + //console.log("getImage\n\n"); + + //console.log("getImage", `${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/file/image`); + return new Promise((resolve, reject) => { @@ -49,7 +51,8 @@ export const getImage = ({ id }) => export const getFile = ({ id, filename }) => { - console.log("getFile"); + //console.log("getFile"); + return new Promise((resolve, reject) => { axios.get(`${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/file/download`, { @@ -63,7 +66,8 @@ export const getFile = ({ id, filename }) => }) .catch((error) => { - console.log("error"); + //console.log("error"); + console.error(error); reject(); @@ -73,7 +77,8 @@ export const getFile = ({ id, filename }) => export const getPrintFile = ({ contract, num, type, date, filename }) => { - console.log("getFile"); + //console.log("getFile"); + return new Promise((resolve, reject) => { axios.get(`${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/file/print-form`, { @@ -87,7 +92,8 @@ export const getPrintFile = ({ contract, num, type, date, filename }) => }) .catch((error) => { - console.log("error"); + //console.log("error"); + console.error(error); reject(); @@ -97,7 +103,8 @@ export const getPrintFile = ({ contract, num, type, date, filename }) => export const getFineBeforeAccrualFile = ({ contract, num, filename }) => { - console.log("getFile"); + //console.log("getFile"); + return new Promise((resolve, reject) => { axios.get(`${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/file/fine-before-accrual`, { @@ -111,7 +118,8 @@ export const getFineBeforeAccrualFile = ({ contract, num, filename }) => }) .catch((error) => { - console.log("error"); + //console.log("error"); + console.error(error); reject(); @@ -121,7 +129,8 @@ export const getFineBeforeAccrualFile = ({ contract, num, filename }) => export const getFineAfterAccrualFile = ({ contract, num, filename }) => { - console.log("getFile"); + //console.log("getFile"); + return new Promise((resolve, reject) => { axios.get(`${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/file/fine-after-accrual`, { @@ -135,7 +144,8 @@ export const getFineAfterAccrualFile = ({ contract, num, filename }) => }) .catch((error) => { - console.log("error"); + //console.log("error"); + console.error(error); reject(); @@ -145,7 +155,8 @@ export const getFineAfterAccrualFile = ({ contract, num, filename }) => export const getReconciliationFile = ({ contract, date_from, date_to, filename }) => { - console.log("getFile"); + //console.log("getFile"); + return new Promise((resolve, reject) => { axios.get(`${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/file/reconciliation`, { @@ -159,7 +170,8 @@ export const getReconciliationFile = ({ contract, date_from, date_to, filename } }) .catch((error) => { - console.log("error"); + //console.log("error"); + console.error(error); reject(); @@ -169,7 +181,8 @@ export const getReconciliationFile = ({ contract, date_from, date_to, filename } export const getBitrixFile = ({ url, filename }) => { - console.log("getFile"); + //console.log("getFile"); + return new Promise((resolve, reject) => { axios.get(`${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/file/bitrix`, { @@ -183,7 +196,8 @@ export const getBitrixFile = ({ url, filename }) => }) .catch((error) => { - console.log("error"); + //console.log("error"); + console.error(error); reject(); @@ -193,7 +207,8 @@ export const getBitrixFile = ({ url, filename }) => export const getContractDebtInvoiceFile = ({ contract }) => { - console.log("ACTION", "getContractDebtInvoiceFile", { contract }); + //console.log("ACTION", "getContractDebtInvoiceFile", { contract }); + return new Promise((resolve, reject) => { @@ -218,7 +233,8 @@ export const getContractDebtInvoiceFile = ({ contract }) => export const getContractPenaltyInvoiceFile = ({ contract }) => { - console.log("ACTION", "getContractPenaltyInvoiceFile", { contract }); + //console.log("ACTION", "getContractPenaltyInvoiceFile", { contract }); + return new Promise((resolve, reject) => { @@ -243,7 +259,8 @@ export const getContractPenaltyInvoiceFile = ({ contract }) => export const getContractCalculationPDFFile = ({ calculation }) => { - console.log("ACTION", "getContractCalculationPDFFile", { calculation }); + //console.log("ACTION", "getContractCalculationPDFFile", { calculation }); + return new Promise((resolve, reject) => { diff --git a/actions/questionnaireActions.js b/actions/questionnaireActions.js index 5745107..abe0dcd 100644 --- a/actions/questionnaireActions.js +++ b/actions/questionnaireActions.js @@ -28,14 +28,16 @@ if(process.browser) export const getQuestionnaire = ({ dispatch, id }) => { - console.log("ACTION", "support", "getAppeals()", `${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/questionnaire/get`); + //console.log("ACTION", "support", "getAppeals()", `${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/questionnaire/get`); + return new Promise((resolve, reject) => { axios.get(`${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/questionnaire/read`, {}) .then((response_read) => { - console.log("ACTION", "getQuestionnaire", "/api/questionnaire/read", response_read.data); + //console.log("ACTION", "getQuestionnaire", "/api/questionnaire/read", response_read.data); + if(response_read.data !== "") { updateQuestionnaire({ dispatch, questionnaire: response_read.data }); @@ -50,7 +52,8 @@ export const getQuestionnaire = ({ dispatch, id }) => }) .then((response) => { - console.log("ACTION", "questionnaire", "getQuestionnaire()", "response", response.data); + //console.log("ACTION", "questionnaire", "getQuestionnaire()", "response", response.data); + const founder_persons_template = { signatory_id: null, @@ -190,7 +193,8 @@ export const getQuestionnaire = ({ dispatch, id }) => //questionnaire.founder_persons = { ...questionnaire.head_person, ...response.data.head_person }; - console.log("questionnairequestionnairequestionnaire FROM JSON", questionnaire); + //console.log("questionnairequestionnairequestionnaire FROM JSON", questionnaire); + updateQuestionnaire({ dispatch, questionnaire }) .then(() => {}) .catch(() => {}); @@ -204,7 +208,8 @@ export const getQuestionnaire = ({ dispatch, id }) => }) .catch((error) => { - console.log("error"); + //console.log("error"); + console.error(error); reject(); @@ -258,14 +263,16 @@ export const eraseQuestionnaire = () => export const updateQuestionnaire = ({ dispatch, questionnaire }) => { - console.log("ACTION", "questionnaireActions", "updateQuestionnaire()", { questionnaire }); + //console.log("ACTION", "questionnaireActions", "updateQuestionnaire()", { questionnaire }); + return new Promise((resolve, reject) => { dispatch({ type: actionTypes.QUESTIONNAIRE_UPDATE, data: { questionnaire, } }); /* setTimeout(() => { - console.log("ACTION", "questionnaireActions", "updateQuestionnaire", global.store.getState(), { dispatch: dispatch }); + //console.log("ACTION", "questionnaireActions", "updateQuestionnaire", global.store.getState(), { dispatch: dispatch }); + resolve(); }, 500); */ @@ -285,7 +292,8 @@ export const resetQuestionnaire = ({ dispatch, id }) => export const defaultQuestionnaire = ({ dispatch }) => { - console.log("defaultQuestionnaire"); + //console.log("defaultQuestionnaire"); + const template = JSON.parse(JSON.stringify(questionnaire_template)); dispatch({ type: actionTypes.QUESTIONNAIRE_UPDATE, data: { questionnaire: template, } }); @@ -294,7 +302,8 @@ export const defaultQuestionnaire = ({ dispatch }) => export const uploadAttachmentFile = (file) => { - console.log("ACTION", "questionnaireActions", "uploadAttachmentFile()", { file }); + //console.log("ACTION", "questionnaireActions", "uploadAttachmentFile()", { file }); + return new Promise((resolve, reject) => { @@ -310,7 +319,8 @@ export const uploadAttachmentFile = (file) => }) .then(async (response) => { - console.log("questionnaireActions", "uploadAttachmentFile()", "response.data", response.data); + //console.log("questionnaireActions", "uploadAttachmentFile()", "response.data", response.data); + resolve(response.data); }) .catch((error) => @@ -323,7 +333,8 @@ export const uploadAttachmentFile = (file) => export const uploadSignedFile = (file, id, digital = false) => { - console.log("uploadSignedFile", { file, id, digital }); + //console.log("uploadSignedFile", { file, id, digital }); + return new Promise((resolve, reject) => { let data = new FormData(); @@ -360,7 +371,8 @@ export const removeAttachmentFiles = (files) => export const removeAttachmentFile = (id) => { - console.log("ACTION", "questionnaireActions", "removeAttachmentFile()", { id }); + //console.log("ACTION", "questionnaireActions", "removeAttachmentFile()", { id }); + return new Promise((resolve, reject) => { @@ -373,7 +385,8 @@ export const removeAttachmentFile = (id) => }) .then(async (response) => { - console.log("questionnaireActions", "removeAttachmentFile()", "complete"); + //console.log("questionnaireActions", "removeAttachmentFile()", "complete"); + resolve(); }) .catch((error) => @@ -386,7 +399,8 @@ export const removeAttachmentFile = (id) => export const downloadQuestionnaire = ({ filename, download = true, base64 = false }) => { - console.log("ACTION", "questionnaireActions", "downloadQuestionnaire()", ); + //console.log("ACTION", "questionnaireActions", "downloadQuestionnaire()", ); + //{ questionnaire } //questionnaire @@ -396,10 +410,12 @@ export const downloadQuestionnaire = ({ filename, download = true, base64 = fals let cookies_list = cookies.getAll(); const { questionnaire } = global.store.getState(); - console.log("questionnaire", questionnaire); + //console.log("questionnaire", questionnaire); + const { main, contacts, signatory_person, founder_persons, head_person, non_profit, } = questionnaire; const payload = { main, contacts, signatory_person, founder_persons, head_person, non_profit, }; - console.log({ payload }); + //console.log({ payload }); + /* axios.post(`${ process.env.NEXT_PUBLIC_INT_API_HOST }/questionnaire/download`, { questionnaire: payload }, { headers: { @@ -425,7 +441,8 @@ export const downloadQuestionnaire = ({ filename, download = true, base64 = fals { if(download) { - console.log("downloadQuestionnaire", "response.data"); + //console.log("downloadQuestionnaire", "response.data"); + fileDownload(response.data, filename); resolve(); @@ -439,7 +456,8 @@ export const downloadQuestionnaire = ({ filename, download = true, base64 = fals }) .catch((error) => { - console.log("error"); + //console.log("error"); + console.error(error); reject(); diff --git a/actions/recoveryActions.js b/actions/recoveryActions.js index 6498be3..0df1148 100644 --- a/actions/recoveryActions.js +++ b/actions/recoveryActions.js @@ -29,17 +29,21 @@ export const sendEmailCheck = ({ email }) => axios.post(`${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/recovery/check`, { email }) .then((response) => { - console.log("sendEmailCheck RESPONSE"); - console.log(response.data); + //console.log("sendEmailCheck RESPONSE"); + + //console.log(response.data); + if(response.data) { - console.log("DATA? "); + //console.log("DATA? "); + resolve(); } else { - console.log("DATA ! "); + //console.log("DATA ! "); + reject(); } }) @@ -60,8 +64,10 @@ export const sendEmailCode = ({ email, code }) => axios.post(`${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/recovery/code`, { email, code }) .then((response) => { - console.log("checkSmsCode RESPONSE"); - console.log(response.data); + //console.log("checkSmsCode RESPONSE"); + + //console.log(response.data); + if(response.data.status === "success") { @@ -89,8 +95,10 @@ export const sendPassword = ({ email, code, password, password_repeat }) => axios.post(`${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/recovery/password`, { email, code, password, password_repeat }) .then((response) => { - console.log("sendPassword RESPONSE"); - console.log(response.data); + //console.log("sendPassword RESPONSE"); + + //console.log(response.data); + if(response.data.status === "success") { @@ -118,8 +126,10 @@ export const sendNewPassword = ({ password, new_password, new_password_repeat }) axios.post(`${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/change/password`, { password, new_password, new_password_repeat }) .then((response) => { - console.log("sendNewPassword RESPONSE"); - console.log(response.data); + //console.log("sendNewPassword RESPONSE"); + + //console.log(response.data); + if(response.data.status === "success") { diff --git a/actions/settingsActions.js b/actions/settingsActions.js index 6e78ba6..f30bcdf 100644 --- a/actions/settingsActions.js +++ b/actions/settingsActions.js @@ -29,24 +29,30 @@ export const sendPhoneChangeNumber = ({ email, phone }) => axios.post(`${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/change/phone/send`, { email, phone }) .then((response) => { - console.log("\n", "sendLoginFormPhone", "RESPONSE"); - console.log(response.data); + //console.log("\n", "sendLoginFormPhone", "RESPONSE"); + + //console.log(response.data); + if(response.data) { - console.log("DATA? "); + //console.log("DATA? "); + resolve(); } else { - console.log("DATA ! "); + //console.log("DATA ! "); + reject(); } }) .catch((error) => { - console.log("DATA !!! "); - console.log("error"); + //console.log("DATA !!! "); + + //console.log("error"); + console.error(error); reject(); @@ -61,8 +67,10 @@ export const sendPhoneChangeNumberSmsCode = ({ phone, code }) => axios.post(`${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/change/phone/code`, { phone, code }) .then((response) => { - console.log("\n", "sendPhoneChangeNumberSmsCode", "RESPONSE"); - console.log(response.data); + //console.log("\n", "sendPhoneChangeNumberSmsCode", "RESPONSE"); + + //console.log(response.data); + if(response.data.status === "success") { @@ -90,8 +98,10 @@ export const sendNewPassword = ({ email, password, new_password, new_password_re axios.post(`${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/change/password`, { email, password, new_password, new_password_repeat }) .then((response) => { - console.log("\n", "sendNewPassword", "RESPONSE"); - console.log(response.data); + //console.log("\n", "sendNewPassword", "RESPONSE"); + + //console.log(response.data); + if(response.data) { @@ -114,6 +124,7 @@ export const sendNewPassword = ({ email, password, new_password, new_password_re export const setUserPhone = ({ dispatch, user }) => { - console.log("setUserPhone", dispatch, user); + //console.log("setUserPhone", dispatch, user); + dispatch({ type: actionTypes.USER, data: user }); } \ No newline at end of file diff --git a/actions/suggestsActions.js b/actions/suggestsActions.js index c987a1e..01b5467 100644 --- a/actions/suggestsActions.js +++ b/actions/suggestsActions.js @@ -33,7 +33,8 @@ export const getAddress = (query) => }) .catch((error) => { - console.log("error"); + //console.log("error"); + console.error(error); reject(); @@ -54,7 +55,8 @@ export const getFullnamePart = (query, parts) => }) .catch((error) => { - console.log("error"); + //console.log("error"); + console.error(error); reject(); @@ -75,7 +77,8 @@ export const getSuggests = (type, payload) => }) .catch((error) => { - console.log("error"); + //console.log("error"); + console.error(error); reject(); @@ -96,7 +99,8 @@ export const checkDocumentData = (payload) => }) .catch((error) => { - console.log("error"); + //console.log("error"); + console.error(error); reject(); diff --git a/actions/supportActions.js b/actions/supportActions.js index 061e9d7..d4264d6 100644 --- a/actions/supportActions.js +++ b/actions/supportActions.js @@ -49,7 +49,8 @@ export const setAppealsRead = ({ dispatch, appeals }) => }) .catch((error) => { - console.log("error"); + //console.log("error"); + console.error(error); reject(); @@ -59,7 +60,8 @@ export const setAppealsRead = ({ dispatch, appeals }) => export const getAppeals = ({ dispatch }) => { - console.log("ACTION", "support", "getAppeals()", `${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/support/appeals`); + //console.log("ACTION", "support", "getAppeals()", `${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/support/appeals`); + return new Promise((resolve, reject) => { @@ -68,14 +70,16 @@ export const getAppeals = ({ dispatch }) => }) .then((response) => { - console.log("ACTION", "support", "getAppeals()", "response", response.data); + //console.log("ACTION", "support", "getAppeals()", "response", response.data); + dispatch({ type: actionTypes.SUPPORT_APPEALS, data: { appeals: { list: response.data.appeals, new: response.data.new, } } }); resolve(); }) .catch((error) => { - console.log("error"); + //console.log("error"); + console.error(error); reject(); @@ -85,7 +89,8 @@ export const getAppeals = ({ dispatch }) => export const getSupportThemes = ({ dispatch, query, }) => { - console.log("ACTION", "support", "getSupportThemes", { query }); + //console.log("ACTION", "support", "getSupportThemes", { query }); + return new Promise((resolve, reject) => { @@ -97,7 +102,8 @@ export const getSupportThemes = ({ dispatch, query, }) => }) .then(async (response) => { - console.log("getContractRules", "response.data", response.data); + //console.log("getContractRules", "response.data", response.data); + if(query !== undefined) { const { themes } = response.data; @@ -153,7 +159,8 @@ export const resetFilteredThemes = ({ dispatch }) => export const sendNewAppeal = (appeal) => { - console.log("ACTION", "support", "sendNewAppeal", appeal); + //console.log("ACTION", "support", "sendNewAppeal", appeal); + return new Promise((resolve, reject) => { @@ -163,7 +170,8 @@ export const sendNewAppeal = (appeal) => }) .then(async (response) => { - console.log("sendNewAppeal", "response.data", response.data); + //console.log("sendNewAppeal", "response.data", response.data); + resolve(response.data); }) .catch((error) => @@ -176,7 +184,8 @@ export const sendNewAppeal = (appeal) => export const sendAppealAttachments = (payload) => { - console.log("ACTION", "support", "sendAppealAttachments", payload); + //console.log("ACTION", "support", "sendAppealAttachments", payload); + return new Promise((resolve, reject) => { @@ -194,7 +203,8 @@ export const sendAppealAttachments = (payload) => }) .then(async (response) => { - console.log("sendAppealAttachments", "response.data", response.data); + //console.log("sendAppealAttachments", "response.data", response.data); + callback(null); }) .catch((error) => diff --git a/components/CalendarDatePicker/index.js b/components/CalendarDatePicker/index.js index d47d7bb..0762ac0 100644 --- a/components/CalendarDatePicker/index.js +++ b/components/CalendarDatePicker/index.js @@ -27,7 +27,8 @@ export default class CalendarDatePicker extends React.Component _handle_onChange = (date) => { - //console.log("CalendarDatePicker", "_handle_onChange", date); + ////console.log("CalendarDatePicker", "_handle_onChange", date); + const { readonly } = this.state; if(this.props.onChange !== undefined) { @@ -51,14 +52,16 @@ export default class CalendarDatePicker extends React.Component if(event.keyCode >= 48 && event.keyCode <= 57) { //const input_value - console.log("CalendarDatePicker", "_handle_onKeyChange", "key", event.key, event); + //console.log("CalendarDatePicker", "_handle_onKeyChange", "key", event.key, event); + let new_value = `${ input_value !== undefined ? input_value : "" }${ event.key }`; let masks = "ДД.ММ.ГГГГ".split(""); let letters = new_value.split(""); let chars = []; - console.log({ new_value, letters, masks }); + //console.log({ new_value, letters, masks }); + for(let i in masks) { @@ -71,7 +74,8 @@ export default class CalendarDatePicker extends React.Component chars.push(masks[i]); } } - console.log("chars", chars, chars.join("")); + //console.log("chars", chars, chars.join("")); + this.setState({ input_value: chars.join("") }); } diff --git a/components/questionnaire/DocumentIssuerSuggestsInput.js b/components/questionnaire/DocumentIssuerSuggestsInput.js index 61d1d28..b7b04fa 100644 --- a/components/questionnaire/DocumentIssuerSuggestsInput.js +++ b/components/questionnaire/DocumentIssuerSuggestsInput.js @@ -65,7 +65,8 @@ export default class DocumentIssuerSuggestsInput extends React.Component _handle_onChange = (value) => { - console.log("DocumentIssuerSuggestsInput", "_handle_onChange", { value }); + //console.log("DocumentIssuerSuggestsInput", "_handle_onChange", { value }); + const { focused } = this.state; const { onChange } = this.props; @@ -78,7 +79,8 @@ export default class DocumentIssuerSuggestsInput extends React.Component _handle_onSelect = (option) => { - console.log("DocumentIssuerSuggestsInput", "_handle_onSelect", { option }); + //console.log("DocumentIssuerSuggestsInput", "_handle_onSelect", { option }); + const { onChange } = this.props; onChange(option); diff --git a/components/questionnaire/InnerMenu/index.js b/components/questionnaire/InnerMenu/index.js index 2106596..7de7b38 100644 --- a/components/questionnaire/InnerMenu/index.js +++ b/components/questionnaire/InnerMenu/index.js @@ -41,8 +41,10 @@ class InnerMenu extends React.Component this._checkMenu(); } - //console.log("InnerMenu", "menu", "prevProps.route", prevProps); - //console.log("InnerMenu", "menu", "this.props.route", this.props); + ////console.log("InnerMenu", "menu", "prevProps.route", prevProps); + + ////console.log("InnerMenu", "menu", "this.props.route", this.props); + } } @@ -62,7 +64,8 @@ class InnerMenu extends React.Component menu = [ "#main", "#contacts", "#signer", "#shareholders", "#check", "#signing" ]; } - console.log("_checkMenu", this.menuRef.current); + //console.log("_checkMenu", this.menuRef.current); + for(let i in menu) { if(this.props.router.asPath.indexOf(menu[i]) > -1) @@ -75,7 +78,8 @@ class InnerMenu extends React.Component { for(let i = 0; i < m; i++) { - console.log("this.menuRef.current.children", this.menuRef.current.children[i]); + //console.log("this.menuRef.current.children", this.menuRef.current.children[i]); + if(this.menuRef.current.children[i] !== undefined) { l = l + this.menuRef.current.children[i].getBoundingClientRect().width; @@ -115,12 +119,14 @@ class InnerMenu extends React.Component render() { - console.log("questionnaire", this.props.questionnaire); + //console.log("questionnaire", this.props.questionnaire); + const { menuOpened, step, } = this.state; const { questionnaire, company, nko } = this.props; const last = company.inn.length < 11 ? nko ? [7,8] : [6,7] : [5,6]; - console.log("this.props.router.asPath", this.props.router.asPath); + //console.log("this.props.router.asPath", this.props.router.asPath); + return (