Removed feature: register balance (closes #8)
This commit is contained in:
parent
8599f49857
commit
3d778df3d5
5 changed files with 2 additions and 20 deletions
|
@ -26,9 +26,6 @@ class CustomAdminSite(admin.AdminSite):
|
||||||
def index(self, request, extra_context=None):
|
def index(self, request, extra_context=None):
|
||||||
|
|
||||||
return super().index(request, extra_context={
|
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,
|
"admin_info": Global.objects.get(name="admin_info").value_string,
|
||||||
**(extra_context or {})
|
**(extra_context or {})
|
||||||
})
|
})
|
||||||
|
|
|
@ -7,13 +7,6 @@ from django.forms import ValidationError
|
||||||
from django.utils import timezone
|
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
|
# Custom user model
|
||||||
class User(AbstractUser):
|
class User(AbstractUser):
|
||||||
|
@ -73,7 +66,6 @@ class RegisterTransaction(models.Model):
|
||||||
|
|
||||||
def save(self, *args, **kwargs):
|
def save(self, *args, **kwargs):
|
||||||
if self._state.adding:
|
if self._state.adding:
|
||||||
make_register_transaction(self.transaction_sum)
|
|
||||||
if self.is_user_deposit == True: # update user balance
|
if self.is_user_deposit == True: # update user balance
|
||||||
self.user.balance += self.transaction_sum
|
self.user.balance += self.transaction_sum
|
||||||
self.user.save()
|
self.user.save()
|
||||||
|
@ -82,7 +74,6 @@ class RegisterTransaction(models.Model):
|
||||||
else:
|
else:
|
||||||
# update register transaction
|
# update register transaction
|
||||||
sum_diff = self.transaction_sum - self.old_transaction_sum
|
sum_diff = self.transaction_sum - self.old_transaction_sum
|
||||||
make_register_transaction(sum_diff)
|
|
||||||
# update user balance
|
# update user balance
|
||||||
if self.is_user_deposit == True:
|
if self.is_user_deposit == True:
|
||||||
ub_sum_diff = self.transaction_sum - self.old_transaction_sum
|
ub_sum_diff = self.transaction_sum - self.old_transaction_sum
|
||||||
|
@ -92,7 +83,6 @@ class RegisterTransaction(models.Model):
|
||||||
super().save(*args, **kwargs)
|
super().save(*args, **kwargs)
|
||||||
|
|
||||||
def delete(self, *args, **kwargs):
|
def delete(self, *args, **kwargs):
|
||||||
make_register_transaction(-self.transaction_sum)
|
|
||||||
# update user deposit
|
# update user deposit
|
||||||
if self.is_user_deposit:
|
if self.is_user_deposit:
|
||||||
self.user.balance -= self.transaction_sum
|
self.user.balance -= self.transaction_sum
|
||||||
|
|
|
@ -6,7 +6,6 @@
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<div>
|
<div>
|
||||||
<p>Current Register Balance: {{ registerBalance }}{{ currency_suffix }}</p>
|
|
||||||
{% if global_message != "" %}
|
{% if global_message != "" %}
|
||||||
<p>Global Message: {{ global_message }}</p>
|
<p>Global Message: {{ global_message }}</p>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
|
@ -59,10 +59,7 @@ if __name__ == "__main__":
|
||||||
|
|
||||||
# # # # #
|
# # # # #
|
||||||
|
|
||||||
execute_sql_statement(cur, conn, """
|
log("Not deleting register_balance. You can delete it via the Admin Panel (Globals -> register_balance), as it is no more used.")
|
||||||
insert into app_global
|
|
||||||
values ('register_balance', 'This is the current balance of the register.', 0.0, '');
|
|
||||||
""")
|
|
||||||
|
|
||||||
execute_sql_statement(cur, conn, """
|
execute_sql_statement(cur, conn, """
|
||||||
insert into app_global
|
insert into app_global
|
||||||
|
|
|
@ -63,7 +63,6 @@ def check_database():
|
||||||
|
|
||||||
required_rows = [
|
required_rows = [
|
||||||
"global_message",
|
"global_message",
|
||||||
"register_balance",
|
|
||||||
"admin_info"
|
"admin_info"
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue