devhttps
diff --git a/‎static/src/javascripts/lib/geolocation.js‎
Lines changed: 5 additions & 33 deletions b/‎static/src/javascripts/lib/geolocation.js‎
Lines changed: 5 additions & 33 deletions
diff --git a/‎static/src/javascripts/projects/common/modules/commercial/acquisitions-copy.js‎
Lines changed: 4 additions & 14 deletions b/‎static/src/javascripts/projects/common/modules/commercial/acquisitions-copy.js‎
Lines changed: 4 additions & 14 deletions
diff --git a/‎static/src/javascripts/projects/common/modules/commercial/contributions-utilities.js‎
Lines changed: 4 additions & 23 deletions b/‎static/src/javascripts/projects/common/modules/commercial/contributions-utilities.js‎
Lines changed: 4 additions & 23 deletions
diff --git a/‎static/src/javascripts/projects/common/modules/commercial/membership-engagement-banner-parameters.js‎
Lines changed: 13 additions & 70 deletions b/‎static/src/javascripts/projects/common/modules/commercial/membership-engagement-banner-parameters.js‎
Lines changed: 13 additions & 70 deletions
diff --git a/‎static/src/javascripts/projects/common/modules/commercial/support-utilities.js‎
Lines changed: 3 additions & 20 deletions b/‎static/src/javascripts/projects/common/modules/commercial/support-utilities.js‎
Lines changed: 3 additions & 20 deletions
diff --git a/‎static/src/javascripts/projects/common/modules/commercial/templates/acquisitions-epic-buttons.js‎
Lines changed: 2 additions & 25 deletions b/‎static/src/javascripts/projects/common/modules/commercial/templates/acquisitions-epic-buttons.js‎
Lines changed: 2 additions & 25 deletions
@@ -367,7 +367,7 @@ const countryGroups: CountryGroups = {
     },
 };
 
-// These are the different 'regions' we accept when taking payment.
+// These are the different 'country groups' we accept when taking payment.
 // See https://github.com/guardian/support-internationalisation/blob/master/src/main/scala/com/gu/i18n/CountryGroup.scala for more context.
 const getSupporterCountryGroup = (location: string): CountryGroupId => {
     const availableCountryGroups = Object.keys(countryGroups);
@@ -380,53 +380,25 @@ const getSupporterCountryGroup = (location: string): CountryGroupId => {
     return response || 'GBPCountries';
 };
 
-const isInEurope = (): boolean => {
-    const countryCode = getSync();
-    return (
-        countryGroups.EURCountries.countries.includes(countryCode) ||
-        countryCode === 'GB'
-    );
-};
-
-const getLocalCurrencySymbol = (): string =>
-    ({
-        GBPCountries: '£',
-        UnitedStates: '$',
-        AUDCountries: '$',
-        Canada: 'CA$',
-        EURCountries: '€',
-        NZDCountries: 'NZ$',
-        International: '$',
-    }[getSupporterCountryGroup(getSync())] || '£');
-
 const extendedCurrencySymbol = {
     GBPCountries: '£',
     UnitedStates: '$',
-    EURCountries: '€',
+    AUDCountries: '$',
     Canada: 'CA$',
+    EURCountries: '€',
     NZDCountries: 'NZ$',
-    AUDCountries: '$',
     International: '$',
 };
 
-const currencySymbol = {
-    GBPCountries: '£',
-    UnitedStates: '$',
-    AUDCountries: '$',
-    EURCountries: '€',
-    NZDCountries: '$',
-    International: '$',
-    Canada: '$',
-};
+const getLocalCurrencySymbol = (): string =>
+    extendedCurrencySymbol[getSupporterCountryGroup(getSync())] || '£';
 
 export {
     get,
     getSupporterCountryGroup,
     getSync,
     getLocalCurrencySymbol,
-    isInEurope,
     init,
     setGeolocation,
-    currencySymbol,
     extendedCurrencySymbol,
 };
@@ -1,6 +1,6 @@
 // @flow
 import { getLocalCurrencySymbol } from 'lib/geolocation';
-import { useSupportDomain } from 'common/modules/commercial/support-utilities';
+
 // control
 const controlHeading = 'Since you’re here &hellip;';
 const controlP1 =
@@ -26,22 +26,12 @@ const ctaLinkSentence = (
     supportUrl: string,
     contributionUrl: string,
     currencySymbol: string
-): string => {
-    if (useSupportDomain()) {
-        return `<span class="contributions__highlight"> For as little as ${
-            currencySymbol
-        }1, you can support the Guardian – and it only takes a minute.</span> <a href="${
-            supportUrl
-        }" target="_blank" class="u-underline">Make a contribution</a>`;
-    }
-    return `<span class="contributions__highlight"> For as little as ${
+): string =>
+    `<span class="contributions__highlight"> For as little as ${
         currencySymbol
     }1, you can support the Guardian – and it only takes a minute.</span> <a href="${
         supportUrl
-    }" target="_blank" class="u-underline">Become a monthly supporter</a> or <a href="${
-        contributionUrl
-    }" target="_blank" class="u-underline">make a one-off contribution</a>`;
-};
+    }" target="_blank" class="u-underline">Make a contribution</a>`;
 
 const cambridgeP1 =
     '&hellip; now is the time to support investigative reporting. The Guardian and Observer have spent a year analysing documents, working with whistleblowers and gathering eyewitness reports to untangle a complex story around data in the digital age. This took months of painstaking research by a small team of reporters and editors &ndash; and has led to investigations on both sides of the Atlantic. <span class="contributions__highlight">We have received legal threats, including from Facebook, but we are determined to continue publishing stories that raise important questions about the use of people’s data in political campaigns</span> &ndash; from the US election to Brexit.';
 
@@ -24,20 +24,14 @@ import { epicButtonsTemplate } from 'common/modules/commercial/templates/acquisi
 import { acquisitionsEpicControlTemplate } from 'common/modules/commercial/templates/acquisitions-epic-control';
 import { acquisitionsTestimonialBlockTemplate } from 'common/modules/commercial/templates/acquisitions-epic-testimonial-block';
 import { shouldSeeReaderRevenue as userShouldSeeReaderRevenue } from 'common/modules/commercial/user-features';
-import {
-    useSupportDomain,
-    supportBaseURL,
-} from 'common/modules/commercial/support-utilities';
+import { supportContributeURL } from 'common/modules/commercial/support-utilities';
 
 type EpicTemplate = (Variant, AcquisitionsEpicTemplateCopy) => string;
 
 export type CtaUrls = {
-    contributeUrl?: string,
-    supportUrl?: string,
+    supportUrl: string,
 };
 
-const contributionsBaseURL = 'https://contribute.theguardian.com';
-
 // How many times the user can see the Epic,
 // e.g. 6 times within 7 days with minimum of 1 day in between views.
 const defaultMaxViews: {
@@ -50,16 +44,14 @@ const defaultMaxViews: {
     minDaysBetweenViews: 0,
 };
 
-const defaultButtonTemplate = (urls: CtaUrls) =>
-    epicButtonsTemplate(urls, useSupportDomain());
+const defaultButtonTemplate = (url: CtaUrls) => epicButtonsTemplate(url);
 
 const controlTemplate: EpicTemplate = ({ options = {} }, copy) =>
     acquisitionsEpicControlTemplate({
         copy,
         componentName: options.componentName,
         testimonialBlock: options.testimonialBlock,
         buttonTemplate: options.buttonTemplate({
-            contributeUrl: options.contributeURL,
             supportUrl: options.supportURL,
         }),
     });
@@ -186,18 +178,8 @@ const makeABTestVariant = (
             id,
             parentTest.campaignSuffix
         ),
-        contributeURL = addTrackingCodesToUrl({
-            base: contributionsBaseURL,
-            componentType: parentTest.componentType,
-            componentId: campaignCode,
-            campaignCode,
-            abTest: {
-                name: parentTest.id,
-                variant: id,
-            },
-        }),
         supportURL = addTrackingCodesToUrl({
-            base: `${options.supportBaseURL || supportBaseURL}`,
+            base: `${options.supportBaseURL || supportContributeURL}`,
             componentType: parentTest.componentType,
             componentId: campaignCode,
             campaignCode,
@@ -272,7 +254,6 @@ const makeABTestVariant = (
             isUnlimited,
             products,
             campaignCode,
-            contributeURL,
             supportURL,
             template,
             buttonTemplate,
 
@@ -4,8 +4,7 @@ import {
     getSupporterCountryGroup,
     extendedCurrencySymbol,
 } from 'lib/geolocation';
-import type { CountryGroupId } from 'lib/geolocation';
-import { supportBaseURL } from './support-utilities';
+import { supportContributeURL } from './support-utilities';
 
 const baseParams = {
     minArticles: 3,
@@ -21,40 +20,16 @@ const engagementBannerCopy = (): string =>
     produce. But the revenue we get from advertising is falling, so we increasingly need our readers to fund us. If
     everyone who reads our reporting, who likes it, helps fund it, our future would be much more secure.`;
 
-// Prices taken from https://membership.theguardian.com/<region>/supporter
+const initialContribution = 1;
 
-const paymentAmounts = {
-    MONTHLY: {
-        GBPCountries: '5',
-        UnitedStates: '6.99',
-        AUDCountries: '10',
-        Canada: '6.99',
-        International: '6.99',
-        NZDCountries: '10',
-        EURCountries: '4.99',
-    },
-    'ONE-OFF': {
-        GBPCountries: '1',
-        UnitedStates: '1',
-        AUDCountries: '1',
-        Canada: '1',
-        International: '1',
-        NZDCountries: '1',
-        EURCountries: '1',
-    },
-};
+const supporterCost = (location: string): string => {
+    const countryGroup = getSupporterCountryGroup(location);
 
-const supporterCost = (
-    location: string,
-    contributionType: 'MONTHLY' | 'ONE-OFF'
-): string => {
-    const region = getSupporterCountryGroup(location);
-
-    if (region === 'EURCountries') {
+    if (countryGroup === 'EURCountries') {
         // Format either 4.99 € or €4.99 depending on country
         // See https://en.wikipedia.org/wiki/Linguistic_issues_concerning_the_euro
         const euro = extendedCurrencySymbol.EURCountries;
-        const amount = paymentAmounts[contributionType].EURCountries;
+        const amount = initialContribution;
 
         const euroAfterCountryCodes = [
             'BG',
@@ -84,53 +59,21 @@ const supporterCost = (
             : euro + amount;
     }
 
-    return `${extendedCurrencySymbol[region]}
-            ${paymentAmounts[contributionType][region]}`;
+    return `${extendedCurrencySymbol[countryGroup]}
+            ${initialContribution}`;
 };
 
-const supporterEngagementCtaCopy = (location: string): string =>
-    `Support us for ${supporterCost(location, 'MONTHLY')} a month.`;
-
 const supporterEngagementCtaCopyJustOne = (location: string): string =>
-    `Support The Guardian from as little as ${supporterCost(
-        location,
-        'ONE-OFF'
-    )}.`;
+    `Support The Guardian from as little as ${supporterCost(location)}.`;
 
-const supporterParams = (location: string): EngagementBannerParams =>
+export const engagementBannerParams = (
+    location: string
+): EngagementBannerParams =>
     Object.assign({}, baseParams, {
         buttonCaption: 'Support The Guardian',
-        linkUrl: supportBaseURL,
+        linkUrl: supportContributeURL,
         products: ['CONTRIBUTION', 'RECURRING_CONTRIBUTION'],
         messageText: engagementBannerCopy(),
         ctaText: supporterEngagementCtaCopyJustOne(location),
         pageviewId: config.get('ophan.pageViewId', 'not_found'),
     });
-
-const membershipSupporterParams = (location: string): EngagementBannerParams =>
-    Object.assign({}, baseParams, {
-        buttonCaption: 'Become a Supporter',
-        linkUrl: 'https://membership.theguardian.com/supporter',
-        products: ['MEMBERSHIP_SUPPORTER'],
-        messageText: engagementBannerCopy(),
-        ctaText: supporterEngagementCtaCopy(location),
-        pageviewId: config.get('ophan.pageViewId', 'not_found'),
-    });
-
-export const engagementBannerParams = (
-    location: string
-): EngagementBannerParams => {
-    const region = getSupporterCountryGroup(location);
-    const supportRegions: CountryGroupId[] = [
-        'UnitedStates',
-        'GBPCountries',
-        'EURCountries',
-        'International',
-        'NZDCountries',
-        'Canada',
-    ];
-    if (supportRegions.includes(region)) {
-        return supporterParams(location);
-    }
-    return membershipSupporterParams(location);
-};
@@ -1,22 +1,5 @@
 // @flow
-import {
-    getSync as geolocationGetSync,
-    getSupporterCountryGroup as geolocationGetSupporterPaymentRegion,
-} from 'lib/geolocation';
+const supportContributeURL = 'https://support.theguardian.com/contribute';
+const supportSubscribeURL = 'https://support.theguardian.com/subscribe';
 
-const geo: string = geolocationGetSync();
-const geoCountryGroup = geolocationGetSupporterPaymentRegion(geo);
-
-const useSupportDomain = (): boolean =>
-    geoCountryGroup === 'GBPCountries' ||
-    geoCountryGroup === 'UnitedStates' ||
-    geoCountryGroup === 'EURCountries' ||
-    geoCountryGroup === 'International' ||
-    geoCountryGroup === 'NZDCountries' ||
-    geoCountryGroup === 'Canada';
-
-const supportBaseURL = useSupportDomain()
-    ? 'https://support.theguardian.com/contribute'
-    : 'https://membership.theguardian.com/supporter';
-
-export { useSupportDomain, supportBaseURL };
+export { supportContributeURL, supportSubscribeURL };
@@ -2,26 +2,7 @@
 import type { CtaUrls } from 'common/modules/commercial/contributions-utilities';
 import config from 'lib/config';
 
-export const epicButtonsTemplate = (
-    { supportUrl = '', contributeUrl = '' }: CtaUrls,
-    useSupportDomain: boolean = false
-) => {
-    const contribButton = `
-        <div>
-            <a class="contributions__option-button contributions__contribute contributions__contribute--epic contributions__contribute--epic-member"
-             href="${contributeUrl}"
-             target="_blank">
-             Make a contribution
-            </a>
-        </div>`;
-    const supportButtonBecome = `
-        <div>
-            <a class="contributions__option-button contributions__contribute contributions__contribute--epic contributions__contribute--epic-member"
-              href="${supportUrl}"
-              target="_blank">
-              Become a supporter
-            </a>
-        </div>`;
+export const epicButtonsTemplate = ({ supportUrl = '' }: CtaUrls) => {
     const supportButtonSupport = `
         <div>
             <a class="contributions__option-button contributions__contribute contributions__contribute--epic contributions__contribute--epic-member contributions__contribute--epic-single-button"
@@ -38,11 +19,7 @@ export const epicButtonsTemplate = (
 
     return `
         <div class="contributions__amount-field">
-            ${
-                useSupportDomain
-                    ? supportButtonSupport
-                    : supportButtonBecome + contribButton
-            }
+            ${supportButtonSupport}
             ${paymentLogos}
         </div>`;
 };