- Added PricingPlan Model

- Implement a complete cycle for buying a Matrix Chat Host
- Refactor the Payement cycle and stripe related methods

uncloud_pay/management/commands/charge-negative-balance.py

@@ -1,6 +1,7 @@
 from django.core.management.base import BaseCommand
 from uncloud_auth.models import User
-from uncloud_pay.models import Order, Bill, PaymentMethod, get_balance_for_user
+from uncloud_pay.models import Order, Bill, get_balance_for_user
+import uncloud_pay.stripe as uncloud_stripe
 
 from datetime import timedelta
 from django.utils import timezone
@@ -18,14 +19,10 @@ class Command(BaseCommand):
             balance = get_balance_for_user(user)
             if balance < 0:
                 print("User {} has negative balance ({}), charging.".format(user.username, balance))
-                payment_method = PaymentMethod.get_primary_for(user)
-                if payment_method != None:
-                    amount_to_be_charged = abs(balance)
-                    charge_ok = payment_method.charge(amount_to_be_charged)
-                    if not charge_ok:
-                        print("ERR: charging {} with method {} failed"
-                                .format(user.username, payment_method.uuid)
-                                )
-                else:
-                    print("ERR: no payment method registered for {}".format(user.username))
+                amount_to_be_charged = abs(balance)
+                result = uncloud_stripe.charge_customer(user, amount_to_be_charged)
+                if result.status != 'succeeded':
+                    print("ERR: charging {} with method {} failed"
+                            .format(user.username, result)
+                            )
         print("=> Done.")

uncloud_pay/management/commands/import-vat-rates.py

@@ -1,11 +1,14 @@
 from django.core.management.base import BaseCommand
 from uncloud_pay.models import VATRate
 
+import logging
 import urllib
 import csv
 import sys
 import io
 
+logger = logging.getLogger(__name__)
+
 class Command(BaseCommand):
     help = '''Imports VAT Rates. Assume vat rates of format https://github.com/kdeldycke/vat-rates/blob/master/vat_rates.csv'''
     vat_url = "https://raw.githubusercontent.com/ungleich/vat-rates/main/vat_rates.csv"
@@ -23,13 +26,25 @@ class Command(BaseCommand):
         reader = csv.DictReader(csv_file)
 
         for row in reader:
-#            print(row)
-            obj, created = VATRate.objects.get_or_create(
-                starting_date=row["start_date"],
-                ending_date=row["stop_date"] if row["stop_date"] != "" else None,
-                territory_codes=row["territory_codes"],
-                currency_code=row["currency_code"],
-                rate=row["rate"],
-                rate_type=row["rate_type"],
-                description=row["description"]
-            )
+            if row["territory_codes"] and len(row["territory_codes"].splitlines()) > 1:
+                for code in row["territory_codes"].splitlines():
+                    VATRate.objects.get_or_create(
+                    starting_date=row["start_date"],
+                    ending_date=row["stop_date"] if row["stop_date"] != "" else None,
+                    territory_codes=code,
+                    currency_code=row["currency_code"],
+                    rate=row["rate"],
+                    rate_type=row["rate_type"],
+                    description=row["description"]
+                )
+            else:
+                VATRate.objects.get_or_create(
+                    starting_date=row["start_date"],
+                    ending_date=row["stop_date"] if row["stop_date"] != "" else None,
+                    territory_codes=row["territory_codes"],
+                    currency_code=row["currency_code"],
+                    rate=row["rate"],
+                    rate_type=row["rate_type"],
+                    description=row["description"]
+                )
+        logger.info('All VAT Rates have been added!')