From de291c549beae5fb6d8423d3941b24cc62ef25e7 Mon Sep 17 00:00:00 2001
From: Erkki Hietaranta <erkki.hietaranta@gmail.com>
Date: Tue, 20 Feb 2024 21:38:50 +0200
Subject: [PATCH] Finetuned child service payment function to support custom
 invoices

Child service is paid by calling funcion again. So now if child
service has childs, they get paid.

Updated calcultaion so that multpile custominvoices
wont break basic idea of child payments.
---
 utils/businesslogic.py      | 39 ++++++++++++++++++-------------------
 www/templates/www/user.html |  2 +-
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/utils/businesslogic.py b/utils/businesslogic.py
index af83896c..bf6827a4 100644
--- a/utils/businesslogic.py
+++ b/utils/businesslogic.py
@@ -380,6 +380,8 @@ def _service_paid_by_transaction(servicesubscription, transaction, add_days):
         """
         translation.activate(servicesubscription.user.language)
 
+        logger.debug(f"Paying {servicesubscription} and gained {add_days} days more")
+
         # How many days to add to subscription's paid until
         days_to_add = timedelta(
             days = add_days
@@ -392,7 +394,11 @@ def _service_paid_by_transaction(servicesubscription, transaction, add_days):
             logger.debug(
                 f"{servicesubscription} paid for first time, adding bonus of {bonus_days}"
             )
-            transaction.comment = f"First payment of {servicesubscription} - added {bonus_days.days} bonus days."
+            if transaction.comment != "":
+                transaction.comment = transaction.comment + f"\r\nFirst payment of {servicesubscription} - added {bonus_days.days} bonus days."
+            else:
+                transaction.comment = f"First payment of {servicesubscription} - added {bonus_days.days} bonus days."
+            
             days_to_add = days_to_add + bonus_days
             servicesubscription.paid_until = transaction.date
 
@@ -431,25 +437,18 @@ def _service_paid_by_transaction(servicesubscription, transaction, add_days):
                 if paid_servicesubscription.state == ServiceSubscription.SUSPENDED:
                     logger.debug("Service is suspended - no action")
                 else:
-                    extra_days = timedelta(
-                        #Calculate child subscription payment to happen same time that latest parrent subsciption,
-                        #useful with custominvoices that pays Parent subscription multiple times
-                        days = add_days - servicesubscription.service.days_per_payment + paid_servicesubscription.service.days_per_payment
-                    )
-                    paid_servicesubscription.paid_until = transaction.date + extra_days
-                    paid_servicesubscription.last_payment = transaction
-                    paid_servicesubscription.save()
-                    servicesubscription.user.log(
-                        _(
-                            "%(servicename)s is now paid until %(until)s due to %(anotherservicename)s was paid"
-                        )
-                        % {
-                            "servicename": str(paid_servicesubscription),
-                            "until": str(paid_servicesubscription.paid_until),
-                            "anotherservicename": str(servicesubscription.service),
-                        }
-                    )
-
+                    added_days = servicesubscription.paid_until - transaction.date
+                    child_days = 0
+                    if paid_servicesubscription.paid_until:
+                        if paid_servicesubscription.paid_until > transaction.date:
+                            child_date = paid_servicesubscription.paid_until - transaction.date
+                            child_days = child_date.days
+                    extra_days = added_days.days - servicesubscription.service.days_per_payment + paid_servicesubscription.service.days_per_payment - child_days
+                    logger.debug(f"Child prosess add days calculted by {added_days.days} - {servicesubscription.service.days_per_payment} + {paid_servicesubscription.service.days_per_payment} - {child_days} and gained {extra_days} days more")        
+                    #Calculate child subscription payment to happen at same time that latest parrent subsciption,
+                    #useful with custominvoices that pays Parent subscription multiple times
+                    BusinessLogic._service_paid_by_transaction(paid_servicesubscription, transaction, extra_days)
+                    
                     BusinessLogic._check_servicesubscription_state(
                         paid_servicesubscription
                     )
diff --git a/www/templates/www/user.html b/www/templates/www/user.html
index 16a55a79..73b9964f 100644
--- a/www/templates/www/user.html
+++ b/www/templates/www/user.html
@@ -146,7 +146,7 @@ <h2>{% trans 'Bank transactions' %}</h2>
         <td>{{ transaction.reference_number }}</td>
         <td>{{ transaction.sender|default_if_none:"" }}</td>
         <td>{{ transaction.message }}</td>
-        <td>{{ transaction.comment|default_if_none:"" }}</td>
+        <td>{{ transaction.comment|default_if_none:""|linebreaks}}</td>
       </tr>
       {% endfor %}
     </table>