Requested changes done

SuperCoopBerlin · Dec 10, 2024 · c3d5390 · c3d5390
1 parent 3093737
commit c3d5390
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 16 deletions.
diff --git a/tapir/accounts/templates/accounts/user_detail.html b/tapir/accounts/templates/accounts/user_detail.html
@@ -149,7 +149,9 @@ <h5 class="card-header d-flex justify-content-between align-items-center flex-wr
         <div class="col-xl-6">{% purchase_tracking_card tapir_user=object %}</div>
         {% if tapir_user.share_owner and tapir_user.allows_purchase_tracking %}
             <div class="col-xl-6">{% purchase_statistics_card tapir_user=object %}</div>
-        </div>
+        {% endif %}
+    </div>
+    {% if tapir_user.share_owner and tapir_user.allows_purchase_tracking %}
         <div class="row justify-content-end">
             <div class="col-xl-6">{% credit_account_card tapir_user=object %}</div>
         </div>

diff --git a/tapir/statistics/management/commands/process_credit_account.py b/tapir/statistics/management/commands/process_credit_account.py
@@ -15,7 +15,7 @@
 from tapir.accounts.models import TapirUser
 from tapir.statistics.models import ProcessedCreditFiles, CreditAccount
 from tapir.utils.shortcuts import get_timezone_aware_datetime
-from tapir.statistics.management.commands import process_purchase_files
+from tapir.statistics.management.commands.process_purchase_files import Command
 
 
 class Command(BaseCommand):
@@ -67,7 +67,7 @@ def process_file(cls, file: SFTPFile, file_name: str):
             CreditAccount.objects.create(
                 source_file=source_file,
                 credit_date=credit_date,
-                credit_amount=process_purchase_files.parse_german_number(row["Betrag"]),
+                credit_amount=Command.parse_german_number(row["Betrag"]),
                 credit_counter=row["Bon"],
                 cashier=row["Kasse"],
                 info=row["Info"],

diff --git a/tapir/statistics/templatetags/statistics.py b/tapir/statistics/templatetags/statistics.py
@@ -25,10 +25,11 @@ def purchase_statistics_card(context, tapir_user):
 @register.inclusion_tag("statistics/tags/credit_account_card.html", takes_context=True)
 def credit_account_card(context, tapir_user):
     user_credits = CreditAccount.objects.filter(tapir_user=tapir_user)
-    context["last_credits"] = user_credits.order_by("-credit_date")[:10]
-    context["actual_credit"] = "{:.2f}".format(
-        user_credits.aggregate(total_credit=Sum("credit_amount"))["total_credit"]
-    )
+    if user_credits:
+        context["last_credits"] = user_credits.order_by("-credit_date")[:10]
+        context["actual_credit"] = "{:.2f}".format(
+            user_credits.aggregate(total_credit=Sum("credit_amount"))["total_credit"]
+        )
     return context
 
 

diff --git a/tapir/utils/management/commands/generate_test_data_functions.py b/tapir/utils/management/commands/generate_test_data_functions.py
@@ -595,17 +595,11 @@ def generate_credit_account():
         share_owners = NumberOfSharesService.annotate_share_owner_queryset_with_nb_of_active_shares(
             share_owners, current_date
         )
-        # share_owners = (
-        #     MembershipPauseService.annotate_share_owner_queryset_with_has_active_pause(
-        #         share_owners, current_date
-        #     )
-        # )
-
-        purchasing_users = [
+        credit_users = [
             share_owner
             for share_owner in share_owners.with_status(
                 status=MemberStatus.ACTIVE, at_datetime=current_date
-            )
+            )[::2]
             if share_owner.user
         ]
         info = random.choice(["Guthabenkarte", "Einkauf"])
@@ -628,7 +622,7 @@ def generate_credit_account():
                     info=info,
                     tapir_user=share_owner.user,
                 )
-                for share_owner in purchasing_users
+                for share_owner in credit_users
             ]
         )