не начисляются бонусы за вторую покуппку

remotes/origin/hotfix/paid-more-bonuses-1-07-19
gzbender 7 years ago
parent ecda8f8eb6
commit 0e35330cb3
  1. 3
      apps/payment/admin.py
  2. 3
      apps/payment/models.py
  3. 2
      apps/school/templates/drawing_camp/promo.html
  4. 11
      apps/school/templates/drawing_camp/schedule_purchased.html
  5. 6
      apps/school/views.py

@ -28,11 +28,10 @@ class PaymentChildAdmin(PolymorphicChildModelAdmin):
'user',
'amount',
'status',
'roistat_visit',
'created_at',
)
base_fieldsets = (
(None, {'fields': ('user', 'amount', 'status', 'data', 'roistat_visit',)}),
(None, {'fields': ('user', 'amount', 'status', 'data',)}),
)
readonly_fields = ('amount', 'data',)

@ -115,7 +115,8 @@ class Payment(PolymorphicModel):
roistat_visit = models.PositiveIntegerField('Номер визита Roistat', null=True, editable=False)
created_at = models.DateTimeField(auto_now_add=True)
update_at = models.DateTimeField(auto_now=True)
bonus = models.ForeignKey('payment.UserBonus', null=True, on_delete=models.SET_NULL, related_name='purchase_payments')
bonus = models.ForeignKey('payment.UserBonus', blank=True, null=True, on_delete=models.SET_NULL,
related_name='purchase_payments')
objects = PaymentManger()

@ -14,7 +14,7 @@
class="main__btn btn"
href="#"
>
{% if not is_purchased and not is_purchased_future %}Купить доступ за {{ drawing_camp_price }} руб./месяц{% endif %}
{% if not is_purchased and not is_purchased_future %}Узнать цену{% endif %}
{% if is_purchased_future and not is_purchased %}ваша подписка начинается {{school_purchased_future.date_start}}{% endif %}
{% if is_purchased %}ваша подписка истекает {{ subscription_ends_humanize }}<br/>перейти к оплате{% endif %}
</a>

@ -8,17 +8,6 @@
<div class="title title_sm title_center">
Начнется через {{ next_lesson_start }}
</div>
{% if not is_purchased_future %}
<div class="title title_sm title_center">
<a
data-popup=".js-popup-buy"
data-is-camp="1"
class="btn"
href="#"
>Присоединиться на июль</a>
</div>
{% endif %}
</div>
</div>
{% endif %}

@ -336,11 +336,7 @@ class DrawingCampView(TemplateView):
date_start__lte=prev_range[1],
date_end__gte=prev_range[0],
user=self.request.user,
status__in=[
Pingback.PINGBACK_TYPE_REGULAR,
Pingback.PINGBACK_TYPE_GOODWILL,
Pingback.PINGBACK_TYPE_RISK_REVIEWED_ACCEPTED,
],
status__in=DrawingCampPayment.PW_PAID_STATUSES,
)
# берем все подписки, которые были в периоде

Loading…
Cancel
Save