Revert "Rewrite sanitize function for more sophisticated error handling"

This reverts commit db638ff.

Author: Artem

demo/peacock/package.json

@@ -5,7 +5,6 @@
   "main": "index.js",
   "scripts": {
     "lint": "eslint --ext .js --ext .jsx .",
-    "fix-lint": "eslint --ext .js --ext .jsx . --fix",
     "flow": "flow check",
     "dev": "gulp dev --optimize_for_size --stack_size=4096",
     "test": "node_modules/mocha/bin/mocha",

demo/peacock/src/components/cart/cart.jsx

@@ -11,7 +11,6 @@ import * as tracking from 'lib/analytics';
 import localized from 'lib/i18n';
 import { emailIsSet } from 'paragons/auth';
 import sanitizeAll from 'sanitizers';
-import sanitizeLineItems from 'sanitizers/line-items';
 
 // actions
 import * as actions from 'modules/cart';
@@ -50,7 +49,7 @@ type Props = {
   applePayAvailable: boolean,
   checkApplePay: () => void,
   location: Object,
-  beginApplePay: (paymentRequest: Object) => Promise<*>,
+  beginApplePay: (paymentRequest: Object, lineItems: Object) => Promise<*>,
 };
 
 type State = {
@@ -147,9 +146,29 @@ class Cart extends Component {
 
   @autobind
   sanitize(err) {
-    const sanitizedLineItems = sanitizeLineItems(err, this.props.skus);
+    if (/Following SKUs are out/.test(err)) {
+      const skus = err.split('.')[0].split(':')[1].split(',');
 
-    return sanitizedLineItems ? sanitizedLineItems : sanitizeAll(err);
+      const products = _.reduce(skus, (acc, outOfStock) => {
+        const sku = _.find(this.props.skus, { sku: outOfStock.trim() });
+        if (sku) {
+          return [
+            ...acc,
+            sku.name,
+          ];
+        }
+
+        return acc;
+      }, []);
+
+      return (
+        <span>
+          Products <strong>{products.join(', ')}</strong> are out of stock. Please remove them to complete the checkout.
+        </span>
+      );
+    }
+
+    return sanitizeAll(err);
   }
 
   get errorsLine() {
@@ -177,7 +196,7 @@ class Cart extends Component {
 
   @autobind
   beginApplePay() {
-    const { total } = this.props.totals;
+    const { total, taxes, adjustments } = this.props.totals;
     const amount = (parseFloat(total) / 100).toFixed(2);
     const paymentRequest = {
       countryCode: 'US',
@@ -197,7 +216,12 @@ class Cart extends Component {
       ],
     };
 
-    this.props.beginApplePay(paymentRequest).then(() => {
+    const lineItems = {
+      taxes,
+      promotion: adjustments,
+    };
+
+    this.props.beginApplePay(paymentRequest, lineItems).then(() => {
       this.setState({ errors: null });
       browserHistory.push('/checkout/done');
     })

demo/peacock/src/modules/checkout.js

@@ -122,10 +122,10 @@ export const checkApplePay = _checkApplePay.perform;
 
 const _beginApplePay = createAsyncActions(
   'beginApplePay',
-  function(paymentRequest) {
+  function(paymentRequest, lineItems) {
     const { dispatch } = this;
 
-    return foxApi.applePay.beginApplePay(paymentRequest)
+    return foxApi.applePay.beginApplePay(paymentRequest, lineItems)
       .then((res) => {
         tracking.purchase({
           ...res,

demo/peacock/src/pages/checkout/checkout.jsx

@@ -10,7 +10,6 @@ import { browserHistory } from 'lib/history';
 import * as tracking from 'lib/analytics';
 import { emailIsSet, isGuest } from 'paragons/auth';
 import classNames from 'classnames';
-import sanitizeLineItems from 'sanitizers/line-items';
 
 // actions
 import * as actions from 'modules/checkout';
@@ -118,9 +117,26 @@ class Checkout extends Component {
 
   @autobind
   sanitizeError(error) {
-    const sanitizedLineItems = sanitizeLineItems(error, this.props.cart.skus);
-    if (sanitizedLineItems) {
-      return sanitizedLineItems;
+    if (/Following SKUs are out/.test(error)) {
+      const skus = error.split('.')[0].split(':')[1].split(',');
+
+      const products = _.reduce(skus, (acc, outOfStock) => {
+        const sku = _.find(this.props.cart.skus, { sku: outOfStock.trim() });
+        if (sku) {
+          return [
+            ...acc,
+            sku.name,
+          ];
+        }
+
+        return acc;
+      }, []);
+
+      return (
+        <span>
+          Products <strong>{products.join(', ')}</strong> are out of stock. Please remove them to complete the checkout.
+        </span>
+      );
     } else if (/is blacklisted/.test(error)) {
       return 'Your account has been blocked from making purchases on this site';
     }