-
Notifications
You must be signed in to change notification settings - Fork 286
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Create invoice item #436
Open
Paul424
wants to merge
24
commits into
pinax:original
Choose a base branch
from
Paul424:create-invoice-item
base: original
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Create invoice item #436
Changes from 15 commits
Commits
Show all changes
24 commits
Select commit
Hold shift + click to select a range
a03b657
ideal support; sry no tests yet!
Paul424 bae60ab
Extend webhooks required for ideal (source status) and add relevant f…
Paul424 c8acb98
Allow for source in update subscription
Paul424 c0acca1
Merge branch 'master' of github.com:Paul424/pinax-stripe
Paul424 3226b70
Merge branch 'master' of github.com:pinax/pinax-stripe
Paul424 8011951
Revert "Allow for source in update subscription"
Paul424 b9e56ed
Revert "Extend webhooks required for ideal (source status) and add re…
Paul424 810a066
Revert "ideal support; sry no tests yet!"
Paul424 4501b0d
Add action to create invoice item
Paul424 54bf5c1
Merge branch 'master' of github.com:pinax/pinax-stripe
Paul424 6c721ea
Merge branch 'master' into create-invoice-item
Paul424 95145cd
Support billing/due_date on subscription and invoice + support adding…
Paul424 9e472e9
Update after review
Paul424 9c1660c
Merge branch 'master' into create-invoice-item
Paul424 04a6d1c
Merge migrations
Paul424 3211821
Add tests
Paul424 975bb9b
Fix issue that subscription is not sync'ed when change made from Stri…
Paul424 e111401
Merge branch 'master' of github.com:pinax/pinax-stripe
Paul424 b586d3b
Merge branch 'master' of github.com:pinax/pinax-stripe
Paul424 027d1e1
Merge branch 'master' into create-invoice-item + fix migrations (0010…
Paul424 27bd049
Fix default in migration
Paul424 01c88b6
Fix new tests
Paul424 0c2ced3
Fix tests
Paul424 2e9b3ef
Revert fix migrations to enable delivery to master
Paul424 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
# -*- coding: utf-8 -*- | ||
# Generated by Django 1.10.7 on 2017-10-19 13:21 | ||
from __future__ import unicode_literals | ||
|
||
from django.db import migrations, models | ||
import jsonfield.fields | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('pinax_stripe', '0010_connect'), | ||
] | ||
|
||
operations = [ | ||
migrations.AddField( | ||
model_name='invoice', | ||
name='billing', | ||
field=models.CharField(default='charge_automatically', max_length=32), | ||
), | ||
migrations.AddField( | ||
model_name='invoice', | ||
name='due_date', | ||
field=models.DateTimeField(blank=True, null=True), | ||
), | ||
migrations.AddField( | ||
model_name='invoice', | ||
name='forgiven', | ||
field=models.BooleanField(default=False), | ||
), | ||
migrations.AddField( | ||
model_name='invoice', | ||
name='metadata', | ||
field=jsonfield.fields.JSONField(null=True), | ||
), | ||
migrations.AddField( | ||
model_name='subscription', | ||
name='billing', | ||
field=models.CharField(default='charge_automatically', max_length=32), | ||
), | ||
migrations.AddField( | ||
model_name='subscription', | ||
name='days_until_due', | ||
field=models.IntegerField(blank=True, default=None, null=True), | ||
), | ||
migrations.AlterField( | ||
model_name='subscription', | ||
name='application_fee_percent', | ||
field=models.DecimalField(blank=True, decimal_places=2, default=None, max_digits=3, null=True), | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
# -*- coding: utf-8 -*- | ||
# Generated by Django 1.10.7 on 2017-10-26 15:44 | ||
from __future__ import unicode_literals | ||
|
||
from django.db import migrations, models | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('pinax_stripe', '0011_auto_20171019_1321'), | ||
] | ||
|
||
operations = [ | ||
migrations.AlterField( | ||
model_name='invoice', | ||
name='billing', | ||
field=models.CharField(choices=[('charge_automatically', 'Charge automatically'), ('send_invoice', 'Send invoice')], default='charge_automatically', max_length=32), | ||
), | ||
migrations.AlterField( | ||
model_name='subscription', | ||
name='billing', | ||
field=models.CharField(choices=[('charge_automatically', 'Charge automatically'), ('send_invoice', 'Send invoice')], default='charge_automatically', max_length=32), | ||
), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
# -*- coding: utf-8 -*- | ||
# Generated by Django 1.10.7 on 2017-10-30 12:42 | ||
from __future__ import unicode_literals | ||
|
||
from django.db import migrations | ||
|
||
|
||
class Migration(migrations.Migration): | ||
|
||
dependencies = [ | ||
('pinax_stripe', '0013_auto_20171025_2153'), | ||
('pinax_stripe', '0012_auto_20171026_1544'), | ||
] | ||
|
||
operations = [ | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
s/paid/forgiven/ ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Or both?