Link directly to the manage page for this plan. #579

matthusby · 2015-11-23T22:14:58Z

Fixes #543

Testing

Apply this patch: D593-code
git checkout update/Link-directly-to-manage-purchase
Browse to http://calypso.localhost:3000/plans
Select a site with a plan
Clicking on manage purchase takes you to the correct /purchases/ page for this plan
Visit Billing History and verify that the Manage Purchases link takes you to purchases
Make sure that the Manage Purchase links for upcoming charges takes you to the correct purchase.

Also test:

The link at the top of /me/billing
The Payment Settings link on http://calypso.localhost:3000/domains/manage/:site/edit/:domain
The "Renew them now." link which appears when you have a domain warning
The "Manage Purchases" link shown when you want to delete a site.

Code review
QA review

Tug · 2015-11-23T22:45:13Z

In my case, I had a Manage Plan button in the Business section which linked to http://calypso.localhost:3000/purchases/MY_SITE/undefined.
Do not hesitate if you need more info :)

matthusby · 2015-11-23T22:47:30Z

@Tug There is an api change that needs to be applied.

Tug · 2015-11-23T22:49:38Z

I see! I wasn't sure about the whole D538-code thing ;)

matthusby · 2015-11-23T22:51:09Z

@Tug No worries, Thanks for taking the time to review :)

mikeshelton1503 · 2015-11-24T16:07:50Z

Let's also update the "Payment settings" link for domains. I thought there were more instances of it but that's the only one I could find.

fabianapsimoes · 2015-11-24T16:14:15Z

We should also update these links:
https://github.com/Automattic/wp-calypso/search?q=my-upgrades (h/t @scruffian)

gziolo · 2015-11-26T07:25:32Z

@mikeshelton1503 @fabianapsimoes: Do we want to keep target="_blank" for updated links? Personally I would avoid opening new tab/window, because it breaks idea of Single Page App :)

fabianapsimoes · 2015-11-26T13:45:45Z

@gziolo no, we don't need that anymore now that /purchases is in Calypso. So let's get rid of target="_blank" and open stuff in the same tab.

scruffian · 2015-11-27T14:57:10Z

client/my-sites/upgrades/navigation.jsx

@@ -64,7 +64,7 @@ var NAV_ITEMS = {
 	},

 	'My Upgrades': {
-		paths: [ '/my-upgrades' ],
+		paths: [ '/purchases' ],
 		label: i18n.translate( 'My Upgrades' ),


I guess this should say "Manage Purchases"

drewblaisdell · 2015-11-27T20:05:16Z

client/my-sites/upgrades/navigation.jsx

-		paths: [ '/my-upgrades' ],
-		label: i18n.translate( 'My Upgrades' ),
+		paths: [ '/purchases' ],
+		label: i18n.translate( 'Manage Purchases' ),
 		external: true


/purchases is an internal link, so we should try and open this in the window for the same reason that we updated the target="_blank" links.

This will require updating some logic in UpgradesNavigation, because we currently assume that internal links follow the pattern path + siteSlug.

https://github.com/Automattic/wp-calypso/search?q=my-upgrades

…ey are in the same app

…igation`

…aths lib

…false.

…sTable`

…leted

drewblaisdell · 2015-12-02T21:20:38Z

QA. 👍

drewblaisdell · 2015-12-02T21:23:57Z

Code LGTM.

…e-purchase Link directly to the manage page for this plan.

scruffian · 2015-12-04T13:17:10Z

Finally \o/

matthusby added the [Feature] Purchase Management Related to managing purchases such as subscriptions, plans, history, auto-renew, cancellation, etc. label Nov 23, 2015

matthusby self-assigned this Nov 23, 2015

matthusby added this to the Purchases: v1 milestone Nov 23, 2015

matthusby added the [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. label Nov 23, 2015

Tug added [Status] Awaiting Fixes and removed [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. labels Nov 23, 2015

matthusby added [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. and removed [Status] Awaiting Fixes labels Nov 23, 2015

matthusby added [Status] In Progress and removed [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. labels Nov 24, 2015

scruffian assigned scruffian and unassigned matthusby Nov 27, 2015

scruffian reviewed Nov 27, 2015
View reviewed changes

scruffian added [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. and removed [Status] In Progress labels Nov 27, 2015

drewblaisdell reviewed Nov 27, 2015
View reviewed changes

drewblaisdell added the [Type] Task label Nov 27, 2015

matthusby and others added 14 commits December 2, 2015 13:04

Link directly to the manage page for this plan.

427f870

Update links for purchases in Billing-History

053aab9

Update the rest of the references to /my-upgrades to /purchases

41f2c7c

https://github.com/Automattic/wp-calypso/search?q=my-upgrades

Purchases: Fix the link to the Manage Purchase page

c0843d8

Purchases: Change references to 'My Upgrades' to 'Manage Purchases'

50e047f

Purchases: Removing target=_blank from the links to /purchases now th…

240cc1d

…ey are in the same app

Purchases: Link to My Purchases as an internal link in `UpgradesNav…

069063e

…igation`

Purchases: Change the hardcoded purchases URLs to use the purchases/p…

41f8071

…aths lib

Purchases: Removing the external link property, since it defaults to …

030337e

…false.

Billing History: Link to the correct site/purchase in `UpcomingCharge…

17f44dc

…sTable`

Billing History: Fix linting in BillingHistory

2b97ace

Purchases: Link to ManagePurchase with site slug in PlanActions

c109805

Purchases: Link to Manage Purchases in UpgradesNavigation

132eb22

Purchases: Don't link to the manage purchase screen if the site is de…

01604bd

…leted

drewblaisdell force-pushed the update/Link-directly-to-manage-purchase branch from 8c71bd5 to 01604bd Compare December 2, 2015 21:04

drewblaisdell added [Status] Ready to Merge and removed [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. labels Dec 2, 2015

drewblaisdell added a commit that referenced this pull request Dec 2, 2015

Merge pull request #579 from Automattic/update/Link-directly-to-manag…

96fcd26

…e-purchase Link directly to the manage page for this plan.

drewblaisdell merged commit 96fcd26 into master Dec 2, 2015

drewblaisdell deleted the update/Link-directly-to-manage-purchase branch December 2, 2015 21:25

drewblaisdell removed the [Status] Ready to Merge label Dec 2, 2015

scruffian removed their assignment Jan 13, 2016

fabianapsimoes modified the milestone: Purchases: Future Feb 25, 2016

tyxla mentioned this pull request Dec 19, 2016

Framework: Remove obsolete lib/api-utils #10156

Merged

This was referenced Dec 26, 2022

[Snyk] Security upgrade config from 1.28.0 to 3.3.1 awaisab172/wp-calypso#142

Open

[Snyk] Security upgrade config from 1.28.0 to 3.3.1 awaisab172/wp-calypso#143

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Link directly to the manage page for this plan. #579

Link directly to the manage page for this plan. #579

matthusby commented Nov 23, 2015

Tug commented Nov 23, 2015

matthusby commented Nov 23, 2015

Tug commented Nov 23, 2015

matthusby commented Nov 23, 2015

mikeshelton1503 commented Nov 24, 2015

fabianapsimoes commented Nov 24, 2015

gziolo commented Nov 26, 2015

fabianapsimoes commented Nov 26, 2015

scruffian Nov 27, 2015

drewblaisdell Nov 27, 2015

drewblaisdell commented Dec 2, 2015

drewblaisdell commented Dec 2, 2015

scruffian commented Dec 4, 2015

Link directly to the manage page for this plan. #579

Link directly to the manage page for this plan. #579

Conversation

matthusby commented Nov 23, 2015

Tug commented Nov 23, 2015

matthusby commented Nov 23, 2015

Tug commented Nov 23, 2015

matthusby commented Nov 23, 2015

mikeshelton1503 commented Nov 24, 2015

fabianapsimoes commented Nov 24, 2015

gziolo commented Nov 26, 2015

fabianapsimoes commented Nov 26, 2015

scruffian Nov 27, 2015

Choose a reason for hiding this comment

drewblaisdell Nov 27, 2015

Choose a reason for hiding this comment

drewblaisdell commented Dec 2, 2015

drewblaisdell commented Dec 2, 2015

scruffian commented Dec 4, 2015