fixed avatars and added assets

marsskop · Jun 9, 2023 · 5e6f147 · 5e6f147
1 parent 82046e2
commit 5e6f147
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 2 deletions.
diff --git a/assets/images/login.png b/assets/images/login.png
diff --git a/assets/images/register.png b/assets/images/register.png
diff --git a/assets/images/tip_waiter1.png b/assets/images/tip_waiter1.png
diff --git a/assets/images/waiter1.png b/assets/images/waiter1.png
diff --git a/tips/forms.py b/tips/forms.py
@@ -26,3 +26,4 @@ def save(self, commit=True):
 
 class TipForm(forms.Form):
     rub_amount = forms.IntegerField(label="rub_amount")
+    comment = forms.CharField(max_length=200)
diff --git a/tips/models.py b/tips/models.py
@@ -86,7 +86,7 @@ def __str__(self):
 class Transaction(models.Model):
     id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
     customer = models.ForeignKey(Customer, on_delete=models.CASCADE)  # TODO: do not delete transactions
-    waiter = models.ForeignKey(Waiter, on_delete=models.CASCADE)
+    waiter = models.ForeignKey(Waiter, on_delete=models.CASCADE)  # TODO: store addresses? in case of change
     datetime = models.DateTimeField(auto_now=True)
     amount = models.PositiveBigIntegerField()
     comment = models.CharField(max_length=200)

diff --git a/tips/templates/base.html b/tips/templates/base.html
@@ -28,7 +28,9 @@ <h1 class="title" style="color: ghostwhite;">🌿 PEKOE</h1>
                 {% if request.user.is_authenticated %}
                   <span class="navbar-item">
                     <a class="image is-32x32" href="{% url 'tips:user' user.username %}">
+                      {% if user.avatar %}
                       <img class="is-rounded" src="{{ user.avatar.url }}">
+                      {% endif %}
                     </a>
                   </span>
                   <span class="navbar-item">

diff --git a/tips/views.py b/tips/views.py
@@ -49,6 +49,7 @@ def waiterview(request, cafe_slug, waiter_username):
         form = TipForm(request.POST)
         if form.is_valid():
             rub_amount = form.cleaned_data.get('rub_amount')
+            comment = form.cleaned_data.get('comment')
             web3client = Web3Client()
             # buy rub_amount of PEKOE tokens
             buy_status = web3client.buy(request.user.customer.customer_wallet, rub_amount)
@@ -63,7 +64,7 @@ def waiterview(request, cafe_slug, waiter_username):
                 return redirect("tips:waiter", cafe_slug=cafe_slug, waiter_username=waiter_username)
             # save transaction to db
             txn = Transaction(customer=request.user.customer, waiter=waiter,
-                              amount=rub_amount, comment="")  # TODO: add comment field
+                              amount=rub_amount, comment=comment)
             txn.save(force_insert=True)
             # burn and mint tokens from waiter
             fiat_status = web3client.exchange_fiat(waiter.waiter_wallet,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -26,3 +26,4 @@ def save(self, commit=True):

		class TipForm(forms.Form):
		rub_amount = forms.IntegerField(label="rub_amount")
		comment = forms.CharField(max_length=200)