style fixes, etc

remotes/origin/hasaccess
Sanasol 8 years ago
parent a031aae945
commit c6a738c786
  1. 85
      apps/user/templates/user/payment-history.html
  2. 5
      web/package-lock.json
  3. 1
      web/package.json
  4. 3
      web/src/js/modules/common.js
  5. 6
      web/src/sass/_common.sass

@ -75,50 +75,61 @@
<div class="title title_sm">История платежей</div>
<div class="transactions">
<div class="transactions__wrap">
{% for payment in request.user.payments.all %}
<div class="transactions__row">
{% if payment.course %}
<div class="transactions__cell">Курс. {{payment.course.title}}</div>
{% else %}
<div class="transactions__cell">
Школа. {% if payment.date_start and payment.date_end %}{{ payment.date_start }} - {{ payment.date_end }}{% endif %}
{{ payment }}
</div>
{% endif %}
{% if payment.balance %}
<div class="transactions__cell">{{payment.balance.amount}}</div>
{% else %}
<div class="transactions__cell">{{payment.amount}}</div>
{% endif %}
{% if payment.balance.type == 1 %}
<div class="transactions__cell">
{% if payment.balance.status == 0 %}
Ожидается подтверждение выплаты
{% elif payment.balance.status == 1 %}
Выплачено
{% if request.user.payments.all|length %}
{% for payment in request.user.payments.all %}
<div class="transactions__row">
{% if payment.course %}
<div class="transactions__cell">Курс. {{payment.course.title}}</div>
{% else %}
Выплата отменена
Причина: "{{ payment.balance.cause }}
<div class="transactions__cell">
Школа. {% if payment.date_start and payment.date_end %}{{ payment.date_start }} - {{ payment.date_end }}{% endif %}
{{ payment }}
</div>
{% endif %}
</div>
{% else %}
<div class="transactions__cell">
{% if payment.is_deliverable %}
Получено
{% elif payment.is_under_review %}
Ожидается подтверждение оплаты
{% if payment.balance %}
<div class="transactions__cell">{{payment.balance.amount}}</div>
{% else %}
<div class="transactions__cell">{{payment.amount}}</div>
{% endif %}
{% if payment.balance.type == 1 %}
<div class="transactions__cell">
{% if payment.balance.status == 0 %}
<span class="transactions__cell__pending">Ожидается подтверждение выплаты</span>
{% elif payment.balance.status == 1 %}
<span class="transactions__cell__success">Выплачено</span>
{% else %}
<span class="transactions__cell__error">Выплата отменена</span>
Причина: "{{ payment.balance.cause }}
{% endif %}
</div>
{% else %}
Ошибка оплаты
<div class="transactions__cell">
{% if payment.is_deliverable %}
<span class="transactions__cell__success">Получено</span>
{% elif payment.is_under_review %}
<span class="transactions__cell__pending">Ожидается подтверждение оплаты</span>
{% else %}
<span class="transactions__cell__error">Ошибка оплаты</span>
{% endif %}
</div>
{% endif %}
</div>
{% endif %}
</div>
{% endfor %}
</div>
<div class="transactions__load load">
<button class="load__btn btn">еще</button>
{% endfor %}
{% else %}
Оплат еще не было
{% endif %}
</div>
<!--<div class="transactions__load load">-->
<!--<button class="load__btn btn">еще</button>-->
<!--</div>-->
</div>
</div>
</div>
{% endblock content %}
{% block foot %}
<script>
(new Inputmask('9999 9999 9999 9999', {placeholder: "0"})).mask(document.querySelector('#id_card'));
</script>
{% endblock foot %}

@ -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",

@ -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",

@ -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({

@ -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

Loading…
Cancel
Save