From 3d778df3d5bb0c1b2e578a9ced40cebfc1b8589e Mon Sep 17 00:00:00 2001
From: W13R <9070224-W13R@users.noreply.gitlab.com>
Date: Sat, 5 Nov 2022 09:33:58 +0100
Subject: [PATCH] Removed feature: register balance (closes #8)

---
 application/app/admin.py                   |  3 ---
 application/app/models.py                  | 12 +-----------
 application/app/templates/admin/index.html |  1 -
 lib/upgrade-db.py                          |  5 +----
 lib/verify-db-app-version.py               |  1 -
 5 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/application/app/admin.py b/application/app/admin.py
index e72e506..4234240 100644
--- a/application/app/admin.py
+++ b/application/app/admin.py
@@ -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 {})
         })
diff --git a/application/app/models.py b/application/app/models.py
index b92672c..3e71331 100644
--- a/application/app/models.py
+++ b/application/app/models.py
@@ -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
diff --git a/application/app/templates/admin/index.html b/application/app/templates/admin/index.html
index 4e90d29..118829a 100644
--- a/application/app/templates/admin/index.html
+++ b/application/app/templates/admin/index.html
@@ -6,7 +6,6 @@
 
     <div>
         <div>
-            <p>Current Register Balance: {{ registerBalance }}{{ currency_suffix }}</p>
             {% if global_message != "" %}
                 <p>Global Message: {{ global_message }}</p>
             {% endif %}
diff --git a/lib/upgrade-db.py b/lib/upgrade-db.py
index b773ac2..2bc239c 100644
--- a/lib/upgrade-db.py
+++ b/lib/upgrade-db.py
@@ -59,10 +59,7 @@ if __name__ == "__main__":
 
         # # # # #
 
-        execute_sql_statement(cur, conn, """
-            insert into app_global
-            values ('register_balance', 'This is the current balance of the register.', 0.0, '');
-        """)
+        log("Not deleting register_balance. You can delete it via the Admin Panel (Globals -> register_balance), as it is no more used.")
 
         execute_sql_statement(cur, conn, """
             insert into app_global
diff --git a/lib/verify-db-app-version.py b/lib/verify-db-app-version.py
index 4367f32..92a7627 100644
--- a/lib/verify-db-app-version.py
+++ b/lib/verify-db-app-version.py
@@ -63,7 +63,6 @@ def check_database():
 
         required_rows = [
             "global_message",
-            "register_balance",
             "admin_info"
         ]