Prepares registrasion-demo to match the 0.1 release of registrasion.

README.md

@@ -1,61 +0,0 @@
-PinaxCon
-=========
-
-Pinax
-------
-
-[![Join us on Slack](http://slack.pinaxproject.com/badge.svg)](http://slack.pinaxproject.com/)
-
-Pinax is an open-source platform built on the Django Web Framework. It is an ecosystem of reusable Django apps, themes, and starter project templates.
-This collection can be found at http://pinaxproject.com.
-
-
-PinaxCon
----------
-`PinaxCon` is a working demo of Symposion and the Symposion Starter Project.  Online at:
-
-http://conference.pinaxproject.com/ (https://ky395.us2.gondor.io/ until DNS is configured)
-
-
-
-Getting Started
-----------------
-
-Make sure you are using a virtual environment of some sort (e.g. `virtualenv` or
-`pyenv`).
-
-```
-createdb pinaxcon
-pip install -r requirements.txt
-./manage.py migrate
-./manage.py loaddata sites conference proposal_base sitetree sponsor_benefits sponsor_levels
-./manage.py runserver
-```
-
-
-Documentation
---------------
-
-The `PinaxCon` documentation is currently under construction. If you would like to help us write documentation, please join our Slack team and let us know! The Pinax documentation is available at http://pinaxproject.com/pinax/.
-
-
-Contribute
-----------------
-
-See [this blog post](http://blog.pinaxproject.com/2016/02/26/recap-february-pinax-hangout/) including a video, or our [How to Contribute](http://pinaxproject.com/pinax/how_to_contribute/) section for an overview on how contributing to Pinax works. For concrete contribution ideas, please see our [Ways to Contribute/What We Need Help With](http://pinaxproject.com/pinax/ways_to_contribute/) section.
-
-In case of any questions we recommend you [join our Pinax Slack team](http://slack.pinaxproject.com) and ping us there instead of creating an issue on GitHub. Creating issues on GitHub is of course also valid but we are usually able to help you faster if you ping us in Slack.
-
-We also highly recommend reading our [Open Source and Self-Care blog post](http://blog.pinaxproject.com/2016/01/19/open-source-and-self-care/).  
-
-
-Code of Conduct
------------------
-
-In order to foster a kind, inclusive, and harassment-free community, the Pinax Project has a Code of Conduct, which can be found here  http://pinaxproject.com/pinax/code_of_conduct/. We ask you to treat everyone as a smart human programmer that shares an interest in Python, Django, and Pinax with you.
-
-
-Pinax Project Blog and Twitter
--------------------------------
-
-For updates and news regarding the Pinax Project, please follow us on Twitter at [@pinaxproject](https://twitter.com/pinaxproject) and check out our blog http://blog.pinaxproject.com.

README.rst

@@ -0,0 +1,17 @@
+registrasion-demo
+=================
+
+PinaxCon
+---------
+`PinaxCon` is a working demo of Symposion and the Symposion Starter Project. It usually lives at https://github.com/pinax/PinaxCon
+
+This is a fork of PinaxCon to demonstrate Registrasion, a registration package that works well with Symposion. You can find Registrasion at https://github.com/chrisjrn/registrasion
+
+Registrasion has relaively complete docs at http://registrasion.readthedocs.org
+
+
+What is the point of this?
+--------------------------
+This project provides some starter templates for much of the functionality of Registrasion, as well as demos of how to make payments and enter user profiles.
+
+If you care to, you can also use this project as a starting point for your own Registrasion-based site.

fixtures/registrasion.json

@@ -368,7 +368,7 @@
   }
 },
 {
-  "model": "registrasion.enablingconditionbase",
+  "model": "registrasion.flagbase",
   "pk": 1,
   "fields": {
     "description": "Extra accommodation depends on Accommodation",

pinaxcon/registrasion/models.py

@@ -11,7 +11,7 @@ class AttendeeProfile(rego.AttendeeProfileBase):
 
     def invoice_recipient(self):
         if self.company:
-            base = "%(name_per_invoice)s c/- %(company)s"
+            base = "\n%(company)s\nAttention: %(name_per_invoice)s"
         else:
             base = "%(name_per_invoice)s"
         return base % self.__dict__

pinaxcon/templates/registrasion/invoice.html

@@ -25,7 +25,8 @@
   {% if user.is_staff %}
   <div>
     {% if user.is_staff %}
-      <a class="btn btn-default" href="{% url "manual_payment" invoice.id %}">Apply manual payment/refund</a>
+    <a class="btn btn-default" href="{% url "manual_payment" invoice.id %}">Apply manual payment/refund</a>
+    <a class="btn btn-default" href="{% url "refund" invoice.id %}">Refund by issuing credit note</a>
     {% endif %}
   </div>
   {% endif %}
@@ -43,7 +44,7 @@
     {% if not invoice.is_void %}
       <li><strong>Due:</strong> {{ invoice.due_time|date:"DATETIME_FORMAT"}}</li>
     {% endif %}
-    <li><strong>Attention:</strong> {{ invoice_user.attendee.attendeeprofilebase.invoice_recipient }}</li>
+    <li><strong>Recipient:</strong> {{ invoice_user.attendee.attendeeprofilebase.invoice_recipient|linebreaksbr}}</li>
   </ul>
 {% endwith %}
 

requirements.txt

@@ -8,6 +8,10 @@ dj-database-url==0.4.0
 pinax-pages==0.4.2
 pinax-boxes==2.1.2
 
-# run off of master for now
+# For testing
-git+https://github.com/pinax/symposion.git
+django-nose==1.4.3
-git+https://github.com/chrisjrn/registrasion.git@demo_site_integration
+coverage==4.0.3
+
+# Registrasion
+registrasion==0.1.0
+https://github.com/pinax/symposion/tarball/ad81810#egg=symposion