diff --git a/apps/user/templates/user/payment-history.html b/apps/user/templates/user/payment-history.html index de91e85b..f96b20fb 100644 --- a/apps/user/templates/user/payment-history.html +++ b/apps/user/templates/user/payment-history.html @@ -75,50 +75,61 @@
История платежей
- {% for payment in request.user.payments.all %} -
- {% if payment.course %} -
Курс. {{payment.course.title}}
- {% else %} -
- Школа. {% if payment.date_start and payment.date_end %}{{ payment.date_start }} - {{ payment.date_end }}{% endif %} - {{ payment }} -
- {% endif %} - {% if payment.balance %} -
{{payment.balance.amount}}
- {% else %} -
{{payment.amount}}
- {% endif %} - {% if payment.balance.type == 1 %} -
- {% if payment.balance.status == 0 %} - Ожидается подтверждение выплаты - {% elif payment.balance.status == 1 %} - Выплачено + {% if request.user.payments.all|length %} + {% for payment in request.user.payments.all %} +
+ {% if payment.course %} +
Курс. {{payment.course.title}}
{% else %} - Выплата отменена - Причина: "{{ payment.balance.cause }} +
+ Школа. {% if payment.date_start and payment.date_end %}{{ payment.date_start }} - {{ payment.date_end }}{% endif %} + {{ payment }} +
{% endif %} -
- {% else %} -
- {% if payment.is_deliverable %} - Получено - {% elif payment.is_under_review %} - Ожидается подтверждение оплаты + {% if payment.balance %} +
{{payment.balance.amount}}
+ {% else %} +
{{payment.amount}}
+ {% endif %} + {% if payment.balance.type == 1 %} +
+ {% if payment.balance.status == 0 %} + Ожидается подтверждение выплаты + {% elif payment.balance.status == 1 %} + Выплачено + {% else %} + Выплата отменена + Причина: "{{ payment.balance.cause }} + {% endif %} +
{% else %} - Ошибка оплаты +
+ {% if payment.is_deliverable %} + Получено + {% elif payment.is_under_review %} + Ожидается подтверждение оплаты + {% else %} + Ошибка оплаты + {% endif %} +
{% endif %}
- {% endif %} -
- {% endfor %} -
-
- + {% endfor %} + {% else %} + Оплат еще не было + {% endif %}
+ + +
+ {% endblock content %} + +{% block foot %} + +{% endblock foot %} \ No newline at end of file diff --git a/web/package-lock.json b/web/package-lock.json index 17fe64e6..c98f2720 100755 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -6161,6 +6161,11 @@ "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", "dev": true }, + "inputmask": { + "version": "3.3.11", + "resolved": "https://registry.npmjs.org/inputmask/-/inputmask-3.3.11.tgz", + "integrity": "sha1-FCHJSuKMPc0bTSYze1CLs0mY4tg=" + }, "interpret": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz", diff --git a/web/package.json b/web/package.json index ad25f0bd..96794b84 100755 --- a/web/package.json +++ b/web/package.json @@ -57,6 +57,7 @@ "babel-polyfill": "^6.26.0", "history": "^4.7.2", "ilyabirman-likely": "^2.3.0", + "inputmask": "^3.3.11", "jquery": "^3.3.1", "lodash.debounce": "^4.0.8", "moment": "^2.20.1", diff --git a/web/src/js/modules/common.js b/web/src/js/modules/common.js index 5eea0db6..ecbd4dee 100644 --- a/web/src/js/modules/common.js +++ b/web/src/js/modules/common.js @@ -1,6 +1,7 @@ import $ from 'jquery'; +import Inputmask from "inputmask"; import SmoothScroll from 'smooth-scroll/dist/js/smooth-scroll'; - +window.Inputmask = Inputmask; $(document).ready(function () { // Добавляем заголовок X-CSRFToken для всех AJAX запросов JQuery. $.ajaxSetup({ diff --git a/web/src/sass/_common.sass b/web/src/sass/_common.sass index 557e29ac..60ca347d 100755 --- a/web/src/sass/_common.sass +++ b/web/src/sass/_common.sass @@ -2875,6 +2875,12 @@ a.grey-link &__cell padding: 0 10px font-size: 13px + &__success + color: $green + &__pending + color: $gray + &__error + color: $pink &:first-child +fb font-size: 12px