From 1c3d3efb3a7a328cf0fed7cb3ff2844a27d187fe Mon Sep 17 00:00:00 2001 From: Amal Elshihaby Date: Thu, 12 Aug 2021 12:28:19 +0200 Subject: [PATCH] List all the credit cards and the ability to add more cards --- .../matrixhosting/images/mastercard.png | Bin 0 -> 5170 bytes .../static/matrixhosting/images/visa.png | Bin 0 -> 4423 bytes .../static/matrixhosting/js/payment.js | 97 ++------ .../static/matrixhosting/js/stripe.js | 79 +++++++ .../templates/matrixhosting/base.html | 1 + .../templates/matrixhosting/cards.html | 210 ++++++++++++++++++ .../matrixhosting/includes/_card.html | 9 - .../matrixhosting/includes/_navbar.html | 4 +- .../templates/matrixhosting/instances.html | 53 +++++ .../matrixhosting/order_confirmation.html | 8 +- .../matrixhosting/order_details.html | 20 +- .../templates/matrixhosting/payments.html | 10 +- matrixhosting/urls.py | 4 +- matrixhosting/views.py | 114 +++++++--- uncloud/.env | 3 +- uncloud/settings.py | 4 +- uncloud/urls.py | 2 +- uncloud_pay/models.py | 13 +- uncloud_pay/serializers.py | 15 +- uncloud_pay/stripe.py | 12 +- uncloud_pay/urls.py | 9 + uncloud_pay/views.py | 21 +- 22 files changed, 529 insertions(+), 159 deletions(-) create mode 100644 matrixhosting/static/matrixhosting/images/mastercard.png create mode 100644 matrixhosting/static/matrixhosting/images/visa.png create mode 100644 matrixhosting/static/matrixhosting/js/stripe.js create mode 100644 matrixhosting/templates/matrixhosting/cards.html create mode 100644 matrixhosting/templates/matrixhosting/instances.html create mode 100644 uncloud_pay/urls.py diff --git a/matrixhosting/static/matrixhosting/images/mastercard.png b/matrixhosting/static/matrixhosting/images/mastercard.png new file mode 100644 index 0000000000000000000000000000000000000000..a013447288007cf3923c29ddd0b0deeb51ef9cb4 GIT binary patch literal 5170 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 0; i--) { - brandIconElement.classList.remove(brandIconElement.classList[i]); - } - brandIconElement.classList.add('fab'); - brandIconElement.classList.add(pfClass); -} - function fetch_pricing() { var url = '/pricing/' + $('input[name="pricing_name"]').val() + '/calculate/'; var cores = $('#cores').val(); @@ -20,8 +10,18 @@ function fetch_pricing() { dataType: 'json', success: function (data) { if (data && data['total']) { - $('#total').text(data['total'] + " CHF"); $('#recurring_price').text(data['recurring_price'] + " CHF"); + $('#vat').text(data['vat_amount'] + " CHF"); + $('#total').text(data['total'] + " CHF"); + var balance = parseFloat($('#balance').data('balance')); + if(data['total'] > balance) { + $('#has-enough-balance').hide(); + $('#cards-section').show(); + window.cardNumberElement = loadStripe(stripe); + } else { + $('#cards-section').hide(); + $('#has-enough-balance').show(); + } } } }); @@ -43,8 +43,9 @@ function incrementValue(e) { return false; }; - $(document).ready(function () { + var stripe = Stripe(window.stripeKey); + if ($('#pricing_name') != undefined) { fetch_pricing(); } @@ -54,72 +55,8 @@ $(document).ready(function () { $('.fa-minus-circle.left').bind('click', {inc: -1}, incrementValue); var hasCreditcard = window.hasCreditcard || false; - if (hasCreditcard && window.stripeKey) { - var stripe = Stripe(window.stripeKey); - if (window.pm_id == undefined) { - var element_style = { - fonts: [{ - family: 'lato-light', - src: 'url(https://cdn.jsdelivr.net/font-lato/2.0/Lato/Lato-Light.woff) format("woff2")' - }, { - family: 'lato-regular', - src: 'url(https://cdn.jsdelivr.net/font-lato/2.0/Lato/Lato-Regular.woff) format("woff2")' - } - ], - locale: window.current_lan - }; - var elements = stripe.elements(element_style); - var credit_card_text_style = { - base: { - iconColor: '#666EE8', - color: '#31325F', - lineHeight: '25px', - fontWeight: 300, - fontFamily: "'lato-light', sans-serif", - fontSize: '14px', - '::placeholder': { - color: '#777' - } - }, - invalid: { - iconColor: '#eb4d5c', - color: '#eb4d5c', - lineHeight: '25px', - fontWeight: 300, - fontFamily: "'lato-regular', sans-serif", - fontSize: '14px', - '::placeholder': { - color: '#eb4d5c', - fontWeight: 400 - } - } - }; - - var enter_ccard_text = "Enter your credit card number"; - if (typeof window.enter_your_card_text !== 'undefined') { - enter_ccard_text = window.enter_your_card_text; - } - var cardNumberElement = elements.create('cardNumber', { - style: credit_card_text_style, - placeholder: enter_ccard_text - }); - cardNumberElement.mount('#card-number-element'); - - var cardExpiryElement = elements.create('cardExpiry', { - style: credit_card_text_style - }); - cardExpiryElement.mount('#card-expiry-element'); - - var cardCvcElement = elements.create('cardCvc', { - style: credit_card_text_style - }); - cardCvcElement.mount('#card-cvc-element'); - cardNumberElement.on('change', function (event) { - if (event.brand) { - setBrandIcon(event.brand); - } - }); - } + if (hasCreditcard) { + window.cardNumberElement = loadStripe(stripe); } function submitBillingForm(pmId) { @@ -141,7 +78,7 @@ $(document).ready(function () { } stripe.createPaymentMethod({ type: 'card', - card: cardNumberElement, + card: window.cardNumberElement, }) .then(function(result) { // Handle result.error or result.paymentMethod @@ -154,7 +91,7 @@ $(document).ready(function () { stripePMHandler(result.paymentMethod); } }); - window.card = cardNumberElement; + window.card = window.cardNumberElement; } /* Form validation */ diff --git a/matrixhosting/static/matrixhosting/js/stripe.js b/matrixhosting/static/matrixhosting/js/stripe.js new file mode 100644 index 0000000..04a03b1 --- /dev/null +++ b/matrixhosting/static/matrixhosting/js/stripe.js @@ -0,0 +1,79 @@ +function setBrandIcon(brand) { + var brandIconElement = document.getElementById('brand-icon'); + var pfClass = 'fa-cc-' + brand; + for (var i = brandIconElement.classList.length - 1; i >= 0; i--) { + brandIconElement.classList.remove(brandIconElement.classList[i]); + } + brandIconElement.classList.add('fab'); + brandIconElement.classList.add(pfClass); +}; + +function loadStripe(stripe) { + var cardNumberElement; + if (stripe) { + var element_style = { + fonts: [{ + family: 'lato-light', + src: 'url(https://cdn.jsdelivr.net/font-lato/2.0/Lato/Lato-Light.woff) format("woff2")' + }, { + family: 'lato-regular', + src: 'url(https://cdn.jsdelivr.net/font-lato/2.0/Lato/Lato-Regular.woff) format("woff2")' + } + ], + locale: window.current_lan + }; + var elements = stripe.elements(element_style); + var credit_card_text_style = { + base: { + iconColor: '#666EE8', + color: '#31325F', + lineHeight: '25px', + fontWeight: 300, + fontFamily: "'lato-light', sans-serif", + fontSize: '14px', + '::placeholder': { + color: '#777' + } + }, + invalid: { + iconColor: '#eb4d5c', + color: '#eb4d5c', + lineHeight: '25px', + fontWeight: 300, + fontFamily: "'lato-regular', sans-serif", + fontSize: '14px', + '::placeholder': { + color: '#eb4d5c', + fontWeight: 400 + } + } + }; + + var enter_ccard_text = "Enter your credit card number"; + if (typeof window.enter_your_card_text !== 'undefined') { + enter_ccard_text = window.enter_your_card_text; + } + cardNumberElement = elements.create('cardNumber', { + style: credit_card_text_style, + placeholder: enter_ccard_text + }); + cardNumberElement.mount('#card-number-element'); + + var cardExpiryElement = elements.create('cardExpiry', { + style: credit_card_text_style + }); + cardExpiryElement.mount('#card-expiry-element'); + + var cardCvcElement = elements.create('cardCvc', { + style: credit_card_text_style + }); + cardCvcElement.mount('#card-cvc-element'); + cardNumberElement.on('change', function (event) { + if (event.brand) { + setBrandIcon(event.brand); + } + }); + } + return cardNumberElement; +}; + diff --git a/matrixhosting/templates/matrixhosting/base.html b/matrixhosting/templates/matrixhosting/base.html index dcda82d..011e71e 100644 --- a/matrixhosting/templates/matrixhosting/base.html +++ b/matrixhosting/templates/matrixhosting/base.html @@ -55,6 +55,7 @@ crossorigin="anonymous" > + {% block js_extra %} {% endblock js_extra %} {% compress js %} diff --git a/matrixhosting/templates/matrixhosting/cards.html b/matrixhosting/templates/matrixhosting/cards.html new file mode 100644 index 0000000..569b9b9 --- /dev/null +++ b/matrixhosting/templates/matrixhosting/cards.html @@ -0,0 +1,210 @@ +{% extends "matrixhosting/base.html" %} + +{% load static i18n compress %} + +{% block title %} Payments {% endblock %} + +{% block content %} +
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+

{{balance}} CHF

+ Make a deposit +
+
+
+
+
+
+
+
+

{% trans "Credit or Debit Cards"%} ({% trans "for payments"%})

+
+
+ {% for card in object_list %} +
+ +
+ {% endfor %} +
+
+
+
+
+ + +
+
+
+
+
+{% endblock %} +{% block js_extra %} + + + +{% endblock js_extra %} \ No newline at end of file diff --git a/matrixhosting/templates/matrixhosting/includes/_card.html b/matrixhosting/templates/matrixhosting/includes/_card.html index d0dbd79..9cb9462 100644 --- a/matrixhosting/templates/matrixhosting/includes/_card.html +++ b/matrixhosting/templates/matrixhosting/includes/_card.html @@ -24,15 +24,6 @@
-
- {% for message in messages %} - {% if 'failed_payment' in message.tags or 'make_charge_error' in message.tags or 'error' in message.tags %} -
    -

  • {{ message|safe }}

    • -
- {% endif %} - {% endfor %} -
diff --git a/matrixhosting/templates/matrixhosting/includes/_navbar.html b/matrixhosting/templates/matrixhosting/includes/_navbar.html index d6da1e9..83f4153 100644 --- a/matrixhosting/templates/matrixhosting/includes/_navbar.html +++ b/matrixhosting/templates/matrixhosting/includes/_navbar.html @@ -61,7 +61,7 @@
  • See all Notifications
    • -
  • +
    • Hi, {{request.user.username}}
    • @@ -69,7 +69,7 @@
    • {%trans "Dashboard" %}
    • {%trans "Orders" %}
    • {%trans "Billing" %}
      • -
    • {%trans "Instances" %}
      • +
    • {%trans "Instances" %}
    • Need Help?
    • Sign Out
      • diff --git a/matrixhosting/templates/matrixhosting/instances.html b/matrixhosting/templates/matrixhosting/instances.html new file mode 100644 index 0000000..9a900a8 --- /dev/null +++ b/matrixhosting/templates/matrixhosting/instances.html @@ -0,0 +1,53 @@ +{% extends "matrixhosting/base.html" %} + +{% load static i18n compress %} + +{% block title %} Instances {% endblock %} + +{% block content %} + +{% csrf_token %} +
      +
      +
      +

      {% trans "Instances"%}

      + +
      +
      +
      {% trans "ID"%}
      +
      {% trans "Creation Date"%}
      +
      {% trans "Homeserver Domain"%}
      +
      {% trans "WebClient Domain"%}
      +
      {% trans "Order"%}
      +
      {% trans "Termination Date"%}
      +
      +
      + + + +
      + {% for instance in object_list %} +
      +
      +
      #{{instance.id}}
      +
      {{instance.creation_date|date:"Y-m-d"}}
      +
      {{instance.homeserver_domain}}
      +
      {{instance.webclient_domain}}
      +
      #{{instance.order.id}}
      +
      {{order.termination_date|date:"Y-m-d"}}
      +
      +
      + {%endfor%} +
      + + +
      +
      +
      + +{% endblock %} + +{% block js_extra %} +{% endblock %} diff --git a/matrixhosting/templates/matrixhosting/order_confirmation.html b/matrixhosting/templates/matrixhosting/order_confirmation.html index 39d371a..1cb49e2 100644 --- a/matrixhosting/templates/matrixhosting/order_confirmation.html +++ b/matrixhosting/templates/matrixhosting/order_confirmation.html @@ -180,8 +180,14 @@
      + {% if stripe_deposit_amount > 0 %}
      - By clicking "Place order" you agree to our Terms of Service and this plan will charge your account balance with {{pricing.total|floatformat:2}} CHF + By clicking "Confirm order" you agree to charge your active credit card with {{stripe_deposit_amount}} CHF to handle the wallet deficit. +
      +
      + {% endif %} +
      + By clicking "Confirm order" you agree to our Terms of Service and this plan will charge your account balance with {{pricing.total|floatformat:2}} CHF
      - {% if show_cards %} -
      +
      {% with cards_len=cards|length %}

      {% if cards_len > 0 %} @@ -252,14 +252,14 @@

      {% endwith %}
      - {% else %} -

      - {% blocktrans %}Your wallet has enough balance, Press Continue to fill the VM instance settings.{% endblocktrans %} -

      -
      - +
      +

      + {% blocktrans %}Your wallet has enough balance, Press Continue to fill the VM instance settings.{% endblocktrans %} +

      +
      + +
      - {% endif %}
      diff --git a/matrixhosting/templates/matrixhosting/payments.html b/matrixhosting/templates/matrixhosting/payments.html index 168fa65..9fe4662 100644 --- a/matrixhosting/templates/matrixhosting/payments.html +++ b/matrixhosting/templates/matrixhosting/payments.html @@ -10,8 +10,8 @@
      @@ -42,7 +42,7 @@
      - +
      @@ -63,7 +63,7 @@
      -

      {% trans "All Transactions"%}

      +

      {% trans "Payment Moves"%}

      @@ -111,8 +111,6 @@
      -
      -
      diff --git a/matrixhosting/urls.py b/matrixhosting/urls.py index c6949a3..4eb931b 100644 --- a/matrixhosting/urls.py +++ b/matrixhosting/urls.py @@ -8,10 +8,12 @@ app_name = 'matrixhosting' urlpatterns = [ path('order/new/', OrderPaymentView.as_view(), name='payment'), - path('order/confirm/', OrderDetailsView.as_view(), name='order_confirmation'), + path('order/confirm/', OrderConfirmationView.as_view(), name='order_confirmation'), path('order/success/', OrderSuccessView.as_view(), name='order_success'), path('order/invoice/download', InvoiceDownloadView.as_view(), name='invoice_download'), path('billing/', PaymentsView.as_view(), name='billing'), + path('billing/cards', CardsView.as_view(), name='cards'), + path('instances/', InstancesView.as_view(), name='instances'), path('orders/', OrdersView.as_view(), name='orders'), path('', IndexView.as_view(), name='index'), ] diff --git a/matrixhosting/views.py b/matrixhosting/views.py index eba096b..7b13763 100644 --- a/matrixhosting/views.py +++ b/matrixhosting/views.py @@ -115,11 +115,6 @@ class OrderPaymentView(FormView): context.update({'details_form': details_form, 'billing_address_form': billing_address_form}) return self.render_to_response(context) - - this_user = { - 'email': self.request.user.email, - 'username': self.request.user.username - } address = get_billing_address_for_user(self.request.user) if address: form = BillingAddressForm(self.request.POST, instance=address) @@ -131,11 +126,14 @@ class OrderPaymentView(FormView): self.request.session['billing_address_data'] = billing_address_form.cleaned_data self.request.session['billing_address_data']['owner'] = self.request.user.id id_payment_method = self.request.POST.get('id_payment_method', False) - customer_id = uncloud_stripe.get_customer_id_for(self.request.user) + selected_card = False if id_payment_method and id_payment_method != 'undefined': - uncloud_stripe.attach_payment_method(id_payment_method, customer_id) + uncloud_stripe.attach_payment_method(id_payment_method, self.request.user) + selected_card = StripeCreditCard.objects.filter(card_id=id_payment_method).first() + selected_card.activate() vat_number = billing_address_form.cleaned_data.get('vat_number').strip() if vat_number: + customer_id = uncloud_stripe.get_customer_id_for(self.request.user) validate_result = validate_vat_number( stripe_customer_id=customer_id, billing_address_id=billing_address_ins.id @@ -156,24 +154,21 @@ class OrderPaymentView(FormView): specs['cores'], specs['memory'], specs['storage'], request.session['pricing']['name'], vat_rate=vat_rate * 100, vat_validation_status = vat_validation_status ) - amount = get_balance_for_user(self.request.user) - decimal.Decimal(pricing["total"]) - if (amount < 0): - try: - payment_id = Payment.deposit(request.user, abs(amount), source='stripe') - except CardError as e: - messages.add_message( - self.request, messages.ERROR, e.user_message, - extra_tags='error' - ) - return HttpResponseRedirect( - reverse('matrix:payment') - ) self.request.session['pricing'] = pricing self.request.session['order'] = specs self.request.session['vat_validation_status'] = vat_validation_status + amount = get_balance_for_user(self.request.user) - decimal.Decimal(pricing["total"]) + if (amount < 0 and not selected_card): + messages.add_message( + self.request, messages.ERROR, "You haven't enough balance please select credit card to continue", + extra_tags='error' + ) + return HttpResponseRedirect( + reverse('matrix:payment') + ) return HttpResponseRedirect(reverse('matrix:order_confirmation')) -class OrderDetailsView(DetailView): +class OrderConfirmationView(DetailView): template_name = "matrixhosting/order_confirmation.html" context_object_name = "order" model = Order @@ -197,7 +192,12 @@ class OrderDetailsView(DetailView): if ('order' not in request.session): return HttpResponseRedirect(reverse('matrix:index')) elif 'pricing' not in self.request.session or 'vat_validation_status' not in self.request.session: - return HttpResponseRedirect(reverse('matrix:payment')) + return HttpResponseRedirect(reverse('matrix:payment')) + + total = self.request.session['pricing']['total'] + amount = get_balance_for_user(self.request.user) - decimal.Decimal(total) + if (amount < 0): + context['stripe_deposit_amount'] = max(amount, settings.MIN_PER_TRANSACTION) return render(request, self.template_name, context) def post(self, request, *args, **kwargs): @@ -210,19 +210,31 @@ class OrderDetailsView(DetailView): self.request.session['order']['homeserver_domain'] = domains_form.cleaned_data.get('homeserver_name') + ".matrix.ungleich.cloud" self.request.session['order']['webclient_domain'] = domains_form.cleaned_data.get('webclient_name') + ".matrix.0co2.cloud" self.request.session['order']['is_open_registration'] = domains_form.cleaned_data.get('is_open_registration') - order = finalize_order(request, customer, + try: + amount = get_balance_for_user(self.request.user) - decimal.Decimal(total) + if (amount < 0): + Payment.deposit(request.user, abs(max(amount, settings.MIN_PER_TRANSACTION)), source='stripe') + order = finalize_order(request, customer, billing_address, total, PricingPlan.get_by_name(self.request.session['pricing']['name']), request.session.get('order')) - if order: - bill = Bill.create_next_bill_for_order(order) - self.request.session['bill_id'] = bill.id - payment= Payment.withdraw(owner=request.user, amount=total, notes=f"BILL #{bill.id}") - if payment: - #Close the bill as the payment has been added - bill.close() - return HttpResponseRedirect(reverse('matrix:order_success')) + if order: + bill = Bill.create_next_bill_for_order(order) + self.request.session['bill_id'] = bill.id + payment= Payment.withdraw(owner=request.user, amount=total, notes=f"BILL #{bill.id}") + if payment: + #Close the bill as the payment has been added + bill.close() + return HttpResponseRedirect(reverse('matrix:order_success')) + except CardError as e: + messages.add_message( + self.request, messages.ERROR, e.user_message, + extra_tags='error' + ) + return HttpResponseRedirect( + reverse('matrix:order_confirmation') + ) context = self.get_context_data() context['domains_form'] = domains_form return self.render_to_response(context) @@ -289,15 +301,17 @@ class OrdersView(ListView): order.cancel() return JsonResponse({'message': 'Successfully Cancelled'}) +class InstancesView(ListView): + template_name = "matrixhosting/instances.html" + model = VMInstance -class MachineViewSet(viewsets.ReadOnlyModelViewSet): - serializer_class = VMInstanceSerializer - permission_classes = [permissions.IsAuthenticated] + @method_decorator(login_required) + def dispatch(self, *args, **kwargs): + return super().dispatch(*args, **kwargs) def get_queryset(self): return VMInstance.objects.filter(owner=self.request.user) - class PaymentsView(ListView): template_name = "matrixhosting/payments.html" model = Payment @@ -316,6 +330,34 @@ class PaymentsView(ListView): def get_queryset(self): if self.request.GET.get('type'): - return Payment.objects.filter(owner=self.request.user, type=self.request.GET.get('type')) - return Payment.objects.filter(owner=self.request.user) + return Payment.objects.filter(owner=self.request.user, type=self.request.GET.get('type')).order_by('-timestamp') + return Payment.objects.filter(owner=self.request.user).order_by('-timestamp') + +class CardsView(ListView): + template_name = "matrixhosting/cards.html" + model = StripeCreditCard + + @method_decorator(login_required) + def dispatch(self, *args, **kwargs): + return super().dispatch(*args, **kwargs) + + def get_context_data(self, **kwargs): + context = super(CardsView, self).get_context_data(**kwargs) + customer_id = uncloud_stripe.get_customer_id_for(self.request.user) + setup_intent = uncloud_stripe.create_setup_intent(customer_id) + + context = super().get_context_data(**kwargs) + context.update({ + 'balance': get_balance_for_user(self.request.user), + 'client_secret': setup_intent.client_secret, + 'username': self.request.user.username, + 'stripe_pk':uncloud_stripe.public_api_key, + 'min_amount': settings.MIN_PER_TRANSACTION + }) + return context + + def get_queryset(self): + uncloud_stripe.sync_cards_for_user(self.request.user) + return StripeCreditCard.objects.filter(owner=self.request.user).order_by('-active') + diff --git a/uncloud/.env b/uncloud/.env index a6f9536..594212f 100644 --- a/uncloud/.env +++ b/uncloud/.env @@ -15,4 +15,5 @@ GITLAB_YAML_DIR= GITLAB_PROJECT_ID= GITLAB_OAUTH_TOKEN= GITLAB_AUTHOR_EMAIL= -GITLAB_AUTHOR_NAME= \ No newline at end of file +GITLAB_AUTHOR_NAME= +WKHTMLTOPDF_CMD=/usr/bin/wkhtmltopdf \ No newline at end of file diff --git a/uncloud/settings.py b/uncloud/settings.py index b7cb234..1568332 100644 --- a/uncloud/settings.py +++ b/uncloud/settings.py @@ -92,7 +92,7 @@ MIDDLEWARE = [ ] ROOT_URLCONF = 'uncloud.urls' -WKHTMLTOPDF_CMD = "/usr/local/bin/wkhtmltopdf" +WKHTMLTOPDF_CMD = env('WKHTMLTOPDF_CMD') TEMPLATES = [ { @@ -217,6 +217,7 @@ OPENNEBULA_USER_PASS = 'user:password' STRIPE_KEY=env('STRIPE_KEY') STRIPE_PUBLIC_KEY=env('STRIPE_PUBLIC_KEY') BILL_PAYMENT_DELAY = 0 +MIN_PER_TRANSACTION = 5 # The django secret key SECRET_KEY=get_random_secret_key() @@ -279,6 +280,7 @@ REPORT_FORMAT = { 'header_line': False, } + # Overwrite settings with local settings, if existing try: from uncloud.local_settings import * diff --git a/uncloud/urls.py b/uncloud/urls.py index 084bdac..5a864cd 100644 --- a/uncloud/urls.py +++ b/uncloud/urls.py @@ -41,7 +41,6 @@ router.register(r'v2/payment/balance', payviews.BalanceViewSet, basename='paymen router.register(r'v2/payment/address', payviews.BillingAddressViewSet, basename='billingaddress') router.register(r'v2/orders', payviews.OrderViewSet, basename='orders') router.register(r'v2/bill', payviews.BillViewSet, basename='bills') -router.register(r'v2/machines', matrixviews.MachineViewSet, basename='machines') # Generic helper views that are usually not needed router.register(r'v2/generic/vat-rate', payviews.VATRateViewSet, basename='vatrate') @@ -62,6 +61,7 @@ urlpatterns = [ path('pricing//calculate/', payviews.PricingView.as_view(), name='pricing_calculator'), path('cc/reg/', payviews.RegisterCard.as_view(), name="cc_register"), path('inbox/notifications/', include(notifications.urls, namespace='notifications')), + path('payments/', include('uncloud_pay.urls', namespace='payments')), path('', include('matrixhosting.urls', namespace='matrix')), # path('', uncloudviews.UncloudIndex.as_view(), name="uncloudindex"), ] diff --git a/uncloud_pay/models.py b/uncloud_pay/models.py index 3fd6462..64c7b6c 100644 --- a/uncloud_pay/models.py +++ b/uncloud_pay/models.py @@ -58,7 +58,7 @@ class StripeCustomer(models.Model): class StripeCreditCard(models.Model): owner = models.ForeignKey(get_user_model(), on_delete=models.CASCADE) - card_name = models.CharField(null=False, max_length=128, default="My credit card") + card_name = models.CharField(null=False, max_length=128, default="") card_id = models.CharField(null=False, max_length=32) last4 = models.CharField(null=False, max_length=4) brand = models.CharField(null=False, max_length=64) @@ -76,6 +76,16 @@ class StripeCreditCard(models.Model): def __str__(self): return f"{self.card_name}: {self.brand} {self.last4} ({self.expiry_date})" + def delete(self, **kwargs): + uncloud_pay.stripe.delete_card(self.card_id) + super().delete(**kwargs) + + + def activate(self): + StripeCreditCard.objects.filter(owner=self.owner, active=True).update(active=False) + self.active = True + self.save() + class Payment(models.Model): owner = models.ForeignKey(get_user_model(), on_delete=models.CASCADE) type = models.CharField(max_length=256, @@ -125,6 +135,7 @@ class Payment(models.Model): return cls.objects.create(owner=owner, type="withdraw", amount=amount, currency=currency, notes=notes) + # See https://docs.djangoproject.com/en/dev/ref/models/fields/#field-choices-enum-types class RecurringPeriodDefaultChoices(models.IntegerChoices): diff --git a/uncloud_pay/serializers.py b/uncloud_pay/serializers.py index 4ea4104..020f359 100644 --- a/uncloud_pay/serializers.py +++ b/uncloud_pay/serializers.py @@ -2,6 +2,7 @@ from django.contrib.auth import get_user_model from rest_framework import serializers from uncloud_auth.serializers import UserSerializer from django.utils.translation import gettext_lazy as _ +from stripe.error import CardError from .models import * import uncloud_pay.stripe as uncloud_stripe @@ -25,13 +26,17 @@ class PaymentSerializer(serializers.ModelSerializer): read_only_fields = [ "external_reference", "source", "timestamp" ] def validate(self, data): - payment_intent = uncloud_stripe.charge_customer(data['owner'], - data['amount']) - - data["external_reference"] = payment_intent["id"] data["source"] = "stripe" - return data + + def create(self, validated_data): + try: + if validated_data['type'] == 'deposit': + return Payment.deposit(validated_data['owner'], validated_data['amount'], validated_data['source'], currency=validated_data['currency'], notes=validated_data['notes']) + else: + return Payment.objects.create(**validated_data) + except CardError as err: + raise serializers.ValidationError(err.user_message) class BalanceSerializer(serializers.Serializer): balance = serializers.DecimalField(max_digits=AMOUNT_MAX_DIGITS, decimal_places=AMOUNT_DECIMALS) diff --git a/uncloud_pay/stripe.py b/uncloud_pay/stripe.py index a59456e..7d8d757 100644 --- a/uncloud_pay/stripe.py +++ b/uncloud_pay/stripe.py @@ -94,8 +94,11 @@ def get_card_from_payment(user, payment_method_id): @handle_stripe_error -def attach_payment_method(payment_method_id, customer_id): - return stripe.PaymentMethod.attach(payment_method_id, customer=customer_id) +def attach_payment_method(payment_method_id, user): + customer_id = get_customer_id_for(user) + ret = stripe.PaymentMethod.attach(payment_method_id, customer=customer_id) + sync_cards_for_user(user) + return ret @handle_stripe_error def create_customer(name, email): @@ -107,7 +110,6 @@ def get_customer(customer_id): @handle_stripe_error def get_customer_cards(customer_id): - print(f"getting cards for: {customer_id}") cards = [] stripe_cards = stripe.PaymentMethod.list( @@ -127,6 +129,10 @@ def get_customer_cards(customer_id): return cards +@handle_stripe_error +def delete_card(card_id): + return stripe.PaymentMethod.detach(card_id) + def sync_cards_for_user(user): customer_id = get_customer_id_for(user) cards = get_customer_cards(customer_id) diff --git a/uncloud_pay/urls.py b/uncloud_pay/urls.py new file mode 100644 index 0000000..f37a1c6 --- /dev/null +++ b/uncloud_pay/urls.py @@ -0,0 +1,9 @@ +from django.urls import path, include +from django.conf import settings +from .views import * + +app_name = 'uncloud_pay' + +urlpatterns = [ + path('cards/activate', CardActivateView.as_view(), name='card_activate'), +] diff --git a/uncloud_pay/views.py b/uncloud_pay/views.py index 3bd3c9e..a93c32b 100644 --- a/uncloud_pay/views.py +++ b/uncloud_pay/views.py @@ -38,14 +38,32 @@ logger = logging.getLogger(__name__) class PricingView(View): def get(self, request, **args): + address = get_billing_address_for_user(self.request.user) + vat_rate = False + vat_validation_status = False + if address: + vat_rate = VATRate.get_vat_rate(address) + vat_validation_status = "verified" if address.vat_number_validated_on and address.vat_number_verified else False pricing = get_order_total_with_vat( request.GET.get('cores'), request.GET.get('memory'), request.GET.get('storage'), - pricing_name = args['name'] + pricing_name = args['name'], + vat_rate = vat_rate * 100, + vat_validation_status = vat_validation_status ) return JsonResponse(pricing) +class CardActivateView(View): + def post(self, request, **args): + card_id = request.POST.get('card_id') + if card_id: + matched_card = StripeCreditCard.objects.filter(owner=self.request.user, card_id=card_id).first() + matched_card.activate() + return JsonResponse({'success': 1}) + else: + return JsonResponse({'error': "Please select a card"}) + class RegisterCard(TemplateView): template_name = "uncloud_pay/register_stripe.html" @@ -55,7 +73,6 @@ class RegisterCard(TemplateView): def get_context_data(self, **kwargs): - customer_id = uncloud_stripe.get_customer_id_for(self.request.user) setup_intent = uncloud_stripe.create_setup_intent(customer_id) context = super().get_context_data(**kwargs)