From 54cbda55e02c4282cdaf0689bfc279f291ab7ee3 Mon Sep 17 00:00:00 2001 From: Martin Quarda Date: Thu, 22 Aug 2024 15:30:47 +0200 Subject: [PATCH] add price to user --- alkatorapi/migrations/0015_user_price.py | 18 ++++++++++++++++++ alkatorapi/models.py | 1 + alkatorapi/templates/invoice.html | 4 ++-- alkatorapi/views.py | 11 ++++++----- 4 files changed, 27 insertions(+), 7 deletions(-) create mode 100644 alkatorapi/migrations/0015_user_price.py diff --git a/alkatorapi/migrations/0015_user_price.py b/alkatorapi/migrations/0015_user_price.py new file mode 100644 index 0000000..3e4a3e7 --- /dev/null +++ b/alkatorapi/migrations/0015_user_price.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.12 on 2024-08-22 13:29 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('alkatorapi', '0014_user_invoice_id'), + ] + + operations = [ + migrations.AddField( + model_name='user', + name='price', + field=models.IntegerField(default=690), + ), + ] diff --git a/alkatorapi/models.py b/alkatorapi/models.py index ad27b25..e1289c2 100644 --- a/alkatorapi/models.py +++ b/alkatorapi/models.py @@ -35,6 +35,7 @@ class User(models.Model): alkator_category = models.IntegerField(choices=ALKATOR_CHOICES, default=1) alkator_class = models.IntegerField(choices=ALKATOR_CLASSES) trans_id = models.CharField(null=True, blank=True, max_length=120) + price = models.IntegerField(default=690) paid = models.BooleanField(default=False) invoice_id = models.IntegerField(null=True, blank=True, unique=True) diff --git a/alkatorapi/templates/invoice.html b/alkatorapi/templates/invoice.html index 519a256..d081e8b 100644 --- a/alkatorapi/templates/invoice.html +++ b/alkatorapi/templates/invoice.html @@ -217,9 +217,9 @@ 1 - 690,00 Kč + {{user.price}},00 Kč - 690,00 Kč + {{user.price}},00 Kč diff --git a/alkatorapi/views.py b/alkatorapi/views.py index b44bf50..1cdca50 100644 --- a/alkatorapi/views.py +++ b/alkatorapi/views.py @@ -59,6 +59,11 @@ def register(request): except User.DoesNotExist: invoice_id = invoice_id + 1 + if date.today() >= date(2024, 9, 21): + price = 79000 + else: + price = 69000 + user = User( first_name=request.POST['first_name'], last_name=request.POST['last_name'], @@ -68,14 +73,10 @@ def register(request): phone=request.POST['phone'], alkator_class=ALKATOR_CLASS, invoice_id=invoice_id, + price=price//100 ) user.save() - if date.today() >= date(2024, 9, 21): - price = 79000 - else: - price = 69000 - payment_data = { 'merchant': COMGATE_MERCHANT, 'test': 'true' if COMGATE_TEST else 'false',