Merge pull request #25 from tpokorra/TP-20210324-fixes_fees_transfer

Tp 20210324 fixes fees transfer

apps/monitor/calc.py

@@ -85,6 +85,15 @@ class Calc:
         else:
           out["sold"] = None
 
+    # moving coins to other wallet with fees.
+    with connection.cursor() as cursor:
+        sql = """SELECT SUM(amount_after_fee) as after_fee FROM `transaction` WHERE amount_before_fee = 0 and crypto_currency=%s and owner_id=%s"""
+        cursor.execute(sql, [crypto, userid])
+        sold = cursor.fetchone()
+        if sold[0]:
+          # total_investment -= Decimal(sold[1])
+          amount_kept += Decimal(sold[0])
+
     rateEUR = ExchangeRate.objects.filter(crypto_currency=crypto, fiat_currency='EUR').order_by('-datetime_valid').first()
     rateUSD = ExchangeRate.objects.filter(crypto_currency=crypto, fiat_currency='USD').order_by('-datetime_valid').first()
 

apps/monitor/templates/monitor.html

@@ -64,13 +64,13 @@
               We have sold {{ c.crypto }} for {{ c.sold|floatformat:2 }} EUR<br/>
               {% endif %}
               {% if c.amount_kept %}
-              Current value of our {{ c.amount_kept|floatformat:3 }} {{ c.crypto }} is {{ c.current_value|floatformat:2 }} EUR<br/>
+              Current value of our {{ c.amount_kept|formatcurrency }} {{ c.crypto }} is {{ c.current_value|floatformat:2 }} EUR<br/>
               {% endif %}
               {% if c.bought_recently %}
-              We have bought within the last 12 months:  {{ c.bought_recently|floatformat:3 }} {{ c.crypto }}<br/>
+              We have bought within the last 12 months:  {{ c.bought_recently|formatcurrency }} {{ c.crypto }}<br/>
               {% endif %}
               {% if c.bought_tax_free %}
-              We can sell without paying taxes: {{ c.bought_tax_free|floatformat:3 }} {{ c.crypto }} for {{ c.value_tax_free|floatformat:2 }} EUR<br/>
+              We can sell without paying taxes: {{ c.bought_tax_free|formatcurrency }} {{ c.crypto }} for {{ c.value_tax_free|floatformat:2 }} EUR<br/>
               {% endif %}
 
               <br/><a href="/transactions/show?crypto={{ c.crypto }}">My transactions</a><br/>

apps/monitor/templatetags/filter.py

@@ -6,5 +6,9 @@ register = template.Library()
 def formatcurrency(value):
     if value > 100:
         return "%0.0f" % (value,)
+    if value < 0.01:
+        return "%0.5f" % (value,)
+    if value < 0.1:
+        return "%0.4f" % (value,)
     return "%0.2f" % (value,)
 

apps/transactions/templatetags/filter.py

@@ -6,5 +6,9 @@ register = template.Library()
 def formatcurrency(value):
     if value > 100:
         return "%0.0f" % (value,)
+    if value < 0.01:
+        return "%0.4f" % (value,)
+    if value < 0.1:
+        return "%0.3f" % (value,)
     return "%0.2f" % (value,)