Commit graph

195 commits

Author SHA1 Message Date
Samuel Clay
01ad0e8656 Paypal refunds are now working. Need to add partial balances when upgrading tiers on paypal. Eventually need to think about refunds for switching providers. 2022-02-10 13:40:07 -05:00
Samuel Clay
0a2a9607f0 Canceling paypal subscriptions correctly. Now need to test switching between the two flawlessly and ensure messaging is always consistent. Also needs refunds. 2022-02-09 12:26:35 -05:00
Samuel Clay
403af0a486 Payments are now reliably going through. Now to handle cancelations adn refunds with the new paypal api. 2022-02-08 21:16:12 -05:00
Samuel Clay
aab86a60d9 Store all seen paypal subscriber ids so we can cancel the second newest one when turning on a new subscription. 2022-02-08 20:56:23 -05:00
Samuel Clay
a1517b6266 Adding paypal sub id and paypalrestsdk library. Paypal has what it needs, now to hook up the API which is still unauthorized. 2022-02-08 12:49:40 -05:00
Samuel Clay
c18c16a0c3 Turning off shipping, adding user_id to subscription, and upgrading user. Now need renewals and cancellations. 2022-02-04 17:10:23 -05:00
Samuel Clay
2ce93043b9 Typo on return url 2022-01-27 12:33:37 -05:00
Samuel Clay
76e2eabda5 With this, all Stripe billing is complete. Subscribe, switch plans, upgrade plans, proration, and cancel plans all work now. Need to hookup Paypal and send upgrade emails. 2022-01-26 16:21:24 -05:00
Samuel Clay
6615745aac Showing next invoice. 2022-01-26 15:51:26 -05:00
Samuel Clay
26ce1b3e6b Invociing immediately on pro-rated plan switch. 2022-01-25 17:47:46 -05:00
Samuel Clay
07fe59cb57 Upgrading subscriptions with stripe now works, even pro-rated. Need to hook up Paypal and fix all billing inconsistencies. 2022-01-25 17:26:24 -05:00
Samuel Clay
71b9b2f3d8 Paypal/stripe return needs user profile for JS. 2022-01-25 10:26:45 -05:00
Samuel Clay
31936eec4e Using stripe customer if present. 2022-01-24 16:27:37 -05:00
Samuel Clay
8140df0d7b Directing to plan-adjusted stripe checkout. Needs billing. 2022-01-21 17:27:36 -05:00
Samuel Clay
d9276d5e82 Preparing Stripe Checkout. 2022-01-21 16:41:22 -05:00
Samuel Clay
0baaa951b9 Adding preference for changing days of unreads. Need to kick off a re-counter on preference change. 2022-01-18 12:40:49 -05:00
Samuel Clay
f238bc7b5c Wrong Stripe exceptions. 2021-04-29 15:25:02 -04:00
Samuel Clay
ef7c46a686 Handling new Stripe api errors. 2021-01-26 12:24:24 -05:00
Samuel Clay
8cf070a72d Merge branch 'master' into dashboard3
* master:
  Removing old types field. Needed to upgrade to mongo 3.4.
  Checking if a feed has any notifications on it, set a max of 30 min fetch (yes this is a pretty good way of getting your feeds to fetch faster, but youll have to deal with the notifications).
  Fix task fetch monitor.
  Attempting to see iOS premium status over email.
  Handling work queue missing error.
2021-01-23 17:55:01 -05:00
Samuel Clay
6f9dbded8e Attempting to see iOS premium status over email. 2021-01-20 21:28:01 -05:00
Samuel Clay
6e07dbaf0f Merge branch 'master' into docker_django3.1
* master: (22 commits)
  Whoops
  Better logging for broken paypal ipns.
  Adding RSS Tracker for Windows to Goodies.
  Refactoring socketio so real-time works around username restrictions.
  Socket.IO v3 on the server too.
  Switching to Socket.IO v3.
  Haproxy splitting for socketio 3
  Socket.io 3
  Handling missing feed.
  Only nb.local.com uses ports for websockets.
  Adding GrazeTEN
  Full node install on setup.
  Updating toprc
  Changing mongodb server.
  Fixing toprc
  Attempting to collect queries for 1% of requests by using DEBUG.
  Fixing mongo install.
  Recalculating premium expiration to take into account forced expirations after gifts.
  Fixing never expire -> 1 year
  Adding 1 year expire to admin.
  ...
2021-01-05 19:12:19 -05:00
Samuel Clay
49e058d9fa Fixing never expire -> 1 year 2021-01-03 14:05:17 -05:00
Samuel Clay
83d7357306 Adding 1 year expire to admin. 2021-01-03 13:59:33 -05:00
Samuel Clay
8371c635f7 Merge branch 'master' into django2.0
* master: (27 commits)
  Removing log override
  Moving logging over to the newsblur log.
  Fixing search indexer background task for new celery.
  Attempting to add gunicorn errors to console/log.
  Better handling of missing subs.
  Handling missing user sub on feed delete.
  Correct encoding for strings on systems that don't have utf-8 as default encoding.
  Writing in the real urllib3 dependency for requests.
  Upgrading requests due to urllib3 incompatibility.
  Login required should use the next parameter.
  Upgrading django oauth toolkit for django 1.11.
  Handling newsletters with multiple recipients.
  Extracting image urls sometimes fails.
  Handling ajax errors in json views.
  Adding timeouts to most outbound requests.
  Sentry SDK 0.19.4.
  Removing imperfect proxy warning for every story.
  Found four more GET/POST crosses.
  Feed unread count may need a POST.
  Namespacing settings.
  ...
2020-12-08 09:09:25 -05:00
Samuel Clay
aff7d09962 Attempting to add gunicorn errors to console/log. 2020-12-07 13:55:28 -05:00
Samuel Clay
d0ca50d9d6 Login required should use the next parameter. 2020-12-07 11:42:23 -05:00
Samuel Clay
b89e7dc429 Merge branch 'django1.11' into django2.0
* django1.11: (152 commits)
  request.raw_post_data -> request.body (django 1.6)
  Upgrading pgbouncer to 1.15.0.
  Finishing off Postgresql 13 upgrade.
  Upgrading to Postgresql 13.
  Ubuntu 20.04
  Fixing supervisor path issues
  Upgrading setuptools
  Fixing flask
  Handling over capacity for twitter.
  Max length for image_urls.
  Properly filtering newsletter feeds.
  Fixing issue with text importer on feed-less urls.
  Removing dependency, fixing encoding issue for pages.
  Fixing DB Monitor.
  Updating User Agent for all fetchers.
  Ignoring VSCode.
  Fixing DB Monitor.
  Updating User Agent for all fetchers.
  Ignoring VSCode.
  Fixing Statistics by fixing how timezones are handled.
  ...
2020-12-03 14:04:26 -05:00
Samuel Clay
c257074036 Fixing both Stripe form and Login form. 2020-11-13 21:14:41 -05:00
Samuel Clay
8427be6862 Upgrading Sentry API 2020-11-13 11:18:18 -05:00
Samuel Clay
fd562bf397 Merge branch 'django1.9' into django1.10
* django1.9:
  Datetime needs to evaluate.
  Testing backups.
  Fixing missing Android receipt.
  Adding controls to twitter videos.
2020-11-12 15:40:21 -05:00
Samuel Clay
f7e74b13d2 Merge branch 'django1.7' into django1.8
* django1.7:
  Datetime needs to evaluate.
  Testing backups.
  Fixing missing Android receipt.
  Adding controls to twitter videos.
2020-11-12 15:39:23 -05:00
Samuel Clay
df587a8268 Merge branch 'django1.6' into django1.7
* django1.6:
  Datetime needs to evaluate.
  Testing backups.
  Fixing missing Android receipt.
  Adding controls to twitter videos.
2020-11-12 15:39:14 -05:00
Samuel Clay
2592254d95 Fixing missing Android receipt. 2020-11-12 10:11:48 -05:00
Samuel Clay
caad01e194 Merge branch 'django1.9' into django1.10
* django1.9: (66 commits)
  Styling new features for dark mode.
  Adding style option for grid height. XS/S/M/L/XL
  Adding applinks to .well-known/apple app json. For #1361.
  #1377 (mark as read for titles only)
  iOS: project upgrade check
  https for all links.
  Saving saved story slugs.
  Slugifying saved story tags that have no slugs.
  Adding ssl to db machines.
  Fixing subscription cancelation error messge.
  Android v10.1b7.
  #1364 In App Review
  Showing addresses in email story share.
  #1369 Notification alerts. Skip old stories
  Android v10.1b6.
  iOS v10.1.1.
  Fixing backgrounds in newsletters.
  Fixing newsltter check which inaccurately added newsletter div to all stories.
  Styling side option buttons in iOS to be cleaner.
  iOS v10.1.
  ...
2020-11-09 11:38:28 -05:00
Samuel Clay
0981286f56 Merge branch 'django1.7' into django1.8
* django1.7: (66 commits)
  Styling new features for dark mode.
  Adding style option for grid height. XS/S/M/L/XL
  Adding applinks to .well-known/apple app json. For #1361.
  #1377 (mark as read for titles only)
  iOS: project upgrade check
  https for all links.
  Saving saved story slugs.
  Slugifying saved story tags that have no slugs.
  Adding ssl to db machines.
  Fixing subscription cancelation error messge.
  Android v10.1b7.
  #1364 In App Review
  Showing addresses in email story share.
  #1369 Notification alerts. Skip old stories
  Android v10.1b6.
  iOS v10.1.1.
  Fixing backgrounds in newsletters.
  Fixing newsltter check which inaccurately added newsletter div to all stories.
  Styling side option buttons in iOS to be cleaner.
  iOS v10.1.
  ...
2020-11-09 11:38:13 -05:00
Samuel Clay
7c447c0fbc Merge branch 'django1.6' into django1.7
* django1.6: (66 commits)
  Styling new features for dark mode.
  Adding style option for grid height. XS/S/M/L/XL
  Adding applinks to .well-known/apple app json. For #1361.
  #1377 (mark as read for titles only)
  iOS: project upgrade check
  https for all links.
  Saving saved story slugs.
  Slugifying saved story tags that have no slugs.
  Adding ssl to db machines.
  Fixing subscription cancelation error messge.
  Android v10.1b7.
  #1364 In App Review
  Showing addresses in email story share.
  #1369 Notification alerts. Skip old stories
  Android v10.1b6.
  iOS v10.1.1.
  Fixing backgrounds in newsletters.
  Fixing newsltter check which inaccurately added newsletter div to all stories.
  Styling side option buttons in iOS to be cleaner.
  iOS v10.1.
  ...
2020-11-09 11:38:01 -05:00
Jason Ghent
fe9c8fd3c5
Respect ENFORCE_SIGNUP_CAPTCHA in profile signup 2020-08-31 22:30:57 -04:00
Samuel Clay
d2045b7d06 Adding Android premium activation and receipt saving. For #1343. 2020-08-25 21:08:27 -04:00
Jonathan Math
524045fdf6 add backend argument to login_user functions because there are two backends 2020-07-03 02:20:42 -04:00
Samuel Clay
0d6cb69548 Merge branch 'django1.11' into django2.0
* django1.11: (73 commits)
  Switching to new celery 4 standalone binary.
  Fixing various mongo data calls.
  Upgrading to latest celery 4 (holy moly), which required some big changes to project layout. Still needs supervisor scripts updated.
  Removing unused log on cookies.
  I believe this Context wrapping is still preserved. See this django ticket: https://code.djangoproject.com/ticket/28125. Reverting this fixes the error, so I'm assuming this is that type of render.
  Have to revert 3f122d5e03 because this broke existing sessions (logged me out) because the model has changed and the serialized model stored in redis no longer matches. Whew, this took a while to figure out.
  Upgrading redis cache.
  Adding cookies to path inspector.
  Removing dupe db log.
  Fixing missing DB logs (redis and mongo) due to this change in django 1.8: "connections.queries is now a read-only attribute."
  Removing migrations that set a default date of 2020-05-08. Not sure why this was committed. I thought we resolved the issue with default datetimes?
  Fixing CallableBool.
  Missing import
  Fixing runtime errors on django 1.10
  Fixing OAuth connect.
  Fixing various django1.9 issues, mainly around templates.
  BASE_DIR
  Not every story is from a feed.
  Styling background colors for newsletters.
  Styling more newsletter elements.
  ...
2020-06-30 12:34:59 -04:00
Samuel Clay
1dbfd87404 Merge branch 'django1.9' into django1.10
* django1.9: (122 commits)
  Fixing OAuth connect.
  Fixing various django1.9 issues, mainly around templates.
  BASE_DIR
  Not every story is from a feed.
  Styling background colors for newsletters.
  Styling more newsletter elements.
  Using the correct attribute.
  Typo in template
  Attempting to style newsletters in dark mode.
  Loading dark theme if selected on load.
  Adding scrollbar colors.
  Using request body for ios subscription.
  Django 1.9.13.
  De-vendorizing django-paypal, adding to requirements.txt.
  Specifying SESSION_SERIALIZER, which changes from PickleSerializer to JsonSerializer in django 1.5 to 1.6.
  Fixing broken auto-dark theme.
  Increasing contrast for unread counts.
  Fixing tag colors and story traversal button borders. For https://forum.newsblur.com/t/dark-mode-minor-tweak-suggestion/8225
  Cleaning up Twitter lists.
  Updating next/previous buttons and search icon.
  ...
2020-06-26 08:45:40 -04:00
Samuel Clay
fcbbd4ac25 Merge branch 'django1.7' into django1.8
* django1.7:
  Not every story is from a feed.
  Styling background colors for newsletters.
  Styling more newsletter elements.
  Using the correct attribute.
  Typo in template
  Attempting to style newsletters in dark mode.
  Loading dark theme if selected on load.
  Adding scrollbar colors.
  Using request body for ios subscription.
2020-06-25 17:46:40 -04:00
Samuel Clay
c5ea5f8877 Merge branch 'django1.6' into django1.7
* django1.6:
  Not every story is from a feed.
  Styling background colors for newsletters.
  Styling more newsletter elements.
  Using the correct attribute.
  Typo in template
  Attempting to style newsletters in dark mode.
  Loading dark theme if selected on load.
  Adding scrollbar colors.
  Using request body for ios subscription.
2020-06-25 17:46:35 -04:00
Samuel Clay
cef0ebf66d Using request body for ios subscription. 2020-06-25 09:30:59 -04:00
Samuel Clay
cdda78d916 De-vendorizing django-paypal, adding to requirements.txt. 2020-06-24 16:59:43 -04:00
Samuel Clay
540587e01e Merge branch 'django1.7' into django1.8
* django1.7: (108 commits)
  Specifying SESSION_SERIALIZER, which changes from PickleSerializer to JsonSerializer in django 1.5 to 1.6.
  Fixing broken auto-dark theme.
  Increasing contrast for unread counts.
  Fixing tag colors and story traversal button borders. For https://forum.newsblur.com/t/dark-mode-minor-tweak-suggestion/8225
  Cleaning up Twitter lists.
  Updating next/previous buttons and search icon.
  No ECMAScript 6 yet. Wait until it's the only change.
  Mark read button
  Older httplib2 doesn't have setuptools legacy issue.
  Upgrading redis session.
  Upgrading redis session.
  Django 1.6.11, not requiring fields=__all__. @sictiru, wondering if this is necessary?
  Better newsletter check
  Adding allowlist (whitelist) for RSS Bridge.
  Removing last vestigates of Google Analytics.
  New spinners.
  Cleaning up profile modal.
  Scratch that, better bright.
  Darkening light blue links and graphs.
  Better cross browser watching for changing theme.
  ...
2020-06-24 16:34:18 -04:00
Samuel Clay
d88dab454a Merge branch 'django1.6' into django1.7
* django1.6: (109 commits)
  Specifying SESSION_SERIALIZER, which changes from PickleSerializer to JsonSerializer in django 1.5 to 1.6.
  Fixing broken auto-dark theme.
  Increasing contrast for unread counts.
  Fixing tag colors and story traversal button borders. For https://forum.newsblur.com/t/dark-mode-minor-tweak-suggestion/8225
  Cleaning up Twitter lists.
  Updating next/previous buttons and search icon.
  No ECMAScript 6 yet. Wait until it's the only change.
  Mark read button
  Older httplib2 doesn't have setuptools legacy issue.
  Upgrading redis session.
  Upgrading redis session.
  Django 1.6.11, not requiring fields=__all__. @sictiru, wondering if this is necessary?
  Better newsletter check
  Adding allowlist (whitelist) for RSS Bridge.
  Removing last vestigates of Google Analytics.
  New spinners.
  Cleaning up profile modal.
  Scratch that, better bright.
  Darkening light blue links and graphs.
  Better cross browser watching for changing theme.
  ...
2020-06-24 16:04:10 -04:00
Jonathan Math
af6db197d5 Merge remote-tracking branch 'origin/django1.6' into django2.0 2020-06-23 00:46:40 -04:00
Jonathan Math
ba948e56f5 add request parameter to render function in apps/profiles/views.py login view 2020-06-20 00:28:19 -04:00
Jonathan Math
7112b19f18 upgrade middleware classes and run 2to3 on apps/profile/ 2020-06-17 00:40:16 -04:00