Commit graph

4733 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
0dc315b568 Adding paypal ids. Still needs to save old paypal ids when new ones come in. 2022-02-08 18:40:07 -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
88d07b143c Merge branch 'master' into pro
* master: (31 commits)
  Adding postgres backup log.
  Handling operation failures in flask metrics.
  Locking consul to a working version. Also changing flask status code response to handle custom status codes.
  Explicitly uploading mongo backups
  Only need date once in filename
  Rotating mongo backups
  Using full path for progress.
  Showing full path of postgres backup.
  Separating out restoring backups and storing backups.
  Moving to postgres backup directory.
  Executable postgres backup script.
  Compressing Postgres db sql backup.
  Adding date to tarball to allow for versioning.
  Correcting permissions on mongo backup
  Fixing mongo upload to s3 by using host networking mode.
  Removing unused backup code.
  Forgot import
  Adding progress bar to mongo backup.
  Refactoring aws keys for mongo backups.
  Moving mongo backups
  ...
2022-02-04 13:55:38 -05:00
Samuel Clay
8c58e3aaad Correcting url in widget on standalones. 2022-02-02 16:02:40 -05:00
Samuel Clay
99c4faaa79 Correcting story limit in widget. 2022-02-02 15:44:39 -05:00
Samuel Clay
4df9858eb0 Adding /reader/river_stories_widget which downloads the first image in each story and adds it inline as base64 encoded. 2022-02-02 15:11:50 -05:00
Samuel Clay
7889fe4cf0 Fixing bookmarklet and saved story tags. 2022-01-28 17:05: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
cebce60096 Cleaning up premium renewal. Needs workflow between upgrading/downgrading plans. 2022-01-26 10:53:56 -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
813f5dec9f Adding premium_renewal profile field to track premium cancellations. 2022-01-25 16:08:56 -05:00
Samuel Clay
39047ee938 Merge branch 'master' into pro
* master:
  Task deploy needs single sentry update.
  Turning off PuSH for standalone installs.
2022-01-25 15:46:25 -05:00
Samuel Clay
6a61620d32 Turning off PuSH for standalone installs. 2022-01-25 15:27:29 -05:00
Samuel Clay
71b9b2f3d8 Paypal/stripe return needs user profile for JS. 2022-01-25 10:26:45 -05:00
Samuel Clay
b0f1c5b91b Renaming stripe checkout 2022-01-24 17:33:11 -05:00
Samuel Clay
1b9a6f54d5 Activating premium archive subscription. 2022-01-24 17:23:25 -05:00
Samuel Clay
e47eb575e5 Merge branch 'master' into pro
* master:
  Adding zebra logger.
  Using correct logger.
  Logging stripe webhooks.
  Adding Apple MerchantID for Apple Pay.
2022-01-24 16:38:09 -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
dc130ed3ec Adding Apple MerchantID for Apple Pay. 2022-01-21 16:44:03 -05:00
Samuel Clay
d9276d5e82 Preparing Stripe Checkout. 2022-01-21 16:41:22 -05:00
Samuel Clay
ee63184075 Restyling premium upgrade dialog. Needs stripe/paypal hookup and billing integration. 2022-01-21 12:55:12 -05:00
Samuel Clay
8164767a59 Merge branch 'master' into pro
* master:
  Cleaning up django collection pipeline.
  Upgrading jQuery and jQuery UI, fixing closure compiler language output to work in older browser.
  Fixing scope of webmanifest.
  Changing webmanifest scope.
  Adding Web App Manifest for PWA.
2022-01-20 16:56:51 -05:00
Samuel Clay
e2ea1dc8d3 Changing webmanifest scope. 2022-01-20 11:48:07 -05:00
Samuel Clay
f82d8e7227 Merge branch 'master' into pro
* master:
  Handling missing body-plain in mailgun.
  Bumping feed story header.
  We no longer know if the original story could not be proxied because an .contents() failed to find a body.
2022-01-19 17:51:37 -05:00
Samuel Clay
e27ef5fef0 Handling missing body-plain in mailgun. 2022-01-19 17:23:32 -05:00
Samuel Clay
3940e3f2a4 Less text 2022-01-19 14:32:27 -05:00
Samuel Clay
fdeca57412 Changing cutoff dates when fetching stories, fixing issues around Oldest first for both unreads and all stories. 2022-01-18 15:25:15 -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
6ec1d762b7 Migration to add days of unread to profiles. 2022-01-13 17:09:23 -05:00
Samuel Clay
2792e7305a Syncing redis on premium upgrade to sync new unread date possibilities for archive users. 2022-01-13 16:56:30 -05:00
Samuel Clay
1dd921fa61 Adding DAYS_OF_UNREAD_ARCHIVE and updating all the upread_cutoff's I could find. Doesn't seem to work yet when marking an older story as unread, but there's probably a line somewhere that's preventing the unread from working. 2022-01-13 14:55:44 -05:00
Samuel Clay
548ea15a9f Scheduling feed fetches immediately if found in safety net. 2022-01-12 12:04:25 -05:00
Samuel Clay
3ef72e6f83 Fixing feed fetch status screen to better show how subs are being fetched. 2022-01-12 11:58:28 -05:00
Samuel Clay
f615fccdad Coutning archive and pro premiums correctly. 2022-01-11 15:56:19 -05:00
Samuel Clay
5d0c9e0b27 Adding email for new premiums, though not done. 2022-01-11 13:43:38 -05:00
Samuel Clay
b8030b4701 Merge branch 'pipeline' into pro
* pipeline:
  Celery also has a set user.
  Setting the user for celery and newsblur_web in both prod and docker-compose so that logs are always under the right user. Fixes #1593.
  Making add_site callback optional to support iOS. #1584
  Adding check for renaming a feed that a user isn't subscribed to.
  Finishing up PostgreSQL migration. Needs to test backups.
  Handling unreadable POST for push feeds and their fat pings.
  Android v11.2
  Schedule and cancel subscription sync services based on user auth state.
  Check for authenticated user before a subscription sync.
  Subscription sync service running every 24 hours to sync if necessary the user's premium subscription state between NewsBlur and Play Store.
  Upgrade subscriptions to billing 4.0
  Subscription manager to handle billing and subscription syncs between Play Store and NewsBlur.
  #1573 Feed search favicon loading.
  Replace cursor loaders (#9)
  Fixing grafana sentry integration.
  Adding sentry grafana pluging.
  Boosting timeout for docker prune
  Don't prune docker unless needed.
  Update docker-compose.yml
2022-01-11 11:00:12 -05:00
Samuel Clay
61450de5f8 Merge branch 'master' into pipeline
* master:
  Celery also has a set user.
  Setting the user for celery and newsblur_web in both prod and docker-compose so that logs are always under the right user. Fixes #1593.
  Making add_site callback optional to support iOS. #1584
  Adding check for renaming a feed that a user isn't subscribed to.
  Finishing up PostgreSQL migration. Needs to test backups.
  Handling unreadable POST for push feeds and their fat pings.
  Android v11.2
  Schedule and cancel subscription sync services based on user auth state.
  Check for authenticated user before a subscription sync.
  Subscription sync service running every 24 hours to sync if necessary the user's premium subscription state between NewsBlur and Play Store.
  Upgrade subscriptions to billing 4.0
  Subscription manager to handle billing and subscription syncs between Play Store and NewsBlur.
  #1573 Feed search favicon loading.
  Replace cursor loaders (#9)
  Fixing grafana sentry integration.
  Adding sentry grafana pluging.
  Boosting timeout for docker prune
  Don't prune docker unless needed.
  Update docker-compose.yml
2022-01-11 11:00:06 -05:00
Samuel Clay
cab90d6ace Adding archive premium accounts. 2022-01-11 10:59:45 -05:00
Samuel Clay
221bf86664 Color 2022-01-11 10:48:07 -05:00
Samuel Clay
9857ddbcb5 Typo 2022-01-10 17:09:55 -05:00
Samuel Clay
db2a87df06 Counting pro subscribers. 2022-01-10 17:00:27 -05:00