WIP: Added stripe integration

.env.sample

@@ -24,17 +24,14 @@ AWS_ACCESS_KEY_ID=
 AWS_SECRET_ACCESS_KEY=
 AWS_STORAGE_BUCKET_NAME=
 
-# PayPal
-PAYPAL_RECEIVER_EMAIL=
-PAYPAL_BUSINESS_ID=
-PAYPAL_TEST=False
+# Stripe
+STRIPE_PUBLIC_KEY=
+STRIPE_SECRET_KEY=
+STRIPE_LIVE_MODE=False
 
 # Sentry
 SENTRY_DSN=
 
-# Sqreen
-SQREEN_TOKEN=
-
 # reCAPTCHA
 RECAPTCHA_PUBLIC_KEY=
 RECAPTCHA_PRIVATE_KEY=

.vscode/settings.json

@@ -23,9 +23,9 @@
     "**/migrations/**",
   ],
   "python.linting.pylintEnabled": false,
-  "python.linting.pep8Enabled": true,
-  "python.linting.pep8Path": "pycodestyle",
-  "python.linting.pep8Args": [
+  "python.linting.pycodestyleEnabled": true,
+  "python.linting.pycodestylePath": "pycodestyle",
+  "python.linting.pycodestyleArgs": [
     "--max-line-length=120",
   ],
   "[python]": {

Pipfile

@@ -34,7 +34,7 @@ json-logging-py = "*"
 django-anymail = "*"
 raven = "*"
 django-meta = "*"
-sqreen = "*"
+stripe = "*"
 
 [dev-packages]
 pylint = "*"

README.md

@@ -106,6 +106,13 @@ docker kill $(docker ps -q); docker-compose rm -f; docker volume rm $(docker vol
 docker-compose build
 ```
 
+### Adding a new django vendor app
+1. Update the pipfile
+2. run pipenv lock
+3. run docker-compose build
+
+
+
 [docker-mac]: https://www.docker.com/docker-mac
 [docker-windows]: https://www.docker.com/docker-windows
 [docker-toolbox]: https://www.docker.com/products/docker-toolbox

accounts/templates/account/_base.html

@@ -1,20 +1,26 @@
 {% extends "coderdojochi/_base.html" %}
+{% load coderdojochi_extras %}
 
 {% comment %} Need to do title this way since allauth doesn't support django-meta {% endcomment %}
 {% block title %}{{ title_placeholder }} | {{ block.super }}{% endblock %}
 
 {% block subheader %}
 {% if user.is_authenticated %}
-  <div class="sub-menu">
-    <nav class="grid-container" role="navigation">
-      <ul class="menu">
-        <li><a href="{% url 'account_logout' %}">Log Out</a></li>
-      </ul>
-    </nav>
-  </div>
+<div class="sub-menu">
+  <nav class="grid-container" role="navigation">
+    <ul class="menu">
+      <li class="{% menu_is_active 'account-payments' 'current' %}">
+        <a href="{% url 'account-payments' %}">Payments</a>
+      </li>
+      <li>
+        <a href="{% url 'account_logout' %}">Log Out</a>
+      </li>
+    </ul>
+  </nav>
+</div>
 {% endif %}
 {% endblock subheader %}
 
 {% block contained_content %}
-  {% block content_placeholder %}{% endblock %}
+{% block content_placeholder %}{% endblock %}
 {% endblock %}

accounts/templates/account/account-payments.html

@@ -0,0 +1,36 @@
+{% extends "account/_base.html" %}
+{% load humanize coderdojochi_extras %}
+
+{% block title %}Donations | {{ block.super }}{% endblock %}
+{% block meta_facebook_title %}My Account | {{ block.super }}{% endblock %}
+{% block meta_twitter_title %}My Account | {{ block.super }}{% endblock %}
+
+{% block body_class %}page-dojo{% endblock %}
+
+
+{% block contained_content %}
+
+<section class="margin-top-3">
+  <h2 class="title">Donations</h2>
+  {% if object_list %}
+  <table class="table table-striped">
+    <thead>
+      <tr>
+        <th>Date</th>
+        <th style="text-align:right;">Amount</th>
+      </tr>
+    </thead>
+    <tbody>
+      {% for payment in object_list %}
+      <tr>
+        <td>{{ payment.created_at }}</td>
+        <td style="text-align:right;">${{ payment.get_formatted_amount | floatformat:2 | intcomma }}</td>
+      </tr>
+      {% endfor %}
+    </tbody>
+  </table>
+  {% else %}
+  <p class="text-muted">You have no donations yet. <a href="{% url 'donate' %}">Donate now!</a></p>
+  {% endif %}
+</section>
+{% endblock %}

accounts/templates/account/home_guardian.html

@@ -62,7 +62,7 @@ <h2 class="title text-tertiary">Students</h2>
             {% endfor %}
             </tbody>
         </table>
-        <p><a href="{% url 'welcome' %}?next={% url 'account_home' %}">Add another student</a></p>
+        <p><a href="{% url 'welcome' %}?next={% url 'account-home' %}">Add another student</a></p>
     {% else %}
     <p>You have no students registered yet, <a href="{% url 'welcome' %}">register a student now</a>.</p>
     {% endif %}

accounts/urls.py

@@ -1,10 +1,11 @@
 from django.conf.urls import include
 from django.urls import path
 
-from .views import AccountHomeView, LoginView, SignupView
+from .views import AccountHomeView, LoginView, PaymentsView, SignupView
 
 urlpatterns = [
-    path('', AccountHomeView.as_view(), name='account_home'),
+    path('', AccountHomeView.as_view(), name='account-home'),
+    path('payments/', PaymentsView.as_view(), name='account-payments',),
     path('login/', LoginView.as_view(), name='account_login'),
     path('signup/', SignupView.as_view(), name='account_signup'),
     path('', include('allauth.urls')),

accounts/views.py

@@ -1,10 +1,15 @@
 from django.conf import settings
 from django.contrib import messages
+from django.contrib.auth import get_user_model
 from django.contrib.auth.decorators import login_required
+from django.db.models import Q
 from django.shortcuts import get_object_or_404, redirect, render
 from django.utils import timezone
 from django.utils.decorators import method_decorator
 from django.views.generic import TemplateView
+from django.views.generic.list import ListView
+
+from payments.models import Donation
 
 from allauth.account.views import LoginView as AllAuthLoginView
 from allauth.account.views import SignupView as AllAuthSignupView
@@ -13,6 +18,8 @@
 from coderdojochi.forms import CDCModelForm, GuardianForm, MentorForm
 from coderdojochi.models import Guardian, MeetingOrder, Mentor, MentorOrder, Order, Student
 
+User = get_user_model()
+
 
 class SignupView(MetadataMixin, AllAuthSignupView):
     template_name = 'account/signup.html'
@@ -214,7 +221,7 @@ def post_for_mentor(self, **kwargs):
                 'Profile information saved.'
             )
 
-            return redirect('account_home')
+            return redirect('account-home')
 
         else:
             messages.error(
@@ -250,7 +257,7 @@ def post_for_guardian(self, **kwargs):
                 'Profile information saved.'
             )
 
-            return redirect('account_home')
+            return redirect('account-home')
 
         else:
             messages.error(
@@ -262,3 +269,14 @@ def post_for_guardian(self, **kwargs):
         context['user_form'] = user_form
 
         return render(self.request, 'account/home_guardian.html', context)
+
+
+@method_decorator(login_required, name='dispatch')
+class PaymentsView(ListView):
+    model = Donation
+    template_name = "account/account-payments.html"
+
+    def get_queryset(self):
+        return Donation.objects.filter(
+            Q(customer=self.request.user) | Q(email=self.request.user.email)
+        ).order_by('-created_at')

app.json

@@ -22,10 +22,13 @@
     "ENABLE_DEV_FIXTURES": {
       "required": true
     },
-    "PAYPAL_BUSINESS_ID": {
+    "STRIPE_LIVE_PUBLIC_KEY": {
       "required": true
     },
-    "PAYPAL_RECEIVER_EMAIL": {
+    "STRIPE_LIVE_SECRET_KEY": {
+      "required": true
+    },
+    "STRIPE_LIVE_MODE": {
       "required": true
     },
     "SECRET_KEY": {

coderdojochi/models.py

@@ -37,7 +37,7 @@ def save(self, *args, **kwargs):
         super(CDCUser, self).save(*args, **kwargs)
 
     def get_absolute_url(self):
-        return reverse('account_home')
+        return reverse('account-home')
 
 
 def generate_filename(instance, filename):