From 83d735730623863efdbb1854ccc29efd8eab5996 Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Sun, 3 Jan 2021 13:59:33 -0500 Subject: [PATCH] Adding 1 year expire to admin. --- apps/profile/views.py | 6 +++++- media/js/newsblur/reader/reader_admin.js | 15 ++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/apps/profile/views.py b/apps/profile/views.py index 9ac8ada60..91041b491 100644 --- a/apps/profile/views.py +++ b/apps/profile/views.py @@ -567,9 +567,13 @@ def upgrade_premium(request): @json.json_view def never_expire_premium(request): user_id = request.POST.get('user_id') + years = request.POST.get('years', 0) user = User.objects.get(pk=user_id) if user.profile.is_premium: - user.profile.premium_expire = None + if years: + user.profile.premium_expire = datetime.datetime.now() + datetime.timedelta(days=365*years) + else: + user.profile.premium_expire = None user.profile.save() return {'code': 1} diff --git a/media/js/newsblur/reader/reader_admin.js b/media/js/newsblur/reader/reader_admin.js index 132eedd12..fdf10317b 100644 --- a/media/js/newsblur/reader/reader_admin.js +++ b/media/js/newsblur/reader/reader_admin.js @@ -81,6 +81,7 @@ _.extend(NEWSBLUR.ReaderUserAdmin.prototype, { $actions.append($.make('div', { className: "NB-modal-submit-button NB-modal-submit-green NB-admin-action-refund", style: "float: left" }, "Full Refund")); $actions.append($.make('div', { className: "NB-modal-submit-button NB-modal-submit-green NB-admin-action-refund-partial", style: "float: left" }, "Refund $12")); $actions.append($.make('div', { className: "NB-modal-submit-button NB-modal-submit-green NB-admin-action-never-expire", style: "float: left" }, "Never expire")); + $actions.append($.make('div', { className: "NB-modal-submit-button NB-modal-submit-green NB-admin-action-1yr-expire", style: "float: left" }, "Expire 1 YR")); } else { $actions.append($.make('div', { className: "NB-modal-submit-button NB-modal-submit-green NB-admin-action-upgrade" }, "Upgrade to premium")); } @@ -183,6 +184,18 @@ _.extend(NEWSBLUR.ReaderUserAdmin.prototype, { $(".NB-admin-action-never-expire").replaceWith($.make('div', 'Error: ' + JSON.stringify(data))); }); }); + $.targetIs(e, { tagSelector: '.NB-admin-action-1yr-expire' }, function($t, $p) { + e.preventDefault(); + + NEWSBLUR.assets.never_expire_premium({ + 'user_id': self.user.get('user_id'), + 'years': 1 + }, function(data) { + self.fetch_payment_history(); + }, function(data) { + $(".NB-admin-action-never-expire").replaceWith($.make('div', 'Error: ' + JSON.stringify(data))); + }); + }); $.targetIs(e, { tagSelector: '.NB-admin-action-upgrade' }, function($t, $p) { e.preventDefault(); @@ -211,4 +224,4 @@ _.extend(NEWSBLUR.ReaderUserAdmin.prototype, { } -}); \ No newline at end of file +});