LIL-270. Update user payment page

apps/payment/migrations/0008_auto_20180221_1335.py

@@ -0,0 +1,20 @@
+# Generated by Django 2.0.2 on 2018-02-21 13:35
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('payment', '0007_auto_20180221_1258'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='payment',
+            name='user',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='payments', to=settings.AUTH_USER_MODEL, verbose_name='Пользователь'),
+        ),
+    ]

apps/payment/models.py

@@ -46,7 +46,7 @@ class Payment(PolymorphicModel):
         (Pingback.PINGBACK_TYPE_SUBSCRIPTION_EXPIRED, 'subscription expired',),
         (Pingback.PINGBACK_TYPE_SUBSCRIPTION_PAYMENT_FAILED, 'subscription payment failed',),
     )
-    user = models.ForeignKey(User, on_delete=models.CASCADE, verbose_name='Пользователь')
+    user = models.ForeignKey(User, on_delete=models.CASCADE, verbose_name='Пользователь', related_name='payments')
     amount = models.DecimalField('Итого', max_digits=8, decimal_places=2, default=0, editable=False)
     status = models.PositiveSmallIntegerField('Статус платежа', choices=PW_STATUS_CHOICES, null=True, editable=False)
     data = JSONField('Данные платежа от провайдера', default={}, editable=False)

apps/user/templates/user/payment-history.html

@@ -27,11 +27,11 @@
     <div class="title title_sm">Вывести деньги со счета</div>
     <div class="form">
       <div class="form__group">
-        <div class="form__content">На вашем счету 20. 123 рублей</div>
+        <div class="form__content">На вашем счету {{ request.user.balance }} руб.</div>
         <div class="form__field field">
           <div class="field__label">СУММА</div>
           <div class="field__wrap">
-            <input class="field__input" type="text" placeholder="12. 000">
+            <input class="field__input" type="text" placeholder="{{ request.user.balance }}">
           </div>
           <div class="field__error">Размер выводимой суммы не должно быть менее 2000 рублей.</div>
         </div>
@@ -58,21 +58,22 @@
     <div class="title title_sm">История платежей</div>
     <div class="transactions">
       <div class="transactions__wrap">
+        {% if request.user.role == 1 or request.user.role == 2 %}
+        {% for balance in request.user.balances.all %}
         <div class="transactions__row">
-          <div class="transactions__cell">Ноябрь. Школа Lil City</div>
-          <div class="transactions__cell">2000.00</div>
+          <div class="transactions__cell">{{balance.payment.course.title}}</div>
+          <div class="transactions__cell">{{balance.amount}}</div>
           <div class="transactions__cell">Получено</div>
         </div>
+        {% endfor %}
+        {% for payment in request.user.payments.all %}
         <div class="transactions__row">
-          <div class="transactions__cell">Общий курс по иллюстрации</div>
-          <div class="transactions__cell">2000.00</div>
-          <div class="transactions__cell">Получено</div>
-        </div>
-        <div class="transactions__row">
-          <div class="transactions__cell">Ноябрь. Школа Lil City</div>
-          <div class="transactions__cell">2000.00</div>
+          <div class="transactions__cell">{{payment.course.title}}</div>
+          <div class="transactions__cell">{{payment.amount}}</div>
           <div class="transactions__cell">Получено</div>
         </div>
+        {% endfor %}
+        {% else %}
       </div>
       <div class="transactions__load load">
         <button class="load__btn btn">еще</button>
@@ -80,4 +81,4 @@
     </div>
   </div>
 </div>
-{% endblock content %}
+{% endblock content %}