Removed feature: register balance (closes #8)

This commit is contained in:
W13R 2022-11-05 09:33:58 +01:00
parent 8599f49857
commit 3d778df3d5
5 changed files with 2 additions and 20 deletions

View file

@ -26,9 +26,6 @@ class CustomAdminSite(admin.AdminSite):
def index(self, request, extra_context=None):
return super().index(request, extra_context={
"registerBalance": "{:10.2f}".format(
Global.objects.get(name="register_balance").value_float
),
"admin_info": Global.objects.get(name="admin_info").value_string,
**(extra_context or {})
})

View file

@ -7,13 +7,6 @@ from django.forms import ValidationError
from django.utils import timezone
# helper
def make_register_transaction(transaction_sum:float):
regbalance = Global.objects.get(name="register_balance")
regbalance.value_float += float(round(float(transaction_sum), 2))
regbalance.save()
# Custom user model
class User(AbstractUser):
@ -61,7 +54,7 @@ class RegisterTransaction(models.Model):
class Meta:
verbose_name = "register transaction"
verbose_name_plural = "register"
transaction_sum = models.DecimalField(max_digits=6, decimal_places=2, default=0.00)
# the following original_transaction_sum is needed when need to be
# updated, but the old value needs to be known (field is hidden)
@ -73,7 +66,6 @@ class RegisterTransaction(models.Model):
def save(self, *args, **kwargs):
if self._state.adding:
make_register_transaction(self.transaction_sum)
if self.is_user_deposit == True: # update user balance
self.user.balance += self.transaction_sum
self.user.save()
@ -82,7 +74,6 @@ class RegisterTransaction(models.Model):
else:
# update register transaction
sum_diff = self.transaction_sum - self.old_transaction_sum
make_register_transaction(sum_diff)
# update user balance
if self.is_user_deposit == True:
ub_sum_diff = self.transaction_sum - self.old_transaction_sum
@ -92,7 +83,6 @@ class RegisterTransaction(models.Model):
super().save(*args, **kwargs)
def delete(self, *args, **kwargs):
make_register_transaction(-self.transaction_sum)
# update user deposit
if self.is_user_deposit:
self.user.balance -= self.transaction_sum

View file

@ -6,7 +6,6 @@
<div>
<div>
<p>Current Register Balance: {{ registerBalance }}{{ currency_suffix }}</p>
{% if global_message != "" %}
<p>Global Message: {{ global_message }}</p>
{% endif %}