Fixed some errors

[surfer26th]

(1) Fixed Error in _subscription_status.html -- line 9 (issue#52)

Line 9 should be:
{% if request.user.customer.current_subscription.plan and request.user.customer.card_kind %}

Currently, it is as shown below:
{% with request.user.customer.current_subscription as subscription %}
{% if subscription %}
{% if subscription.status == "active" %}

(2) Line 6 in _change_plan_form.html - Need to change the word "Your" to "You" (issue #51)

(3) choices in FormPlan are not sorted in alpha order (issue #48)

I made these changes to forms.py

from django import forms
from payments.settings import PLAN_CHOICES
--> sorted_plan_choices = sorted(PLAN_CHOICES)

class PlanForm(forms.Form):

--> plan = forms.ChoiceField(choices=sorted_plan_choices+ [("", "-------")])

(4) Failed syncdb with django-jsonfield. Installed jsonfield and it worked (issue #45)
added jsonfield to setup.py instead of django-jsonfield

(5) plan_init does not accommodate Trials (issue #47)
added trial_period_days to plan_init command

[paltman]

@surfer26th thanks for this pull request. it looks like you had forked awhile ago and some of these changes were already added to the repo. in any event I can't merge it until you branch is updated against my master branch. can you do that and push to your branch again?

[surfer26th]

Patrick,
Refreshed my fork, made the changes, and re-submitted the pull.
Thank you!
Ted

--- On Wed, 5/1/13, Patrick Altman [email protected] wrote:

From: Patrick Altman [email protected]
Subject: Re: [django-stripe-payments] Fixed some errors (#54)
To: "eldarion/django-stripe-payments" [email protected]
Cc: "Ted Chen" [email protected]
Date: Wednesday, May 1, 2013, 7:11 AM

@surfer26th thanks for this pull request. it looks like you had forked awhile ago and some of these changes were already added to the repo. in any event I can't merge it until you branch is updated against my master branch. can you do that and push to your branch again?

—
Reply to this email directly or view it on GitHub.

[surfer26th]

Done.

--- On Wed, 5/1/13, Patrick Altman [email protected] wrote:

From: Patrick Altman [email protected]
Subject: Re: [django-stripe-payments] Fixed some errors (#54)
To: "eldarion/django-stripe-payments" [email protected]
Cc: "Ted Chen" [email protected]
Date: Wednesday, May 1, 2013, 7:11 AM

@surfer26th thanks for this pull request. it looks like you had forked awhile ago and some of these changes were already added to the repo. in any event I can't merge it until you branch is updated against my master branch. can you do that and push to your branch again?

—
Reply to this email directly or view it on GitHub.

[paltman]

Closing this one as it seemed to be replaced by #55