IAP: Disable all links & buttons that add upgrade to the cart

client/me/billing-history/index.jsx

@@ -71,7 +71,7 @@ module.exports = React.createClass( {
 						</Card>
 					</div> }
 
-				{ config.isEnabled( 'me/credit-cards' ) &&
+				{ config.isEnabled( 'upgrades/credit-cards' ) &&
 					<CreditCards cards={ storedCards } /> }
 
 			</div>

client/me/purchases/manage-purchase/index.jsx

@@ -12,6 +12,7 @@ import analytics from 'analytics';
 import Button from 'components/button';
 import Card from 'components/card';
 import { cartItems } from 'lib/cart-values';
+import config from 'config';
 import { domainManagementEdit } from 'my-sites/upgrades/paths';
 import { googleAppsSettingsUrl } from 'lib/google-apps';
 import HeaderCake from 'components/header-cake';
@@ -48,7 +49,7 @@ import { getPurchase, getSelectedSite, goToList, isDataLoading, recordPageView }
 import { isDomainProduct, isGoogleApps, isPlan, isSiteRedirect, isTheme } from 'lib/products-values';
 
 function canEditPaymentDetails( purchase ) {
-	return ! isExpired( purchase ) && ! isOneTimePurchase( purchase ) && ! isIncludedWithPlan( purchase );
+	return config.isEnabled( 'upgrades/credit-cards' ) && ! isExpired( purchase ) && ! isOneTimePurchase( purchase ) && ! isIncludedWithPlan( purchase );
 }
 
 const ManagePurchase = React.createClass( {
@@ -125,13 +126,23 @@ const ManagePurchase = React.createClass( {
 						}
 					}
 				) }>
-				<NoticeAction onClick={ this.handleRenew }>
-					{ this.translate( 'Renew Now' ) }
-				</NoticeAction>
+				{ this.renderRenewNoticeAction() }
 			</Notice>
 		);
 	},
 
+	renderRenewNoticeAction() {
+		if ( ! config.isEnabled( 'upgrades/checkout' ) ) {
+			return null;
+		}
+
+		return (
+			<NoticeAction onClick={ this.handleRenew }>
+				{ this.translate( 'Renew Now' ) }
+			</NoticeAction>
+		);
+	},
+
 	renderCreditCardExpiringNotice() {
 		const purchase = getPurchase( this.props ),
 			{ id, payment: { creditCard } } = purchase;
@@ -155,7 +166,9 @@ const ManagePurchase = React.createClass( {
 									cardExpiry: creditCard.expiryMoment.format( 'MMMM YYYY' )
 								},
 								components: {
-									a: <a href={ paths.editCardDetails( this.props.selectedSite.slug, id, creditCard.id ) } />
+									a: canEditPaymentDetails() ?
+										<a href={ paths.editCardDetails( this.props.selectedSite.slug, id, creditCard.id ) } /> :
+										<span />
 								}
 							}
 						)
@@ -378,7 +391,7 @@ const ManagePurchase = React.createClass( {
 	renderRenewButton() {
 		const purchase = getPurchase( this.props );
 
-		if ( ! isRenewable( purchase ) || isExpired( purchase ) || isExpiring( purchase ) ) {
+		if ( ! config.isEnabled( 'upgrades/checkout' ) || ! isRenewable( purchase ) || isExpired( purchase ) || isExpiring( purchase ) ) {
 			return null;
 		}
 
@@ -403,9 +416,7 @@ const ManagePurchase = React.createClass( {
 				showDismiss={ false }
 				status="is-error"
 				text={ this.translate( 'This purchase has expired and is no longer in use.' ) }>
-				<NoticeAction onClick={ this.handleRenew }>
-					{ this.translate( 'Renew Now' ) }
-				</NoticeAction>
+				{ this.renderRenewNoticeAction() }
 			</Notice>
 		);
 	},

client/my-sites/sidebar/sidebar.jsx

@@ -284,7 +284,7 @@ module.exports = React.createClass( {
 			return null;
 		}
 
-		if ( abtest( 'domainsAddButton' ) === 'button' ) {
+		if ( config.isEnabled( 'upgrades/domain-search' ) && abtest( 'domainsAddButton' ) === 'button' ) {
 			addDomainButton = <a onClick={ this.onNavigate } href={ addDomainLink } className="add-new">{ this.translate( 'Add' ) }</a>;
 		}
 

client/my-sites/site-settings/delete-site-options/index.jsx

@@ -58,7 +58,6 @@ module.exports = React.createClass( {
 			changeAddressLink = '/domains/manage/' + selectedSite.slug,
 			startOverLink = '/settings/start-over/' + selectedSite.slug,
 			deleteSiteLink = '/settings/delete-site/' + selectedSite.slug,
-			changeAddressLinkExternal = false,
 			changeAddressLinkText = this.translate( 'Register a new domain or change your site\'s address.' ),
 			strings, dialogButtons;
 
@@ -73,8 +72,6 @@ module.exports = React.createClass( {
 		}
 
 		if ( ! config.isEnabled( 'upgrades/domain-search' ) ) {
-			changeAddressLink = `https://${ selectedSite.domain }/wp-admin/index.php?page=my-blogs#blog_row_${ selectedSite.ID }`;
-			changeAddressLinkExternal = true;
 			changeAddressLinkText = this.translate( 'Change your site\'s address.' );
 		}
 
@@ -87,7 +84,7 @@ module.exports = React.createClass( {
 
 		return (
 			<div className="delete-site-options">
-				<CompactCard href={ changeAddressLink } className="delete-site-options__link" target={ changeAddressLinkExternal ? '_blank' : null }>
+				<CompactCard href={ changeAddressLink } className="delete-site-options__link">
 					<div className="delete-site-options__content">
 						<h2 className="delete-site-options__section-title">{ strings.changeSiteAddress }</h2>
 						<p className="delete-site-options__section-desc">{ changeAddressLinkText }</p>

client/my-sites/upgrades/domain-management/email/index.jsx

@@ -7,7 +7,8 @@ const React = require( 'react' ),
 /**
  * Internal dependencies
  */
-const Main = require( 'components/main' ),
+const config = require( 'config' ),
+	Main = require( 'components/main' ),
 	Header = require( 'my-sites/upgrades/domain-management/components/header' ),
 	SidebarNavigation = require( 'my-sites/sidebar-navigation' ),
 	AddGoogleAppsCard = require( './add-google-apps-card' ),
@@ -95,17 +96,25 @@ const Email = React.createClass( {
 	},
 
 	emptyContent() {
+		let props = {
+			title: this.translate( "You don't have any domains yet." ),
+			line: this.translate(
+				'Add a domain to your site to make it easier ' +
+				'to remember and easier to share, and get access to email ' +
+				'forwarding, Google Apps for Work, and other email services.'
+			),
+			illustration: '/calypso/images/drake/drake-whoops.svg'
+		};
+
+		if ( config.isEnabled( 'upgrades/domain-search' ) ) {
+			props = Object.assign( props, {
+				action: this.translate( 'Add a Custom Domain' ),
+				actionURL: '/domains/add/' + this.props.selectedSite.domain
+			} );
+		}
+
 		return (
-			<EmptyContent
-				title={ this.translate( "You don't have any domains {{em}}yet{{/em}}.", {
-					components: { em: <em /> }
-				} ) }
-				line={ this.translate( 'Add a domain to your site to make it easier ' +
-					'to remember and easier to share, and get access to email ' +
-					'forwarding, Google Apps for Work, and other email services.' ) }
-				action={ this.translate( 'Add a Custom Domain' ) }
-				actionURL={ '/domains/add/' + this.props.selectedSite.domain }
-				illustration="/calypso/images/drake/drake-whoops.svg" />
+			<EmptyContent { ...props } />
 		);
 	},
 

client/my-sites/upgrades/domain-management/list/index.jsx

@@ -9,6 +9,7 @@ import times from 'lodash/utility/times';
  * Internal dependencies
  */
 import analyticsMixin from 'lib/mixins/analytics';
+import config from 'config';
 import DomainWarnings from 'my-sites/upgrades/components/domain-warnings';
 import ListItem from './item';
 import ListItemPlaceholder from './item-placeholder';
@@ -66,6 +67,10 @@ const List = React.createClass( {
 	},
 
 	addDomainButton() {
+		if ( ! config.isEnabled( 'upgrades/domain-search' ) ) {
+			return null;
+		}
+
 		return (
 			<Button
 				primary

client/my-sites/upgrades/navigation.jsx

@@ -16,7 +16,8 @@ var React = require( 'react' ),
 /**
  * Internal dependencies
  */
-var SectionNav = require( 'components/section-nav' ),
+var config = require( 'config' ),
+	SectionNav = require( 'components/section-nav' ),
 	NavTabs = require( 'components/section-nav/tabs' ),
 	NavItem = require( 'components/section-nav/item' ),
 	upgradesPaths = require( 'my-sites/upgrades/paths' ),
@@ -171,6 +172,10 @@ var UpgradesNavigation = React.createClass( {
 	},
 
 	cartToggleButton: function() {
+		if ( ! config.isEnabled( 'upgrades/checkout' ) ) {
+			return null;
+		}
+
 		return (
 			<PopoverCart
 				cart={ this.props.cart }

config/desktop-mac-app-store.json

@@ -65,11 +65,12 @@
 		"reader/discover": true,
 
 		"upgrades/checkout": false,
-		"upgrades/domain-management/contacts-privacy": false,
-		"upgrades/domain-management/email": false,
-		"upgrades/domain-management/list": false,
-		"upgrades/domain-management/name-servers": false,
-		"upgrades/domain-management/site-redirect": false,
+		"upgrades/credit-cards": false,
+		"upgrades/domain-management/contacts-privacy": true,
+		"upgrades/domain-management/email": true,
+		"upgrades/domain-management/list": true,
+		"upgrades/domain-management/name-servers": true,
+		"upgrades/domain-management/site-redirect": true,
 		"upgrades/domain-management/transfer": false,
 		"upgrades/domain-search": false,
 
@@ -88,7 +89,6 @@
 		"me/security/checkup": true,
 		"me/notifications": true,
 		"me/next-steps": false,
-		"me/credit-cards": false,
 		"me/find-friends": false,
 		"me/trophies": false,
 		"help": false,

config/desktop.json

@@ -48,7 +48,6 @@
 		"manage/themes": true,
 		"me/account": true,
 		"me/billing-history": true,
-		"me/credit-cards": true,
 		"me/find-friends": false,
 		"me/my-profile": true,
 		"me/next-steps": true,
@@ -76,6 +75,7 @@
 		"reader/teams": true,
 		"settings/security/monitor": true,
 		"upgrades/checkout": true,
+		"upgrades/credit-cards": true,
 		"upgrades/domain-management/contacts-privacy": true,
 		"upgrades/domain-management/email": true,
 		"upgrades/domain-management/list": true,

config/development.json

@@ -86,6 +86,7 @@
 		"manage/jetpack-plans": true,
 
 		"upgrades/checkout": true,
+		"upgrades/credit-cards": true,
 		"upgrades/domain-management/contacts-privacy": true,
 		"upgrades/domain-management/email": true,
 		"upgrades/domain-management/list": true,
@@ -117,7 +118,6 @@
 		"me/security/checkup": true,
 		"me/notifications": true,
 		"me/next-steps": true,
-		"me/credit-cards": true,
 		"me/find-friends": false,
 		"me/trophies": false,
 

config/horizon.json

@@ -60,6 +60,7 @@
 		"reader/recommendations": true,
 
 		"upgrades/checkout": true,
+		"upgrades/credit-cards": true,
 
 		"notifications2beta": true,
 		"muse": true,
@@ -75,7 +76,6 @@
 		"me/security": true,
 		"me/notifications": true,
 		"me/next-steps": true,
-		"me/credit-cards": true,
 		"me/find-friends": false,
 		"me/trophies": false,
 		"help": true,

config/production.json

@@ -41,7 +41,6 @@
 		"manage/option_sync_non_public_post_stati": false,
 		"manage/stats": true,
 		"me/billing-history": true,
-		"me/credit-cards": true,
 		"me/find-friends": false,
 		"me/next-steps": true,
 		"me/trophies": false,
@@ -57,6 +56,7 @@
 		"post-editor/pages": true,
 		"help": true,
 		"upgrades/checkout": true,
+		"upgrades/credit-cards": true,
 		"upgrades/domain-management/contacts-privacy": true,
 		"upgrades/domain-management/email": true,
 		"upgrades/domain-management/list": true,

config/stage.json

@@ -46,7 +46,6 @@
 		"manage/site-settings/analytics" : true,
 		"manage/site-settings/delete-site": true,
 		"me/billing-history": true,
-		"me/credit-cards": true,
 		"me/find-friends": false,
 		"me/next-steps": true,
 		"me/trophies": false,
@@ -57,6 +56,7 @@
 		"help": true,
 		"me/notifications": true,
 		"upgrades/checkout": true,
+		"upgrades/credit-cards": true,
 		"upgrades/domain-management/contacts-privacy": true,
 		"upgrades/domain-management/email": true,
 		"upgrades/domain-management/list": true,

config/wpcalypso.json

@@ -61,6 +61,7 @@
 		"reader/discover": true,
 
 		"upgrades/checkout": true,
+		"upgrades/credit-cards": true,
 		"upgrades/domain-management/contacts-privacy": true,
 		"upgrades/domain-management/email": true,
 		"upgrades/domain-management/list": true,
@@ -85,7 +86,6 @@
 		"me/security/checkup": true,
 		"me/notifications": true,
 		"me/next-steps": true,
-		"me/credit-cards": true,
 		"me/find-friends": false,
 		"me/trophies": false,
 		"help": true,