diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py index 7cbba5504d1ff8c541c7dbf916e147dd47aad011..2ee3ebdb45a65b396c97eb16fcd85c2f8e9dcc2e 100644 --- a/pinaxcon/settings.py +++ b/pinaxcon/settings.py @@ -156,6 +156,10 @@ INSTALLED_APPS = [ # Registrasion "registrasion", + # Registrasion-stipe + "pinax.stripe", + "registripe", + #admin - required by registrasion ?? "nested_admin", @@ -223,6 +227,9 @@ PROPOSAL_FORMS = { PINAX_PAGES_HOOKSET = "pinaxcon.hooks.PinaxPagesHookSet" PINAX_BOXES_HOOKSET = "pinaxcon.hooks.PinaxBoxesHookSet" +PINAX_STRIPE_PUBLIC_KEY = os.environ.get("STRIPE_PUBLIC_KEY", "your test public key") +PINAX_STRIPE_SECRET_KEY = os.environ.get("STRIPE_SECRET_KEY", "your test secret key") + # Registrasion Attendee profile model ATTENDEE_PROFILE_MODEL = "pinaxcon.registrasion.models.AttendeeProfile" # Registrasion attendee profile form -- must act on ATTENDEE_PROFILE_FORM diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py index f49d94b18da2e4d9bf83c28255a8f0311a8b2124..0c2901e94e761f9fbfe8f25cfae07f9c10cb53d6 100644 --- a/pinaxcon/urls.py +++ b/pinaxcon/urls.py @@ -24,13 +24,16 @@ urlpatterns = [ url(r"^teams/", include("symposion.teams.urls")), + # Demo payment gateway and related features + url(r"^register/pinaxcon/", include("pinaxcon.registrasion.urls")), + + # Demo payment gateway and related features + url(r"^register/payments/", include("registripe.urls")), + # Required by registrasion url(r'^register/', include('registrasion.urls')), url(r'^nested_admin/', include('nested_admin.urls')), - # Demo payment gateway and related features - url(r"^register/pinaxcon/", include("pinaxcon.registrasion.urls")), - url(r"^boxes/", include("pinax.boxes.urls")), # Catch-all MUST go last. diff --git a/requirements.txt b/requirements.txt index e3c2f37e35a01c7e4ada5e4b2cfc7360a8b62060..5e935073e3f6b2118654e34f2cec4ea2c4e96f98 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,5 +13,6 @@ django-nose==1.4.3 coverage==4.0.3 # Registrasion -registrasion==0.1.0 +https://github.com/chrisjrn/registrasion/tarball/master#egg=registrasion https://github.com/pinax/symposion/tarball/ad81810#egg=symposion +https://github.com/chrisjrn/registrasion-stripe/tarball/master#egg=registrasion-stripe