From bcc8bfbe6cbfb598c1b982cc6b1fa9bbb90405a2 Mon Sep 17 00:00:00 2001 From: James Allen Date: Mon, 22 Aug 2016 17:36:33 +0100 Subject: [PATCH] Redirect to working update billing details end point that shows a nice message --- .../Features/Subscription/SubscriptionController.coffee | 7 +++++-- .../coffee/Features/Subscription/SubscriptionRouter.coffee | 1 + services/web/app/views/subscriptions/dashboard.jade | 5 +++++ .../coffee/Subscription/SubscriptionControllerTests.coffee | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/services/web/app/coffee/Features/Subscription/SubscriptionController.coffee b/services/web/app/coffee/Features/Subscription/SubscriptionController.coffee index 3d2ba910d0..943c78f62d 100644 --- a/services/web/app/coffee/Features/Subscription/SubscriptionController.coffee +++ b/services/web/app/coffee/Features/Subscription/SubscriptionController.coffee @@ -97,7 +97,7 @@ module.exports = SubscriptionController = groupSubscriptions: groupSubscriptions subscriptionTabActive: true user:user - + saved_billing_details: req.query.saved_billing_details? userCustomSubscriptionPage: (req, res, next)-> AuthenticationController.getLoggedInUser req, (error, user) -> @@ -131,9 +131,12 @@ module.exports = SubscriptionController = currency: "USD" subdomain: Settings.apis.recurly.subdomain signature : signature - successURL : "#{Settings.siteUrl}/user/subscription/update" + successURL : "#{Settings.siteUrl}/user/subscription/billing-details/update" user : id : user._id + + updateBillingDetails: (req, res, next) -> + res.redirect "/user/subscription?saved_billing_details=true" createSubscription: (req, res, next)-> AuthenticationController.getLoggedInUser req, (error, user) -> diff --git a/services/web/app/coffee/Features/Subscription/SubscriptionRouter.coffee b/services/web/app/coffee/Features/Subscription/SubscriptionRouter.coffee index f2d66c30c5..62d4d306ab 100644 --- a/services/web/app/coffee/Features/Subscription/SubscriptionRouter.coffee +++ b/services/web/app/coffee/Features/Subscription/SubscriptionRouter.coffee @@ -16,6 +16,7 @@ module.exports = webRouter.get '/user/subscription/new', AuthenticationController.requireLogin(), SubscriptionController.paymentPage webRouter.get '/user/subscription/billing-details/edit', AuthenticationController.requireLogin(), SubscriptionController.editBillingDetailsPage + webRouter.post '/user/subscription/billing-details/update', AuthenticationController.requireLogin(), SubscriptionController.updateBillingDetails webRouter.get '/user/subscription/thank-you', AuthenticationController.requireLogin(), SubscriptionController.successful_subscription diff --git a/services/web/app/views/subscriptions/dashboard.jade b/services/web/app/views/subscriptions/dashboard.jade index 9b9464419e..34493e5a8c 100644 --- a/services/web/app/views/subscriptions/dashboard.jade +++ b/services/web/app/views/subscriptions/dashboard.jade @@ -40,6 +40,11 @@ block content .container(ng-controller="UserSubscriptionController") .row .col-md-8.col-md-offset-2 + if saved_billing_details + .alert.alert-success + i.fa.fa-check + |   + | #{translate("your_billing_details_were_saved")} .card(ng-if="view == 'overview'") .page-header h1 #{translate("your_subscription")} diff --git a/services/web/test/UnitTests/coffee/Subscription/SubscriptionControllerTests.coffee b/services/web/test/UnitTests/coffee/Subscription/SubscriptionControllerTests.coffee index 27e9e571d1..db5e4e8c1c 100644 --- a/services/web/test/UnitTests/coffee/Subscription/SubscriptionControllerTests.coffee +++ b/services/web/test/UnitTests/coffee/Subscription/SubscriptionControllerTests.coffee @@ -109,7 +109,7 @@ describe "SubscriptionController sanboxed", -> it "should set the correct variables for the template", -> should.exist @res.renderedVariables.signature - @res.renderedVariables.successURL.should.equal "#{@settings.siteUrl}/user/subscription/update" + @res.renderedVariables.successURL.should.equal "#{@settings.siteUrl}/user/subscription/billing-details/update" @res.renderedVariables.user.id.should.equal @user._id describe "with a user without subscription", ->