diff --git a/.env b/.env index 91651c3e..7a17464c 100644 --- a/.env +++ b/.env @@ -22,3 +22,4 @@ LOGO_TRADEMARK_URL='' LOGO_WHITE_URL='' FAVICON_URL='' ENABLE_B2C_SUBSCRIPTIONS=false +SUBSCRIPTIONS_MARKETING_URL='' diff --git a/.env.development b/.env.development index d62d6973..6c9abb05 100644 --- a/.env.development +++ b/.env.development @@ -23,3 +23,4 @@ LOGO_TRADEMARK_URL=https://edx-cdn.org/v3/default/logo-trademark.svg LOGO_WHITE_URL=https://edx-cdn.org/v3/default/logo-white.svg FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico ENABLE_B2C_SUBSCRIPTIONS=true +SUBSCRIPTIONS_MARKETING_URL=/program-subscriptions diff --git a/.env.test b/.env.test index 8e4f8fd1..fcc51e12 100644 --- a/.env.test +++ b/.env.test @@ -23,3 +23,4 @@ LOGO_TRADEMARK_URL=https://edx-cdn.org/v3/default/logo-trademark.svg LOGO_WHITE_URL=https://edx-cdn.org/v3/default/logo-white.svg FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico ENABLE_B2C_SUBSCRIPTIONS=true +SUBSCRIPTIONS_MARKETING_URL=/program-subscriptions diff --git a/src/index.jsx b/src/index.jsx index 19e689b1..d980d5c6 100755 --- a/src/index.jsx +++ b/src/index.jsx @@ -36,6 +36,7 @@ mergeConfig({ COMMERCE_COORDINATOR_BASE_URL: process.env.COMMERCE_COORDINATOR_BASE_URL, ENABLE_B2C_SUBSCRIPTIONS: process.env.ENABLE_B2C_SUBSCRIPTIONS, SUBSCRIPTIONS_BASE_URL: process.env.SUBSCRIPTIONS_BASE_URL, + SUBSCRIPTIONS_MARKETING_URL: process.env.SUBSCRIPTIONS_MARKETING_URL, SUPPORT_URL: process.env.SUPPORT_URL, }); diff --git a/src/orders-and-subscriptions/__snapshots__/OrdersAndSubscriptionsPage.test.jsx.snap b/src/orders-and-subscriptions/__snapshots__/OrdersAndSubscriptionsPage.test.jsx.snap index afa0d853..facbb211 100644 --- a/src/orders-and-subscriptions/__snapshots__/OrdersAndSubscriptionsPage.test.jsx.snap +++ b/src/orders-and-subscriptions/__snapshots__/OrdersAndSubscriptionsPage.test.jsx.snap @@ -108,13 +108,14 @@ exports[` Renders correctly in various states renders - + diff --git a/src/setupTest.js b/src/setupTest.js index fe14bcd6..da7f48c3 100755 --- a/src/setupTest.js +++ b/src/setupTest.js @@ -10,6 +10,7 @@ mergeConfig({ COMMERCE_COORDINATOR_BASE_URL: process.env.COMMERCE_COORDINATOR_BASE_URL, ENABLE_B2C_SUBSCRIPTIONS: process.env.ENABLE_B2C_SUBSCRIPTIONS, SUBSCRIPTIONS_BASE_URL: process.env.SUBSCRIPTIONS_BASE_URL, + SUBSCRIPTIONS_MARKETING_URL: process.env.SUBSCRIPTIONS_MARKETING_URL, SUPPORT_URL: process.env.SUPPORT_URL, }); diff --git a/src/subscriptions/SubscriptionUpsell.jsx b/src/subscriptions/SubscriptionUpsell.jsx index cd6fae8a..9b5dd483 100644 --- a/src/subscriptions/SubscriptionUpsell.jsx +++ b/src/subscriptions/SubscriptionUpsell.jsx @@ -1,6 +1,7 @@ import React from 'react'; import { useMediaQuery } from 'react-responsive'; +import { getConfig } from '@edx/frontend-platform'; import { FormattedMessage } from '@edx/frontend-platform/i18n'; import { Alert, Badge, Button } from '@edx/paragon'; @@ -8,7 +9,13 @@ const SubscriptionUpsell = () => ( + +