- { documents.slice(0, opened.indexOf(type) > -1 ? documents.length : 3).map((doc, index) => (
-
- )) }
+ { documents.slice(0, opened.indexOf(type) > -1 ? documents.length : 3).map((doc, index) =>
+ {
+ console.log("doc", doc);
+ return (
+
+ )
+ }) }
{ opened.indexOf(type) < 0 && documents.length > 3 && (
this._handle_onGroup(type) }>
Еще { documents.length - 3 } { pluralize((documents.length - 3), 'документов', 'документ', 'документа', 'документов') }
@@ -231,7 +230,7 @@ class ContractDocumentsPage extends React.Component
)
}
- if(type !== "upd_avans")
+ if(type !== "upd_avans" && type !== "billfines")
{
return (
<>
@@ -275,7 +274,7 @@ class ContractDocumentsPage extends React.Component
№ постановления: { fine.fine_number }
- - Сумма: { numeral(fine.amount).format(' ., ') } ₽
+ - Сумма: { numeral(fine.amount).format(' ., ') } ₽
- Дата: { moment(fine.fine_date).format("DD.MM.YYYY") }
- Статус: { fine.status }
- Штраф: { fine.fine_title }
@@ -340,7 +339,7 @@ class ContractDocumentsPage extends React.Component
Договор №{ number }
- { date !== undefined && date !== null && date !== null && (<> от { moment(date).format("DD.MM.YYYY") })}{ car !== undefined && car !== null ? ` - ${ car.brand.name } ${ car.model.name } | ${ car.reg_number !== null ? car.reg_number : 'без рег. номера' } | ${ car.vin_number }` : '' }
+ { date !== undefined && date !== null && date !== null && (<> от { moment(date).format("DD.MM.YYYY") })}{ car !== undefined && car !== null ? ` - ${ car.brand.name } ${ car.model.name } | ${ car.reg_number !== null ? car.reg_number : 'без рег. номера' } | ${ car.vin_number !== null ? car.vin_number : 'без VIN номера' }` : '' }
diff --git a/pages/contract/index.js b/pages/contract/index.js
index 24bcb1f..f72ca4e 100644
--- a/pages/contract/index.js
+++ b/pages/contract/index.js
@@ -24,6 +24,7 @@ class ContractSchedulePage extends React.Component
this.state = {
loading: false,
payments: null,
+ avans: null,
date: null,
car: null,
full: false,
@@ -37,6 +38,7 @@ class ContractSchedulePage extends React.Component
date: nextProps.date,
car: nextProps.car,
payments: nextProps.payments,
+ avans: nextProps.avans,
};
}
@@ -90,12 +92,14 @@ class ContractSchedulePage extends React.Component
render()
{
- const { payments, date, car, full, opened, loading } = this.state;
+ const { payments, avans, date, car, full, opened, loading } = this.state;
const { number } = this.props;
console.log("RENDER", "payments");
console.log(payments);
+ console.log("avans", avans);
+
const statuses = {
"NotPaid": "",
"HalfPaid": "overpayment-1",
@@ -122,13 +126,14 @@ class ContractSchedulePage extends React.Component
Договор №{ number }
- { date !== undefined && date !== null && date !== null && (<> от { moment(date).format("DD.MM.YYYY") })}{ car !== undefined && car !== null ? ` - ${ car.brand.name } ${ car.model.name } | ${ car.reg_number !== null ? car.reg_number : 'без рег. номера' } | ${ car.vin_number }` : '' }
+ { date !== undefined && date !== null && date !== null && (<> от { moment(date).format("DD.MM.YYYY") })}{ car !== undefined && car !== null ? ` - ${ car.brand.name } ${ car.model.name } | ${ car.reg_number !== null ? car.reg_number : 'без рег. номера' } | ${ car.vin_number !== null ? car.vin_number : 'без VIN номера' }` : '' }
+ Сумма авансовых поступлений по договору: { numeral(avans).format(' ., ') } ₽
№ платежа
@@ -147,36 +152,36 @@ class ContractSchedulePage extends React.Component
{ !full && (
) }
- { payments !== null && Object.values(payments).map((payment, index) =>
+ { payments !== undefined && payments !== null && Object.values(payments).map((payment, index) =>
{
let pd = moment(payment.date, "DD-MM-YYYY");
if(!full && pd < last_pay_date) { return null; }
return (
-
-1 ? "opened" : "" }` } data-status={ payment.status === "NotPaid" && pd < today ? "notpaid" : statuses[payment.status] } key={ index }>
+
-1 ? "opened" : "" }` } data-status={ payment.status === "NotPaid" && pd < today ? "notpaid" : statuses[payment.status] } key={ index } onClick={ () => this._handle_onSetOpen(payment.number) }>
{ payment.number }
{ moment(payment.date, "DD-MM-YYYY").format("DD.MM.YYYY") }
-
{ numeral(payment.total_amount).format(' ., ') } ₽
-
{ numeral(payment.vat_amount).format(' ., ') } ₽
+
{ numeral(payment.total_amount).format(' ., ') } ₽
+
{ numeral(payment.vat_amount).format(' ., ') } ₽
{ payment.status === "Paid" && "Оплачено" }
{ payment.status === "NotPaid" && "Не оплачено" }
{ payment.status === "HalfPaid" && (
- <>Недоплата
{ numeral(payment.total_amount - payment.paid_amount).format(' ., ') } ₽
+ <>Недоплата
{ numeral(payment.total_amount - payment.paid_amount).format(' ., ') } ₽
) }
{ payment.status === "OverPaid" && (
- <>Переплата { numeral(payment.total_amount).format(' ., ') } ₽
+ <>Переплата { numeral(payment.total_amount).format(' ., ') } ₽
) }
- { payment.invoices.map((invoice, invoice_index) =>
+ { payment.invoices !== undefined && payment.invoices.map((invoice, invoice_index) =>
(
- №{ invoice.number } от { moment(invoice.date, "DD-MM-YYYY").format("DD.MM.YYYY") } на сумму { numeral(invoice.total_amount).format(' ., ') } ₽
+ №{ invoice.number } от { moment(invoice.date, "DD-MM-YYYY").format("DD.MM.YYYY") } на сумму { numeral(invoice.total_amount).format(' ., ') } ₽
)) }
-
+
)
}) }
@@ -242,6 +247,7 @@ function mapStateToProps(state, ownProps)
return {
company: state.company,
payments: state.contract.payments,
+ avans: state.contract.avans,
date: state.contract.date,
car: state.contract.car,
//schedule: state.payments,
diff --git a/pages/contract/services.js b/pages/contract/services.js
index fe05163..2788a34 100644
--- a/pages/contract/services.js
+++ b/pages/contract/services.js
@@ -104,7 +104,7 @@ class ContractServicesPage extends React.Component
Договор №{ number }
- { date !== undefined && date !== null && date !== null && (<> от { moment(date).format("DD.MM.YYYY") })}{ car !== undefined && car !== null ? ` - ${ car.brand.name } ${ car.model.name } | ${ car.reg_number !== null ? car.reg_number : 'без рег. номера' } | ${ car.vin_number }` : '' }
+ { date !== undefined && date !== null && date !== null && (<> от { moment(date).format("DD.MM.YYYY") })}{ car !== undefined && car !== null ? ` - ${ car.brand.name } ${ car.model.name } | ${ car.reg_number !== null ? car.reg_number : 'без рег. номера' } | ${ car.vin_number !== null ? car.vin_number : 'без VIN номера' }` : '' }
@@ -176,7 +176,7 @@ class ContractServicesPage extends React.Component
{ entry.phone && (
- Телефон: { entry.phone }
) }
{ entry.number && (
- Номер полиса: { entry.number }
) }
{ entry.period && (
- Период действия: { entry.period }
) }
- { entry.amount && (
- Страховая сумма: { numeral(entry.amount).format(' ., ') } ₽
) }
+ { entry.amount && (
- Страховая сумма: { numeral(entry.amount).format(' ., ') } ₽
) }
{ entry.description && (
{ entry.description }
) }
@@ -192,7 +192,7 @@ class ContractServicesPage extends React.Component
{ entry.phone && (
- Телефон: { entry.phone }
) }
{ entry.number && (
- Номер полиса: { entry.number }
) }
{ entry.period && (
- Период действия: { entry.period }
) }
- { entry.amount && (
- Страховая сумма: { numeral(entry.amount).format(' ., ') } ₽
) }
+ { entry.amount && (
- Страховая сумма: { numeral(entry.amount).format(' ., ') } ₽
) }
{ entry.description && (
{ entry.description }
) }
@@ -208,7 +208,7 @@ class ContractServicesPage extends React.Component
{ entry.phone && (
- Телефон: { entry.phone }
) }
{ entry.number && (
- Номер полиса: { entry.number }
) }
{ entry.period && (
- Период действия: { entry.period }
) }
- { entry.amount && (
- Страховая сумма: { numeral(entry.amount).format(' ., ') } ₽
) }
+ { entry.amount && (
- Страховая сумма: { numeral(entry.amount).format(' ., ') } ₽
) }
{ entry.description && ({ entry.description }
) }
@@ -238,7 +238,7 @@ class ContractServicesPage extends React.Component
- Пакет услуг: { entry.package }
) }
{ entry.amount && (
- - Стоимость: { numeral(entry.amount).format(' ., ') } ₽
+ - Стоимость: { numeral(entry.amount).format(' ., ') } ₽
) }
@@ -267,7 +267,7 @@ class ContractServicesPage extends React.Component
- Оборудование: { entry.equipment }
) }
{ entry.amount && (
- - Стоимость: { numeral(entry.amount).format(' ., ') } ₽
+ - Стоимость: { numeral(entry.amount).format(' ., ') } ₽
) }
diff --git a/pages/documents/calendar.js b/pages/documents/calendar.js
index b871019..a25109a 100644
--- a/pages/documents/calendar.js
+++ b/pages/documents/calendar.js
@@ -284,12 +284,12 @@ class CalendarPage extends React.Component
return (
this._handle_onDayClick(day) }>
-
{ day.date.format("DD") } { day.date.format("MMM").toLocaleLowerCase() } { day.date.format("Y").toLocaleLowerCase() }
+
{ day.date.format("DD") } { day.date.format("MMM").toLocaleLowerCase() } { day.date.format("Y").toLocaleLowerCase() }
{ day.payment && (
Общий платеж
- 1000000 ? { fontSize: '14px', whiteSpace: "nowrap" } : {}}>{ numeral(day.payment.total).format(' ., ') } ₽
+ 1000000 ? { fontSize: '14px', whiteSpace: "nowrap" } : { whiteSpace: "nowrap" }}>{ numeral(day.payment.total).format(' ., ') } ₽
)}
@@ -299,7 +299,7 @@ class CalendarPage extends React.Component
return (
-
{ day.date.format("DD") } { day.date.format("MMM").toLocaleLowerCase() } { day.date.format("Y").toLocaleLowerCase() }
+
{ day.date.format("DD") } { day.date.format("MMM").toLocaleLowerCase() } { day.date.format("Y").toLocaleLowerCase() }
)
diff --git a/pages/documents/components/InnerMenu/index.js b/pages/documents/components/InnerMenu/index.js
index a0b742f..14e9a0f 100644
--- a/pages/documents/components/InnerMenu/index.js
+++ b/pages/documents/components/InnerMenu/index.js
@@ -12,37 +12,54 @@ export default class InnerMenu extends React.Component
constructor(props)
{
super(props);
- this.menuList = React.createRef();
- menu.forEach(item => {
+ this.menuRef = React.createRef();
+
+ menu.forEach(item =>
+ {
this[item.id] = React.createRef();
});
}
- componentDidMount() {
+ componentDidMount()
+ {
+ let l = 0;
+ let m = 0;
+ for(let i in menu)
+ {
+ if(this.props.router.asPath.indexOf(menu[i].link) > -1)
+ {
+ m = i;
+ }
+ }
+
+ for(let i = 0; i < m; i++)
+ {
+ l = l + this.menuRef.current.children[i].getBoundingClientRect().width;
+ }
+
+ this.menuRef.current.scrollLeft = l - 50;
}
scrollToCategory = id => {
- };
+ };
render()
{
-
return (
)
diff --git a/pages/documents/reconciliations.js b/pages/documents/reconciliations.js
index 8fc1dc2..5afa419 100644
--- a/pages/documents/reconciliations.js
+++ b/pages/documents/reconciliations.js
@@ -110,26 +110,20 @@ class ReconciliationsPage extends React.Component
if(md.isValid())
{
- console.log(md);
- console.log("vs", valid_date_start);
- console.log("ve", valid_date_end);
-
- if(date >= valid_date_start && date < valid_date_end)
+ if(date >= valid_date_start && date <= valid_date_end)
{
- console.log("ps", period_date_start);
if(date < period_date_end)
{
- console.log(">>>>>");
this.setState({ period_date_start: date, reconciliation_disabled: false });
}
else
{
- this.setState({ reconciliation_disabled: true });
+ this.setState({ period_date_start: date, reconciliation_disabled: true });
}
}
else
{
- this.setState({ reconciliation_disabled: true });
+ this.setState({ period_date_start: date, reconciliation_disabled: true });
}
}
else
@@ -145,7 +139,7 @@ class ReconciliationsPage extends React.Component
if(moment(date).isValid())
{
- if(date >= valid_date_start && date < valid_date_end)
+ if(date >= valid_date_start && date <= valid_date_end)
{
if(date > period_date_start)
{
@@ -153,12 +147,12 @@ class ReconciliationsPage extends React.Component
}
else
{
- this.setState({ reconciliation_disabled: true });
+ this.setState({ period_date_end: date, reconciliation_disabled: true });
}
}
else
{
- this.setState({ reconciliation_disabled: true });
+ this.setState({ period_date_end: date, reconciliation_disabled: true });
}
}
else
diff --git a/pages/index.js b/pages/index.js
index 75c1917..062b1ab 100644
--- a/pages/index.js
+++ b/pages/index.js
@@ -227,7 +227,7 @@ class IndexPage extends React.Component
{ contract.current_payment_date !== null ? (
- <>{ moment(contract.current_payment_date).format("DD.MM.YYYY") }{ numeral(contract.current_payment_amount).format(' ., ') } ₽
+ <>{ moment(contract.current_payment_date).format("DD.MM.YYYY") }{ numeral(contract.current_payment_amount).format(' ., ') } ₽
) : "-" }
diff --git a/pages/login.js b/pages/login.js
index 3efd6af..82b9145 100644
--- a/pages/login.js
+++ b/pages/login.js
@@ -5,6 +5,7 @@ import { connect } from "react-redux";
import { withRouter } from 'next/router';
import { reduxWrapper } from '../store';
import pluralize from 'pluralize-ru';
+import { SpinnerCircular } from 'spinners-react';
import Header from './components/Header';
import Footer from './components/Footer';
@@ -35,6 +36,9 @@ class LoginPage extends React.Component
phone_code_resend_disabled: true,
phone_sms_code_error: false,
timer: 0,
+ email_auth_loading: false,
+ phone_check_loading: false,
+ code_check_loading: false,
};
this.timer_ref = null;
@@ -51,61 +55,82 @@ class LoginPage extends React.Component
{
event.preventDefault();
- const { email, password, } = this.state;
- sendLoginFormEmail({ email, password, dispatch: this.props.dispatch })
- .then(() =>
- {
+ const { email, password, email_auth_loading } = this.state;
- })
- .catch(() =>
+ if(!email_auth_loading)
{
- this.setState({ email_error: true });
- });
+ this.setState({ email_auth_loading: true }, () =>
+ {
+ sendLoginFormEmail({ email, password, dispatch: this.props.dispatch })
+ .then(() =>
+ {
+ //this.setState({ email_auth_loading: false, });
+ })
+ .catch(() =>
+ {
+ this.setState({ email_error: true, email_auth_loading: false });
+ });
+ });
+ }
}
_handle_onPhoneSubmit = (event) =>
{
event.preventDefault();
- const { phone, } = this.state;
- sendLoginFormPhone({ phone })
- .then(() =>
+ const { phone, phone_check_loading } = this.state;
+
+ if(!phone_check_loading)
{
- this.setState({ phone_number_error: false, timer: 60, phone_form_step: 2, }, () =>
+ this.setState({ phone_check_loading: true }, () =>
{
- this.timer_ref = setInterval(() =>
+ sendLoginFormPhone({ phone })
+ .then(() =>
{
- const t = this.state.timer - 1;
- this.setState({ timer: t }, () =>
+ this.setState({ phone_check_loading: false, phone_number_error: false, timer: 60, phone_form_step: 2, }, () =>
{
- if(t === 0)
+ this.timer_ref = setInterval(() =>
{
- clearInterval(this.timer_ref);
- }
+ const t = this.state.timer - 1;
+ this.setState({ timer: t, }, () =>
+ {
+ if(t === 0)
+ {
+ clearInterval(this.timer_ref);
+ }
+ });
+ }, 1000);
});
- }, 1000);
+ })
+ .catch(() =>
+ {
+ this.setState({ phone_number_error: true, phone_check_loading: false });
+ });
});
- })
- .catch(() =>
- {
- this.setState({ phone_number_error: true });
- });
+ }
}
_handle_onCodeSubmit = (event) =>
{
event.preventDefault();
- const { phone, phone_code } = this.state;
- sendSmsCode({ dispatch: this.props.dispatch, phone, code: phone_code })
- .then(() =>
+ const { phone, phone_code, code_check_loading } = this.state;
+
+ if(!code_check_loading)
{
- this.setState({ phone_sms_code_error: false });
- })
- .catch(() =>
- {
- this.setState({ phone_sms_code_error: true });
- });
+ this.setState({ code_check_loading: true }, () =>
+ {
+ sendSmsCode({ dispatch: this.props.dispatch, phone, code: phone_code })
+ .then(() =>
+ {
+ this.setState({ phone_sms_code_error: false, code_check_loading: false });
+ })
+ .catch(() =>
+ {
+ this.setState({ phone_sms_code_error: true, code_check_loading: false });
+ });
+ });
+ }
}
_handle_onResendCode = (event) =>
@@ -123,22 +148,22 @@ class LoginPage extends React.Component
_handle_onEmailChange = (value) =>
{
- this.setState({ email: value, email_login_disabled: this._check_fields_disabled([ value, this.state.password ]) });
+ this.setState({ email: value, email_login_disabled: this._check_fields_disabled([ value, this.state.password ]), email_error: false });
}
_handle_onPasswordChange = (value) =>
{
- this.setState({ password: value, email_login_disabled: this._check_fields_disabled([ value, this.state.email ]) });
+ this.setState({ password: value, email_login_disabled: this._check_fields_disabled([ value, this.state.email ]), email_error: false });
}
_handle_onPhoneChange = (value) =>
{
- this.setState({ phone: value, phone_login_disabled: this._check_fields_disabled([ value ]) });
+ this.setState({ phone: value, phone_login_disabled: this._check_fields_disabled([ value ]), phone_number_error: false });
}
_handle_onPhoneCodeChange = (value) =>
{
- this.setState({ phone_code: value, phone_code_submit_disabled: this._check_fields_disabled([ value ]) });
+ this.setState({ phone_code: value, phone_code_submit_disabled: this._check_fields_disabled([ value ]), phone_sms_code_error: false });
}
_check_fields_disabled = (values) =>
@@ -156,7 +181,9 @@ class LoginPage extends React.Component
render()
{
- const { email, password, phone, phone_code, tab, email_error, phone_number_error, phone_code_error, email_login_disabled, phone_login_disabled, phone_form_step, phone_code_submit_disabled, phone_code_resend_disabled, timer, phone_sms_code_error } = this.state;
+ const { email, password, phone, phone_code, tab, email_error, phone_number_error, phone_code_error,
+ email_login_disabled, phone_login_disabled, phone_form_step, phone_code_submit_disabled, phone_code_resend_disabled,
+ timer, phone_sms_code_error, email_auth_loading, phone_check_loading, code_check_loading } = this.state;
return (
@@ -189,7 +216,11 @@ class LoginPage extends React.Component
this._handle_onPasswordChange(event.target.value) } required={ true }/>
-
+
{ email_error ? 'Ошибка: Неверный логин или пароль' : `\u00A0` }
) : (
@@ -200,7 +231,11 @@ class LoginPage extends React.Component
this._handle_onPhoneChange(event.target.value) } required={ true }/>
-
+
{ phone_number_error ? 'Ошибка: нет аккаунта с таким номером телефона' : `\u00A0` }
@@ -212,7 +247,11 @@ class LoginPage extends React.Component
this._handle_onPhoneCodeChange(event.target.value) } />
-
+
{ timer !== 0 ? (
diff --git a/public/assets/images/icons/icon-file.svg b/public/assets/images/icons/icon-file.svg
new file mode 100644
index 0000000..baff826
--- /dev/null
+++ b/public/assets/images/icons/icon-file.svg
@@ -0,0 +1,5 @@
+
diff --git a/public/assets/images/icons/logout.svg b/public/assets/images/icons/logout.svg
new file mode 100644
index 0000000..cb471b7
--- /dev/null
+++ b/public/assets/images/icons/logout.svg
@@ -0,0 +1,5 @@
+
diff --git a/reducers/contractReducer.js b/reducers/contractReducer.js
index fdec0f1..6552cdd 100644
--- a/reducers/contractReducer.js
+++ b/reducers/contractReducer.js
@@ -28,6 +28,7 @@ const contractReducer = (state = initialState.contract, action) =>
return {
...state,
payments: action.data.payments,
+ avans: action.data.avans,
};
}
diff --git a/reducers/initialState.js b/reducers/initialState.js
index aa7f177..c2f0006 100644
--- a/reducers/initialState.js
+++ b/reducers/initialState.js
@@ -22,6 +22,7 @@ export const defaultState = {
},
contract: {
payments: null,
+ avans: null,
date: null,
car: null,
insurance: null,