Skip to content
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

[WIP/RFC] integration branch review #440

Open
wants to merge 294 commits into
base: original
Choose a base branch
from
Open

Conversation

blueyed
Copy link
Contributor

@blueyed blueyed commented Oct 24, 2017

This is just for review / comments - a comparison to our "next" branch, where we merge things already that are useful to us, and which might also contain things not being submitted already.

This is not meant to be merged as-is, but rather to become empty.

ticosax and others added 30 commits October 19, 2017 14:56
sync_invoice_from_stripe_data: use stripe_account
Enhance admin with connect search
Our fork doesn't need templates
remove also customes in migraiton for consistency
blueyed and others added 26 commits December 4, 2017 15:40
Conflicts:
	pinax/stripe/migrations/0011_rename_account_transfers_payout.py
	pinax/stripe/migrations/0013_charge_outcome.py
	pinax/stripe/tests/test_webhooks.py
	pinax/stripe/webhooks.py
This also fixes some event fixtures.

Fixes pinax#467.
This removes he following from
0010_connect_squashed_0026_merge_20171106_2259's `replaces`:

    ('pinax_stripe', '0025_remove_subscription_stripe_account'),
    ('pinax_stripe', '0016_auto_20171106_1234'),
    ('pinax_stripe', '0014_auto_20171026_1304'),
    ('pinax_stripe', '0017_merge_20171106_2201'),
    ('pinax_stripe', '0026_merge_20171106_2259'),

It was necessary for me to get the
0010_connect_squashed_0026_merge_20171106_2259 migration to be
recognized when in the following state (`manage.py showmigrations`):

    [X] 0010_connect
    [X] 0011_rename_account_transfers_payout
    [X] 0011_auto_20171121_1648
    [X] 0012_merge_20171121_1652
    [X] 0013_charge_outcome
    [ ] 0014_blank_with_null
    [ ] 0015_blank_account_legal_entity_dob
Conflicts:
	.circleci/config.yml
	pinax/stripe/admin.py
Support stripe-python 2.0
Conflicts:
	pinax/stripe/actions/coupons.py
	pinax/stripe/tests/test_actions.py
This is required with users through connected accounts.
user_search_fields: include users
Fix ChargeWebhook for charge.dispute events
increased stripe_publishable_key data length for new stripe api keys
@paltman paltman changed the base branch from master to 4.x November 26, 2021 16:16
@paltman paltman added the Original The original full pinax-stripe version with cached models and actions service layer label Nov 26, 2021
@paltman paltman changed the base branch from 4.x to original November 26, 2021 17:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Original The original full pinax-stripe version with cached models and actions service layer
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants