updatef for contract documents API

This commit is contained in:
merelendor 2021-12-07 14:22:44 +01:00
parent 207ccf774f
commit 880ee05187
5 changed files with 71 additions and 49 deletions

View File

@ -235,6 +235,16 @@ export const getContractDocuments = ({ dispatch, number, }) =>
pr();
});
}), new Promise((pr) =>
{
let query = nSQL(response.data.billfines).query("select");
query = query.orderBy({ date: "desc" });
query.exec().then((rows) =>
{
documents.billfines = rows;
pr();
});
}), new Promise((pr) =>
{
let query = nSQL(response.data.fines).query("select");
query = query.orderBy({ date: "desc" });

View File

@ -5,6 +5,7 @@ import cookie from 'cookie';
import moment from 'moment';
import jwt from 'jsonwebtoken';
import { cors } from '../../../lib/cors';
import { inspect } from 'util';
export default async function handler(req, res)
{
@ -21,6 +22,7 @@ export default async function handler(req, res)
const result = {
upd: [],
upd_avans: [],
billfines: [],
fines: [],
};
@ -32,17 +34,20 @@ export default async function handler(req, res)
})
.then((crm_response) =>
{
console.log(inspect(crm_response.data, true, null, true));
for(let i in crm_response.data)
{
console.log("docs".repeat(10));
console.log(crm_response.data[i]);
if(crm_response.data[i].upd !== undefined)
if(crm_response.data[i].type === "UPD")
{
result.upd = crm_response.data[i].upd;
}
if(crm_response.data[i].upd_avans !== undefined)
if(crm_response.data[i].type === "UPD_Avans")
{
result.upd_avans = crm_response.data[i];
result.upd_avans = crm_response.data[i].upd;
}
if(crm_response.data[i].type === "BillFine")
{
result.billfines = crm_response.data[i].upd;
}
}
resolve();

View File

@ -27,7 +27,7 @@ export default class Footer extends React.Component
<div className="container">
<ul className="column">
<li><b>Программы</b></li>
{ programs.map((program, index) => (
{ programs !== undefined && programs !== null && programs.map((program, index) => (
<li key={ index }>
<Link href={`${ process.env.NEXT_PUBLIC_MAIN_SITE }/programs/${ program.code }/`}>
<a>{ program.name }</a>

View File

@ -45,7 +45,7 @@ export default class FormRequest extends React.Component
<h2 className="section_title">Купить в лизинг?</h2>
<div className="order_form">
<div className="order_email">
<p>Напишите на <a href="mailto:">info@evoleasing.ru</a> или заполните форму</p>
<p>Напишите на <a href="mailto:">buy@evoleasing.ru</a> или заполните форму</p>
</div>
<form onSubmit={ (event) => this._onFormSubmit(event) }>
{ !success ? (

View File

@ -21,7 +21,8 @@ import { getContractInfo, getContractDocuments, getReconciliationFile } from "..
const TYPES = {
upd: "УПД по очередным платежам",
upd_avans: "УПД по авансовым платежам",
upd_avans: "УПД по авансовым платежам",
billfines: "Счета-уведомления на пени",
billgibdd: "BillGIBDD",
fines: "Штрафы ГИБДД",
};
@ -197,53 +198,58 @@ class ContractDocumentsPage extends React.Component
const { number } = this.props;
const { opened } = this.state;
if(documents.length > 0)
if(documents !== undefined && documents !== null)
{
return (
<>
<div className={`dropdown_block bt ${ opened.indexOf(type) > -1 ? "open" : "" }`}>
<div className="block_header" onClick={ () => this._handle_onGroup(type) }>
<p>{ TYPES[type] }</p>
{ documents.length > 3 && (
<button className={`block_toggle ${ opened.indexOf(type) > -1 ? "rotate" : "" }`}></button>
if(documents.length > 0)
{
return (
<>
<div className={`dropdown_block bt ${ opened.indexOf(type) > -1 ? "open" : "" }`}>
<div className="block_header" onClick={ () => this._handle_onGroup(type) }>
<p>{ TYPES[type] }</p>
{ documents.length > 3 && (
<button className={`block_toggle ${ opened.indexOf(type) > -1 ? "rotate" : "" }`}></button>
) }
</div>
</div>
<div className="dosc_list medium-icon">
{ documents.slice(0, opened.indexOf(type) > -1 ? documents.length : 3).map((doc, index) => (
<div className="row" key={ index }>
<p className="doc_name i-pdf i-medium">
{ doc.num } от { moment(doc.date).format("DD.MM.YYYY") }
</p>
<DownloadPrintFormPdfButton className="download-icon" filename={ `${ number }_${ doc.type }_${ doc.num }.pdf` } contract={ number } num={ doc.num } date={ doc.date } type={ doc.type }/>
</div>
)) }
{ opened.indexOf(type) < 0 && documents.length > 3 && (
<div className="row" style={{ justifyContent: "center", corsor: "pointer" }} onClick={ () => this._handle_onGroup(type) }>
<p style={{ color: "#747474" }}>Еще { documents.length - 3 } { pluralize((documents.length - 3), 'документов', 'документ', 'документа', 'документов') }</p>
</div>
) }
</div>
</div>
<div className="dosc_list medium-icon">
{ documents.slice(0, opened.indexOf(type) > -1 ? documents.length : 3).map((doc, index) => (
<div className="row" key={ index }>
<p className="doc_name i-pdf i-medium">
{ doc.num } от { moment(doc.date).format("DD.MM.YYYY") }
</p>
<DownloadPrintFormPdfButton className="download-icon" filename={ `${ number }_${ doc.type }_${ doc.num }.pdf` } contract={ number } num={ doc.num } date={ doc.date } type={ doc.type }/>
</>
)
}
if(type !== "upd_avans")
{
return (
<>
<div className={`dropdown_block bt ${ opened.indexOf(type) > -1 ? "open" : "" }`}>
<div className="block_header" onClick={ () => this._handle_onGroup(type) }>
<p>{ TYPES[type] }</p>
</div>
)) }
{ opened.indexOf(type) < 0 && documents.length > 3 && (
<div className="row" style={{ justifyContent: "center", corsor: "pointer" }} onClick={ () => this._handle_onGroup(type) }>
<p style={{ color: "#747474" }}>Еще { documents.length - 3 } { pluralize((documents.length - 3), 'документов', 'документ', 'документа', 'документов') }</p>
</div>
) }
</div>
</>
)
</div>
<div>
<p>Документов пока еще нет.</p>
<p>&nbsp;</p>
</div>
</>
);
}
}
if(type !== "upd_avans")
{
return (
<>
<div className={`dropdown_block bt ${ opened.indexOf(type) > -1 ? "open" : "" }`}>
<div className="block_header" onClick={ () => this._handle_onGroup(type) }>
<p>{ TYPES[type] }</p>
</div>
</div>
<div>
<p>Документов пока еще нет.</p>
<p>&nbsp;</p>
</div>
</>
);
}
return null;
}
_renderFines = (fines, type) =>
@ -373,6 +379,7 @@ class ContractDocumentsPage extends React.Component
<>
{ this._renderDocuments(documents.upd, 'upd') }
{ this._renderDocuments(documents.upd_avans, 'upd_avans') }
{ this._renderDocuments(documents.billfines, 'billfines') }
{ this._renderFines(documents.fines, 'fines') }
</>
) : null }