| Date | +Amount | +
|---|---|
| {{ payment.created_at }} | +${{ payment.get_formatted_amount | floatformat:2 | intcomma }} | +
You have no donations yet. Donate now!
+ {% endif %} +You have no students registered yet, register a student now.
{% endif %} diff --git a/accounts/urls.py b/accounts/urls.py index 52226cb7..46b31e70 100644 --- a/accounts/urls.py +++ b/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')), diff --git a/accounts/views.py b/accounts/views.py index 217a8c0a..ff243095 100644 --- a/accounts/views.py +++ b/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') diff --git a/app.json b/app.json index 6a4952c4..79b1dfd4 100644 --- a/app.json +++ b/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": { diff --git a/coderdojochi/models.py b/coderdojochi/models.py index c70490a8..60a9eec3 100644 --- a/coderdojochi/models.py +++ b/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): diff --git a/coderdojochi/old_views.py b/coderdojochi/old_views.py index 5288554a..ab720810 100644 --- a/coderdojochi/old_views.py +++ b/coderdojochi/old_views.py @@ -5,6 +5,16 @@ from datetime import date, timedelta from functools import reduce +import arrow +import stripe +from coderdojochi.forms import (CDCModelForm, ContactForm, DonationForm, + GuardianForm, MentorForm, StudentForm) +from coderdojochi.models import (Donation, Equipment, EquipmentType, Guardian, + Meeting, MeetingOrder, Mentor, MentorOrder, + Order, PartnerPasswordAccess, Session, + Student) +from coderdojochi.util import email +from dateutil.relativedelta import relativedelta from django.conf import settings from django.contrib import messages from django.contrib.auth import get_user_model @@ -20,29 +30,9 @@ from django.views.decorators.cache import never_cache from django.views.decorators.csrf import csrf_exempt from django.views.generic import TemplateView - -import arrow -from dateutil.relativedelta import relativedelta from icalendar import Calendar, Event, vText from paypal.standard.forms import PayPalPaymentsForm -from coderdojochi.forms import CDCModelForm, ContactForm, DonationForm, GuardianForm, MentorForm, StudentForm -from coderdojochi.models import ( - Donation, - Equipment, - EquipmentType, - Guardian, - Meeting, - MeetingOrder, - Mentor, - MentorOrder, - Order, - PartnerPasswordAccess, - Session, - Student, -) -from coderdojochi.util import email - logger = logging.getLogger(__name__) # this will assign User to our custom CDCUser @@ -191,7 +181,7 @@ def faqs(request, template_name="faqs.html"): # 'Profile information saved.' # ) -# return redirect('account_home') +# return redirect('account-home') # else: # messages.error( @@ -270,7 +260,7 @@ def faqs(request, template_name="faqs.html"): # 'Profile information saved.' # ) -# return redirect('account_home') +# return redirect('account-home') # else: # messages.error( @@ -420,12 +410,12 @@ def student_detail( try: student = Student.objects.get(id=student_id, is_active=True) except ObjectDoesNotExist: - return redirect('account_home') + return redirect('account-home') try: guardian = Guardian.objects.get(user=request.user, is_active=True) except ObjectDoesNotExist: - return redirect('account_home') + return redirect('account-home') if not student.guardian == guardian: access = False @@ -435,7 +425,7 @@ def student_detail( access = False if not access: - return redirect('account_home') + return redirect('account-home') messages.error( request, 'You do not have permissions to edit this student.' @@ -449,13 +439,13 @@ def student_detail( request, f"Student \"{student.first_name} {student.last_name}\" Deleted." ) - return redirect('account_home') + return redirect('account-home') form = StudentForm(request.POST, instance=student) if form.is_valid(): form.save() messages.success(request, 'Student Updated.') - return redirect('account_home') + return redirect('account-home') return render( request, @@ -467,67 +457,54 @@ def student_detail( def donate(request, template_name="donate.html"): - if request.method == 'POST': - # if new donation form submit - if ( - 'first_name' in request.POST and - 'last_name' in request.POST and - 'email' in request.POST and - 'amount' in request.POST - ): - donation = Donation( - first_name=request.POST['first_name'], - last_name=request.POST['last_name'], - email=request.POST['email'], - amount=request.POST['amount'], - ) + return render( + request, + template_name + ) - if 'referral_code' in request.POST and request.POST['referral_code']: - donation.referral_code = request.POST['referral_code'] - donation.save() +@csrf_exempt +def donate_charge(request): + + donor_name = request.POST['donor-name'] + donor_email = request.POST['donor-email'] + donor_phone = request.POST['donor-phone'] + donor_amount = request.POST['donor-amount'] + donor_statement = f"Donation to We All Code from {donor_name}" + stripe_token = request.POST['stripeToken'] + stripe.api_key = settings.STRIPE_SECRET_KEY + + try: + charge = stripe.Charge.create( + amount=int(float(donor_amount) * 100), + currency='usd', + card=stripe_token, + description=donor_statement, + metadata={ + 'name': donor_name, + 'email': donor_email, + 'receipt_email': donor_email, + 'statement_descriptor': donor_statement, + } + ) + messages.success(request, f"Thank you for your donation of ${donor_amount}!") - return HttpResponse(donation.id) + except stripe.error.StripeError as e: + messages.error( + request, + f"There was an error processing your payment: {e}. " + f" Please try again, or contact us if you're having trouble." + ) - else: - return HttpResponse('fail') - - referral_heading = None - referral_code = None - referral_disclaimer = None - - if 'ref' in request.GET: - referral_code = request.GET['ref'] - - paypal_dict = { - 'business': settings.PAYPAL_BUSINESS_ID, - 'amount': '25', - 'item_name': 'We All Code Donation', - 'cmd': '_donations', - 'lc': 'US', - 'invoice': '', - 'currency_code': 'USD', - 'no_note': '0', - 'cn': 'Add a message for We All Code to read:', - 'no_shipping': '1', - 'address_override': '1', - 'first_name': '', - 'last_name': '', - 'notify_url': request.build_absolute_uri(reverse('paypal-ipn')), - 'return_url': request.build_absolute_uri('return'), - 'cancel_return': request.build_absolute_uri('cancel'), - 'bn': 'PP-DonationsBF:btn_donateCC_LG.gif:NonHosted' - } - - form = PayPalPaymentsForm(initial=paypal_dict) + else: + # TODO: Save to model? Send Receipt? Something... + messages.success( + request, + "Else command worked" + ) - return render(request, template_name, { - 'form': form, - 'referral_heading': referral_heading, - 'referral_code': referral_code, - 'referral_disclaimer': referral_disclaimer - }) + return redirect('donate') @csrf_exempt @@ -567,7 +544,8 @@ def contact(request, template_name="contact.html"): email( subject=f"{request.POST['name']} | We All Code Contact Form", recipients=[settings.CONTACT_EMAIL], - reply_to=[f"{request.POST['name']}<{request.POST['email']}>"], + reply_to=[ + f"{request.POST['name']}<{request.POST['email']}>"], template_name='contact-email', merge_global_data={ 'message': request.POST['message'], @@ -788,7 +766,8 @@ def session_stats(request, pk, template_name="session-stats.html"): if current_orders_checked_in: student_ages = [] for order in current_orders_checked_in: - student_ages.append(order.student.get_age(order.session.start_date)) + student_ages.append( + order.student.get_age(order.session.start_date)) average_age = ( reduce( @@ -1056,7 +1035,7 @@ def session_donations(request, pk, template_name="session-donations.html"): request, 'You do not have permission to access this page.' ) - return redirect('account_home') + return redirect('account-home') session = get_object_or_404(Session, pk=pk) @@ -1107,7 +1086,7 @@ def meeting_check_in( request, 'You do not have permission to access this page.' ) - return redirect('account_home') + return redirect('account-home') if request.method == 'POST': if 'order_id' in request.POST: diff --git a/coderdojochi/settings.py b/coderdojochi/settings.py index 7571c76b..a87f2331 100644 --- a/coderdojochi/settings.py +++ b/coderdojochi/settings.py @@ -15,6 +15,7 @@ import dj_database_url import django_heroku import raven +from django.urls import reverse_lazy # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) @@ -97,6 +98,7 @@ 'stdimage', 'import_export', 'django_nose', + 'stripe', 'meta', 'captcha', @@ -104,6 +106,7 @@ 'accounts', 'coderdojochi', 'weallcode', + 'payments', ] MIDDLEWARE = [ @@ -306,6 +309,10 @@ def MediaRootS3BotoStorage(): return S3Boto3Storage(location='media', file_overw AUTH_USER_MODEL = 'coderdojochi.CDCUser' +# Stripe +STRIPE_PUBLIC_KEY = os.environ.get('STRIPE_PUBLIC_KEY', '') +STRIPE_SECRET_KEY = os.environ.get('STRIPE_SECRET_KEY', '') +STRIPE_LIVE_MODE = os.environ.get('STRIPE_LIVE_MODE') # Django Meta META_SITE_PROTOCOL = os.environ.get('META_SITE_PROTOCOL', 'https') META_SITE_DOMAIN = os.environ.get('META_SITE_DOMAIN', 'www.weallcode.org') diff --git a/coderdojochi/signals_handlers.py b/coderdojochi/signals_handlers.py index feab2e55..06371a36 100644 --- a/coderdojochi/signals_handlers.py +++ b/coderdojochi/signals_handlers.py @@ -10,7 +10,7 @@ from paypal.standard.ipn.signals import valid_ipn_received from paypal.standard.models import ST_PP_COMPLETED -from coderdojochi.models import Donation, Mentor +from coderdojochi.models import Mentor from coderdojochi.util import email diff --git a/coderdojochi/templates/_topnav.html b/coderdojochi/templates/_topnav.html index d98c6b53..228d100b 100644 --- a/coderdojochi/templates/_topnav.html +++ b/coderdojochi/templates/_topnav.html @@ -18,7 +18,7 @@We All Code is a registered non-profit organization supported entirely by...you! Please help us continue our mission by donating a small amount to our cause. Thank you!
- - {% if referral_disclaimer %} -{{ referral_disclaimer }}
- {% endif %} - - {{ form.render }} -We All Code is a registered non-profit organization supported entirely by...you! Please help us continue our mission by donating a small amount to our cause. Thank you!
+We All Code is a registered non-profit organization supported entirely by...you! Please help us continue our mission by donating a small amount to our cause. Thank you!
+ +