add fiat to token rate when exporting eth orders

Author: rahul-kothari

pretix_eth/exporter.py

@@ -10,7 +10,6 @@
 from pretix_eth.models import WalletAddress
 
 import pytz
-import json
 
 
 def date_to_string(time_zone, date):
@@ -29,10 +28,13 @@ def payment_to_row(payment):
     token_currency_name = token.split("-")[0].strip()
     fiat_amount = payment.amount
     token_amount = payment.info_data.get("amount", "")
-    token_rates = json.loads(payment.payment_provider.settings.TOKEN_RATES)
-    # show the fiat to token price conversion  
-    # set by event admin at the time of the order. eg fiat_rate=1$ or 4000$ etc.
-    fiat_rate = token_rates.get(f"{token_currency_name}_RATE")
+
+    # Show fiat to token price conversion on exports.
+    # get token rates from order.info_data. But default to admin settings (if info not present)
+    token_rates = payment.info_data.get("token_rates", {})
+    fiat_rate = token_rates.get(
+        f"{token_currency_name}_RATE", "Error fetching from order data"
+    )
 
     wallet_address = WalletAddress.objects.filter(order_payment=payment).first()
     hex_wallet_address = wallet_address.hex_address if wallet_address else ""
@@ -66,10 +68,13 @@ def refund_to_row(refund):
     token_currency_name = token.split("-")[0].strip()
     fiat_amount = refund.amount
     token_amount = refund.info_data.get("amount", "")
-    token_rates = json.loads(refund.payment_provider.settings.TOKEN_RATES)
-    # show the fiat to token price conversion  
-    # set by event admin at the time of the order. eg fiat_rate=1$ or 4000$ etc.
-    fiat_rate = token_rates.get(token_currency_name+"_RATE")
+
+    # Show fiat to token price conversion on exports.
+    # get token rates from refund.info. But default to admin settings (if info not present)
+    token_rates = refund.info_data.get("token_rates", {})
+    fiat_rate = token_rates.get(
+        f"{token_currency_name}_RATE", "Error fetching from order data"
+    )
 
     wallet_address = WalletAddress.objects.filter(order_payment=refund.payment).first()
     hex_wallet_address = wallet_address.hex_address if wallet_address else ""
@@ -97,7 +102,7 @@ class EthereumOrdersExporter(ListExporter):
 
     headers = (
         'Type', 'Event slug', 'Order', 'Payment ID', 'Creation date',
-        'Completion date', 'Status', 'Fiat Amount', 'Token Amount', 
+        'Completion date', 'Status', 'Fiat Amount', 'Token Amount',
         'Token Name', 'Token Rate in Fiat', 'Wallet address'
     )
 

pretix_eth/payment.py

@@ -216,6 +216,7 @@ def _payment_is_valid_info(self, payment: OrderPayment) -> bool:
                 "currency_type" in payment.info_data,
                 "time" in payment.info_data,
                 "amount" in payment.info_data,
+                "token_rates" in payment.info_data,
             )
         )
 
@@ -224,6 +225,7 @@ def execute_payment(self, request: HttpRequest, payment: OrderPayment):
             "currency_type": request.session["payment_currency_type"],
             "time": request.session["payment_time"],
             "amount": request.session["payment_amount"],
+            "token_rates": self.get_token_rates_from_admin_settings(),
         }
         payment.save(update_fields=["info"])
 
@@ -301,6 +303,7 @@ def execute_refund(self, refund: OrderRefund):
             "currency_type": refund.payment.info_data["currency_type"],
             "amount": refund.payment.info_data["amount"],
             "wallet_address": wallet_queryset.first().hex_address,
+            "token_rates": self.get_token_rates_from_admin_settings(),
         }
 
         refund.save(update_fields=["info"])

tests/core/test_addresses_correctly_assigned.py

@@ -17,7 +17,12 @@
 @pytest.fixture
 def get_request_and_payment(get_order_and_payment):
     def _create_request_and_payment():
-        info_data = {"currency_type": "ETH - L1", "time": int(time.time()), "amount": 1}
+        info_data = {
+            "currency_type": "ETH - L1",
+            "time": int(time.time()),
+            "amount": 1,
+            "token_rates": {"ETH_RATE": 3000},
+        }
         _, payment = get_order_and_payment(info_data=info_data)
 
         factory = RequestFactory()

tests/core/test_payment_and_refund_export.py

@@ -19,6 +19,10 @@ def test_headers_are_present(organizer, event, create_admin_client):
         "Creation date",
         "Completion date",
         "Status",
+        "Fiat Amount",
+        "Token Amount",
+        "Token Name",
+        "Token Rate in Fiat",
         "Amount",
         "Token",
         "Wallet address",
@@ -51,7 +55,11 @@ def _create_payment_with_address(
             "amount": "100.0",
             "provider": "ethereum",
         },
-        info_data={"currency_type": "ETH - L1", "amount": "100.0"},
+        info_data={
+            "currency_type": "ETH - L1",
+            "amount": "100.0",
+            "token_rates": {"ETH_RATE": 3000},
+        },
         hex_address="0x0000000000000000000000000000000000000000",
     ):
 

tests/core/test_refund.py

@@ -33,7 +33,7 @@ def test_refund_created(
             "state": OrderPayment.PAYMENT_STATE_CONFIRMED,
             "provider": "ethereum",
         },
-        info_data={"amount": "100", "currency_type": "ETH - L1"},
+        info_data={"amount": "100", "currency_type": "ETH - L1", "token_rates": {}},
     )
 
     WalletAddress.objects.create(
@@ -56,6 +56,7 @@ def test_refund_created(
             "currency_type": "ETH - L1",
             "amount": "100",
             "wallet_address": "0x0000000000000000000000000000000000000001",
+            "token_rates": {},
         }