.env

@@ -17,6 +17,7 @@ SITE_NAME=''
 MARKETING_SITE_BASE_URL=''
 SUPPORT_URL=''
 ORDER_HISTORY_URL=''
+RECEIPT_URL=''
 LOGO_URL=''
 LOGO_TRADEMARK_URL=''
 LOGO_WHITE_URL=''

.env.development

@@ -17,7 +17,8 @@ LANGUAGE_PREFERENCE_COOKIE_NAME=openedx-language-preference
 SITE_NAME=localhost
 MARKETING_SITE_BASE_URL=http://localhost:18000
 SUPPORT_URL=http://localhost:18000/support
-ORDER_HISTORY_URL=http://localhost:1996/orders
+ORDER_HISTORY_URL=''
+RECEIPT_URL=''
 LOGO_URL=https://edx-cdn.org/v3/default/logo.svg
 LOGO_TRADEMARK_URL=https://edx-cdn.org/v3/default/logo-trademark.svg
 LOGO_WHITE_URL=https://edx-cdn.org/v3/default/logo-white.svg

.env.test

@@ -17,7 +17,8 @@ LANGUAGE_PREFERENCE_COOKIE_NAME=openedx-language-preference
 SITE_NAME=localhost
 MARKETING_SITE_BASE_URL=http://localhost:18000
 SUPPORT_URL=http://localhost:18000/support
-ORDER_HISTORY_URL=https://localhost:1996/orders
+ORDER_HISTORY_URL=''
+RECEIPT_URL=''
 LOGO_URL=https://edx-cdn.org/v3/default/logo.svg
 LOGO_TRADEMARK_URL=https://edx-cdn.org/v3/default/logo-trademark.svg
 LOGO_WHITE_URL=https://edx-cdn.org/v3/default/logo-white.svg

src/order-history/OrderHistoryPage.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
-import { getConfig } from '@edx/frontend-platform';
+import { getConfig, mergeConfig } from '@edx/frontend-platform';
 import {
   injectIntl,
   intlShape,
@@ -19,6 +19,19 @@ import messages from './OrderHistoryPage.messages';
 import { fetchOrders } from './actions';
 import { pageSelector } from './selectors';
 
+/**
+ * TEMPORARY
+ *
+ * Until we add the following keys in frontend-platform,
+ * use mergeConfig to join it with the rest of the config items
+ * (so we don't need to get it separately from process.env).
+ * After we add the keys to frontend-platform, this mergeConfig can go away
+ */
+mergeConfig({
+  ORDER_HISTORY_URL: process.env.ORDER_HISTORY_URL,
+  RECEIPT_URL: process.env.RECEIPT_URL,
+});
+
 class OrderHistoryPage extends React.Component {
   constructor(props) {
     super(props);

src/order-history/service.js

@@ -1,59 +1,27 @@
-/* eslint-disable no-console */
-// NOTE: console logs are intentionally added for REV-2577
-
 import { getAuthenticatedHttpClient, getAuthenticatedUser } from '@edx/frontend-platform/auth';
 import { getConfig } from '@edx/frontend-platform';
 
-const { ECOMMERCE_BASE_URL } = getConfig();
+const { ORDER_HISTORY_URL, RECEIPT_URL, ECOMMERCE_BASE_URL } = getConfig();
 
 const ECOMMERCE_API_BASE_URL = `${ECOMMERCE_BASE_URL}/api/v2`;
-const ECOMMERCE_RECEIPT_BASE_URL = `${ECOMMERCE_BASE_URL}/checkout/receipt/`;
+const ECOMMERCE_RECEIPT_BASE_URL = RECEIPT_URL
+  ? `${RECEIPT_URL}` : `${ECOMMERCE_BASE_URL}/checkout/receipt/`;
+const ECOMMERCE_ORDERS_URL = ORDER_HISTORY_URL
+  ? `${ORDER_HISTORY_URL}` : `${ECOMMERCE_API_BASE_URL}/orders/`;
 
 // eslint-disable-next-line import/prefer-default-export
 export async function getOrders(page = 1, pageSize = 20) {
   const httpClient = getAuthenticatedHttpClient();
   const { username } = getAuthenticatedUser();
-  const { COMMERCE_COORDINATOR_BASE_URL } = getConfig();
-  const orderFetchingUrl = `${COMMERCE_COORDINATOR_BASE_URL}/orders/order_history/`;
 
-  // [START] TEMPORARY CODE for rollout testing/confirmation===========
-  // Call ecommerce for order info including waffle flag
-  let { data } = await httpClient.get(`${ECOMMERCE_API_BASE_URL}/orders/`, {
+  const { data } = await httpClient.get(`${ECOMMERCE_ORDERS_URL}`, {
     params: {
       username,
       page,
       page_size: pageSize,
     },
   });
 
-  let callCC = false;
-  if (data.count > 0) {
-    callCC = data.results[0].enable_hoist_order_history;
-  }
-
-  if (callCC) {
-    // REV-2577: enable_hoist_order_history flag is on, about to call commerce-coordinator
-    const newData = await httpClient.get(orderFetchingUrl, {
-      params: {
-        username,
-        page,
-        page_size: pageSize,
-      },
-    });
-    data = newData.data;
-  }
-  // [END] TEMPORARY CODE for rollout testing/confirmation===========
-
-  // @TODO: after we've confirmed the above works in prod, we can replace with this:
-  // let { data } = await httpClient.get(orderFetchingUrl, {
-  //   params: {
-  //     username,
-  //     page,
-  //     page_size: pageSize,
-  //   },
-  // });
-  // data = newData.data;
-
   const transformedResults = data.results.map(({
     total_excl_tax, // eslint-disable-line camelcase
     lines,