@financial-times/n-conversion-forms 26.0.0 → 27.0.0

package/dist/delivery-address.js

@@ -13,6 +13,10 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _deliveryAddressMap = _interopRequireDefault(require("../helpers/deliveryAddressMap"));
+
+var _supportedCountries = require("../helpers/supportedCountries");
+
 function DeliveryAddress(_ref) {
   var _ref$fieldId = _ref.fieldId,
       fieldId = _ref$fieldId === void 0 ? 'deliveryAddressFields' : _ref$fieldId,
@@ -29,31 +33,16 @@ function DeliveryAddress(_ref) {
       _ref$isHidden = _ref.isHidden,
       isHidden = _ref$isHidden === void 0 ? false : _ref$isHidden,
       _ref$country = _ref.country,
-      country = _ref$country === void 0 ? 'GBR' : _ref$country;
+      country = _ref$country === void 0 ? 'GBR' : _ref$country,
+      _ref$addressType = _ref.addressType,
+      addressType = _ref$addressType === void 0 ? 'home' : _ref$addressType;
   var divClassNames = (0, _classnames["default"])([{
     ncf__hidden: isHidden
   }]);
   var inputWrapperClassNames = (0, _classnames["default"])(['o-forms-input', 'o-forms-input--text', {
     'o-forms-input--invalid': hasError
   }]);
-  var addressLine3Title = {
-    GBR: 'Address line 3',
-    USA: 'APT/FL/STE',
-    CAN: 'APT/FL/STE'
-  };
-  var addressLine3Prompt = {
-    USA: 'Max. 6 characters. Please enter “Apartment 2C” as “Apt 2C”, “Floor 10 as FL 10”',
-    CAN: 'Max. 6 characters. Please enter “Apartment 2C” as “Apt 2C”, “Floor 10 as FL 10”'
-  };
-  var addressLine3Placeholder = {
-    USA: 'e.g Apt 2C / FL 10 / STE 50',
-    CAN: 'e.g Apt 2C / FL 10 / STE 50'
-  };
-  var addressLine1Placeholder = {
-    GBR: 'e.g. 10 Elm Street',
-    USA: 'e.g. 10 Elm St.',
-    CAN: 'e.g. 36 Poirier Blvd.'
-  };
+  var FTShippingZone = (0, _supportedCountries.identifyFTShippingZone)(country);
 
   var addressLine1 = /*#__PURE__*/_react["default"].createElement("label", {
     className: "o-forms-field ncf__validation-error",
@@ -62,7 +51,7 @@ function DeliveryAddress(_ref) {
     className: "o-forms-title"
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "o-forms-title__main"
-  }, "Address line 1")), /*#__PURE__*/_react["default"].createElement("span", {
+  }, _deliveryAddressMap["default"][addressType].addressLine1Title[FTShippingZone] || 'Address line 1')), /*#__PURE__*/_react["default"].createElement("span", {
     className: inputWrapperClassNames
   }, /*#__PURE__*/_react["default"].createElement("input", {
     type: "text",
@@ -70,7 +59,7 @@ function DeliveryAddress(_ref) {
     name: "deliveryAddressLine1",
     "data-trackable": "field-deliveryAddressLine1",
     autoComplete: "address-line1",
-    placeholder: addressLine1Placeholder[country],
+    placeholder: _deliveryAddressMap["default"][addressType].addressLine1Placeholder[FTShippingZone],
     maxLength: 50,
     "aria-required": "true",
     required: true,
@@ -95,7 +84,7 @@ function DeliveryAddress(_ref) {
     name: "deliveryAddressLine2",
     "data-trackable": "field-deliveryAddressLine2",
     autoComplete: "address-line2",
-    placeholder: "",
+    placeholder: _deliveryAddressMap["default"][addressType].addressLine2Placeholder[FTShippingZone] || '',
     maxLength: 50,
     disabled: isDisabled,
     defaultValue: line2
@@ -108,9 +97,9 @@ function DeliveryAddress(_ref) {
     className: "o-forms-title"
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "o-forms-title__main"
-  }, addressLine3Title[country]), /*#__PURE__*/_react["default"].createElement("span", {
+  }, _deliveryAddressMap["default"][addressType].addressLine3Title[FTShippingZone]), /*#__PURE__*/_react["default"].createElement("span", {
     className: "o-forms-title__prompt"
-  }, addressLine3Prompt[country])), /*#__PURE__*/_react["default"].createElement("span", {
+  }, _deliveryAddressMap["default"][addressType].addressLine3Prompt[FTShippingZone])), /*#__PURE__*/_react["default"].createElement("span", {
     className: inputWrapperClassNames
   }, /*#__PURE__*/_react["default"].createElement("input", {
     type: "text",
@@ -118,22 +107,19 @@ function DeliveryAddress(_ref) {
     name: "deliveryAddressLine3",
     "data-trackable": "field-deliveryAddressLine3",
     autoComplete: "address-line3",
-    placeholder: addressLine3Placeholder[country] || 'e.g. Apt. 1',
+    placeholder: _deliveryAddressMap["default"][addressType].addressLine3Placeholder[FTShippingZone] || 'e.g. Apt. 1',
     maxLength: 50,
     disabled: isDisabled,
     defaultValue: line3
   })));
 
-  var addressLines = {
-    GBR: /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, ' ', addressLine1, addressLine2, addressLine3, ' '),
-    USA: /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, ' ', addressLine1, addressLine3, addressLine2, ' '),
-    CAN: /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, ' ', addressLine1, addressLine3, addressLine2, ' ')
-  };
+  var addressLines = _deliveryAddressMap["default"][addressType].template(addressLine1, addressLine2, addressLine3, FTShippingZone);
+
   return /*#__PURE__*/_react["default"].createElement("div", {
     id: fieldId,
     "data-validate": "required",
     className: divClassNames
-  }, addressLines[country]);
+  }, addressLines);
 }
 
 DeliveryAddress.propTypes = {
@@ -144,5 +130,6 @@ DeliveryAddress.propTypes = {
   line3: _propTypes["default"].string,
   isDisabled: _propTypes["default"].bool,
   isHidden: _propTypes["default"].bool,
-  country: _propTypes["default"].oneOf(['GBR', 'USA', 'CAN'])
+  country: _propTypes["default"].oneOf(_supportedCountries.countriesSupportedISO),
+  addressType: _propTypes["default"].oneOf(['home', 'company', 'pobox'])
 };

package/dist/delivery-city.js

@@ -13,6 +13,8 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _supportedCountries = require("../helpers/supportedCountries");
+
 function DeliveryCity(_ref) {
   var _ref$hasError = _ref.hasError,
       hasError = _ref$hasError === void 0 ? false : _ref$hasError,
@@ -47,7 +49,7 @@ function DeliveryCity(_ref) {
     name: "deliveryCity",
     "data-trackable": "field-deliveryCity",
     autoComplete: "address-level2",
-    placeholder: inputPlaceholder[country],
+    placeholder: inputPlaceholder[country] || '',
     maxLength: 40,
     "aria-required": "true",
     required: true,
@@ -63,5 +65,5 @@ DeliveryCity.propTypes = {
   value: _propTypes["default"].string,
   isDisabled: _propTypes["default"].bool,
   maxlength: _propTypes["default"].number,
-  country: _propTypes["default"].oneOf(['GBR', 'USA', 'CAN'])
+  country: _propTypes["default"].oneOf(_supportedCountries.countriesSupportedISO)
 };

package/dist/delivery-option.js

@@ -15,6 +15,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _deliveryOptionMessages = require("../utils/delivery-option-messages");
 
+var _supportedCountries = require("../helpers/supportedCountries");
+
 function DeliveryOption(_ref) {
   var _ref$fieldId = _ref.fieldId,
       fieldId = _ref$fieldId === void 0 ? 'deliveryOptionField' : _ref$fieldId,
@@ -28,6 +30,7 @@ function DeliveryOption(_ref) {
   var divClassName = (0, _classnames["default"])(['o-forms-field', 'ncf__delivery-option', {
     'ncf__delivery-option--single': isSingle
   }]);
+  var FTShippingZone = (0, _supportedCountries.identifyFTShippingZone)(country);
   return /*#__PURE__*/_react["default"].createElement("div", {
     id: fieldId,
     className: divClassName,
@@ -39,7 +42,7 @@ function DeliveryOption(_ref) {
     var value = option.value,
         isValidDeliveryOption = option.isValidDeliveryOption,
         isSelected = option.isSelected;
-    var deliveryOptionValue = (0, _deliveryOptionMessages.getDeliveryOption)(productCode, option, country);
+    var deliveryOptionValue = (0, _deliveryOptionMessages.getDeliveryOption)(productCode, option, FTShippingZone);
 
     if (!isValidDeliveryOption || !deliveryOptionValue) {
       return null;
@@ -70,7 +73,7 @@ function DeliveryOption(_ref) {
 }
 
 DeliveryOption.propTypes = {
-  country: _propTypes["default"].oneOf(['GBR', 'USA', 'CAN']).isRequired,
+  country: _propTypes["default"].oneOf(_supportedCountries.countriesSupportedISO).isRequired,
   productCode: _propTypes["default"].string,
   options: _propTypes["default"].arrayOf(_propTypes["default"].shape({
     value: _propTypes["default"].oneOf(['PV', 'HD', 'EV']),

package/dist/delivery-postcode.js

@@ -13,18 +13,37 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var postcodeLabel = {
-  USA: 'Zip Code',
-  CAN: 'Postal Code'
-};
-var promptLabel = {
-  USA: 'Please enter your 5 digit Zip Code',
-  CAN: 'Please enter your 6 digit postal code'
-};
-var placeholderLabel = {
-  USA: 'e.g. 60411',
-  CAN: 'e.g. M4W 2C6'
-};
+var _supportedCountries = require("../helpers/supportedCountries");
+
+var _supportedPostcodeExamples = require("../helpers/supportedPostcodeExamples");
+
+var postcodeLabel = Object.keys(_supportedCountries.countriesSupported).reduce(function (previous, countryCode) {
+  if (countryCode === 'USA') {
+    previous[countryCode] = 'Zip Code';
+  } else if (countryCode === 'GBR') {
+    previous[countryCode] = 'Postcode';
+  } else {
+    previous[countryCode] = 'Postal Code';
+  }
+
+  return previous;
+}, {});
+var promptLabel = Object.keys(_supportedCountries.countriesSupported).reduce(function (previous, countryCode) {
+  if (countryCode === 'USA') {
+    previous[countryCode] = 'Please enter your 5 digit Zip Code';
+  } else if (countryCode === 'CAN') {
+    previous[countryCode] = 'Please enter your 6 digit postal code';
+  } else if (countryCode !== 'GBR') {
+    //GBR has no label
+    previous[countryCode] = 'Please enter your postal code';
+  }
+
+  return previous;
+}, {});
+var placeholderLabel = Object.keys(_supportedPostcodeExamples.allSupportedPostcodeExamples).reduce(function (previous, countryCode) {
+  previous[countryCode] = 'e.g. ' + _supportedPostcodeExamples.allSupportedPostcodeExamples[countryCode];
+  return previous;
+}, {});
 
 function DeliveryPostcode(_ref) {
   var _ref$value = _ref.value,

package/dist/index.js

@@ -21,12 +21,6 @@ Object.defineProperty(exports, "B2CPartnershipConfirmation", {
     return _b2cPartnershipConfirmation.B2CPartnershipConfirmation;
   }
 });
-Object.defineProperty(exports, "B2cPartnershipPaymentTerm", {
-  enumerable: true,
-  get: function get() {
-    return _b2cPartnershipPaymentTerm.B2cPartnershipPaymentTerm;
-  }
-});
 Object.defineProperty(exports, "BillingCity", {
   enumerable: true,
   get: function get() {
@@ -333,6 +327,12 @@ Object.defineProperty(exports, "Submit", {
     return _submit.Submit;
   }
 });
+Object.defineProperty(exports, "TextInput", {
+  enumerable: true,
+  get: function get() {
+    return _textInput.TextInput;
+  }
+});
 Object.defineProperty(exports, "TrialBanner", {
   enumerable: true,
   get: function get() {
@@ -344,8 +344,6 @@ var _acceptTerms = require("./accept-terms");
 
 var _appBanner = require("./app-banner");
 
-var _b2cPartnershipPaymentTerm = require("./b2c-partnership-payment-term");
-
 var _billingCity = require("./billing-city");
 
 var _billingCountry = require("./billing-country");
@@ -450,4 +448,6 @@ var _graduationDate = require("./graduation-date");
 
 var _liteSubConfirmation = require("./lite-sub-confirmation");
 
-var _googleSignIn = require("./google-sign-in");
+var _googleSignIn = require("./google-sign-in");
+
+var _textInput = require("./text-input");

package/dist/message.js

@@ -89,7 +89,7 @@ var actionType = _propTypes["default"].shape({
   link: _propTypes["default"].string.isRequired,
   isSecondary: _propTypes["default"].bool,
   text: _propTypes["default"].string,
-  target: '_self'
+  target: _propTypes["default"].oneOf(['_self'])
 });
 
 Message.propTypes = {

package/dist/payment-term.js

@@ -15,6 +15,8 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _nPricing = require("@financial-times/n-pricing");
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -32,13 +34,54 @@ function PaymentTerm(_ref) {
       options = _ref$options === void 0 ? [] : _ref$options,
       _ref$isFixedTermOffer = _ref.isFixedTermOffer,
       isFixedTermOffer = _ref$isFixedTermOffer === void 0 ? false : _ref$isFixedTermOffer,
-      displayName = _ref.displayName,
+      offerDisplayName = _ref.offerDisplayName,
       _ref$showLegal = _ref.showLegal,
       showLegal = _ref$showLegal === void 0 ? true : _ref$showLegal,
       _ref$largePrice = _ref.largePrice,
       largePrice = _ref$largePrice === void 0 ? false : _ref$largePrice,
       _ref$optionsInARow = _ref.optionsInARow,
       optionsInARow = _ref$optionsInARow === void 0 ? false : _ref$optionsInARow;
+
+  /**
+   * Compute monthly price for given term name
+   * @param {number} amount price in number format
+   * @param {string} currency country id of the currency
+   * @param {string} period PxY (yearly) or PxM (montly) where x is the amount of years/months
+   * @returns {string}
+   */
+  var getMontlyPriceFromPeriod = function getMontlyPriceFromPeriod(amount, currency, period) {
+    var periodObj = new _nPricing.Period(period);
+    var monthlyPrice = periodObj.calculatePrice('P1M', amount);
+    return new _nPricing.Monthly({
+      value: monthlyPrice,
+      currency: currency
+    }).getAmount('monthly');
+  };
+  /**
+   * returns period converted to time if found
+   * otherwise returns empty string to avoid show information not mapped
+   * @param {string} period PxY (yearly) or PxM (montly) where x is the amount of years/months
+   * @returns {string}
+   */
+
+
+  var getTimeFromPeriod = function getTimeFromPeriod(period) {
+    var freq = period.substring(period.length - 1) === 'Y' ? 'years' : 'months';
+    var amount = period.substring(1, period.length - 1);
+    return period ? "".concat(amount, " ").concat(freq) : '';
+  };
+
+  var isValidPeriod = function isValidPeriod(period) {
+    try {
+      // Period should throw an error if it is not properly provided
+      // in order to validate it, we just send in case type is string
+      new _nPricing.Period(typeof period === 'string' ? period : '');
+      return true;
+    } catch (e) {
+      return false;
+    }
+  };
+
   var nameMap = {
     annual: {
       title: 'Annual',
@@ -103,6 +146,30 @@ function PaymentTerm(_ref) {
           className: "ncf__payment-term__renews-text"
         }, textToDisplay);
       }
+    },
+    custom: {
+      price: function price(_price4) {
+        return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, "Single", ' ', /*#__PURE__*/_react["default"].createElement("span", {
+          className: "ncf__payment-term__price ncf__strong"
+        }, _price4), ' ', "payment");
+      },
+      trialPrice: function trialPrice(_trialPrice, trialPeriod) {
+        return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, "Unless you cancel during your trial you will be billed", ' ', /*#__PURE__*/_react["default"].createElement("span", {
+          className: "ncf__payment-term__price"
+        }, _trialPrice), " per ", trialPeriod, "after the trial period.");
+      },
+      monthlyPrice: function monthlyPrice(_monthlyPrice) {
+        return Boolean(_monthlyPrice) && /*#__PURE__*/_react["default"].createElement("span", {
+          className: "ncf__payment-term__equivalent-price"
+        }, "That\u2019s equivalent to", ' ', /*#__PURE__*/_react["default"].createElement("span", {
+          className: "ncf__payment-term__monthly-price"
+        }, _monthlyPrice), ' ', "per month");
+      },
+      renewsText: function renewsText(renewalPeriod) {
+        return Boolean(renewalPeriod) && /*#__PURE__*/_react["default"].createElement("p", {
+          className: "ncf__payment-term__renews-text"
+        }, "Renews every ", renewalPeriod, " unless cancelled");
+      }
     }
   };
 
@@ -122,14 +189,16 @@ function PaymentTerm(_ref) {
       defaultChecked: true
     });
 
-    var showTrialCopyInTitle = option.isTrial && !isPrintOrBundle && !isEpaper;
-    var defaultTitle = option.name ? nameMap[option.name].title : '';
-    var title = isFixedTermOffer ? "".concat(displayName, " - ").concat(defaultTitle) : defaultTitle;
-
     var createDiscount = function createDiscount() {
       return option.discount && /*#__PURE__*/_react["default"].createElement("span", {
         className: "ncf__payment-term__discount"
-      }, option.bestOffer ? 'Best offer -' : 'Save', " ", option.discount, " off RRP");
+      }, option.bestOffer ? 'Best offer' : "Save ".concat(option.discount, " off RRP"));
+    };
+
+    var createB2cDiscountCopy = function createB2cDiscountCopy() {
+      return option.name === 'annual' && option.b2cPartnership && option.b2cDiscountCopy && /*#__PURE__*/_react["default"].createElement("span", {
+        className: "ncf__payment-term__discount"
+      }, option.b2cDiscountCopy);
     };
 
     var createDescription = function createDescription() {
@@ -139,24 +208,59 @@ function PaymentTerm(_ref) {
         className: "ncf__payment-term__trial-price"
       }, option.trialPrice), /*#__PURE__*/_react["default"].createElement("br", null), nameMap[option.name] && nameMap[option.name].trialPrice(option.price)) : /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, nameMap[option.name] ? /*#__PURE__*/_react["default"].createElement("div", {
         className: "ncf__payment-term__description"
-      }, nameMap[option.name].price(option.price), nameMap[option.name].monthlyPrice(option.monthlyPrice), nameMap[option.name].renewsText(isFixedTermOffer)) : /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("span", {
+      }, nameMap[option.name].price(option.price), nameMap[option.name].monthlyPrice(option.monthlyPrice), nameMap[option.name].renewsText(isFixedTermOffer)) : // this should cover the cases different than annual, quarterly and monthly
+      // for those containing period on option.value, render custom template, for the rest keep legacy render
+      isValidPeriod(option.value) ? /*#__PURE__*/_react["default"].createElement("div", {
+        className: "ncf__payment-term__description"
+      }, nameMap['custom'].price(option.price), nameMap['custom'].monthlyPrice(option.monthlyPrice && option.monthlyPrice !== '0' ? Number(option.monthlyPrice) : getMontlyPriceFromPeriod(option.amount, option.currency, option.value)), nameMap['custom'].renewsText(getTimeFromPeriod(option.value))) : /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("span", {
         className: largePrice ? 'ncf__payment-term__large-price' : ''
       }, option.price), option.chargeOnText && /*#__PURE__*/_react["default"].createElement("p", {
         className: "ncf__payment-term__charge-on-text"
       }, option.chargeOnText)));
     };
 
+    var getTermDisplayName = function getTermDisplayName() {
+      var showTrialCopyInTitle = option.isTrial && !isPrintOrBundle && !isEpaper;
+      var defaultTitle = option.name && nameMap[option.name] ? nameMap[option.name].title : '';
+      var title = isFixedTermOffer ? "".concat(offerDisplayName, " - ").concat(defaultTitle) : defaultTitle;
+      var termDisplayName = '';
+
+      if (showTrialCopyInTitle) {
+        var termName = option.displayName ? option.displayName : 'Premium Digital';
+        termDisplayName = "Trial: ".concat(termName, " - ");
+      }
+
+      var getTermPeriod = function getTermPeriod() {
+        // annual, quarterly and monthly
+        if (nameMap[option.name]) {
+          return title;
+        } // custom offer with period provided
+
+
+        if (isValidPeriod(option.value)) {
+          return getTimeFromPeriod(option.value);
+        } // custom legacy cases, where period is not provided
+
+
+        return option.title;
+      };
+
+      var termPeriod = getTermPeriod();
+      termDisplayName = "".concat(termDisplayName).concat(termPeriod, " ");
+      return termDisplayName;
+    };
+
     return /*#__PURE__*/_react["default"].createElement("div", {
       key: option.value,
       className: className
     }, /*#__PURE__*/_react["default"].createElement("input", props), /*#__PURE__*/_react["default"].createElement("label", {
       htmlFor: option.value,
       className: "o-forms-input__label ncf__payment-term__label"
-    }, createDiscount(), /*#__PURE__*/_react["default"].createElement("span", {
+    }, createDiscount(), createB2cDiscountCopy(), /*#__PURE__*/_react["default"].createElement("span", {
       className: (0, _classnames["default"])(['ncf__payment-term__title', {
         'ncf__payment-term__title--large-price': largePrice
       }])
-    }, showTrialCopyInTitle ? 'Trial: Premium Digital - ' : '', nameMap[option.name] ? title : option.title, ' ', option.subTitle && /*#__PURE__*/_react["default"].createElement("span", {
+    }, getTermDisplayName(), option.subTitle && /*#__PURE__*/_react["default"].createElement("span", {
       className: "ncf__regular ncf__payment-term__sub-title"
     }, option.subTitle)), createDescription()));
   };
@@ -191,6 +295,8 @@ PaymentTerm.propTypes = {
   isPrintOrBundle: _propTypes["default"].bool,
   isEpaper: _propTypes["default"].bool,
   options: _propTypes["default"].arrayOf(_propTypes["default"].shape({
+    b2cDiscountCopy: _propTypes["default"].string,
+    isB2cPartnership: _propTypes["default"].bool,
     discount: _propTypes["default"].string,
     isTrial: _propTypes["default"].bool,
     name: _propTypes["default"].string.isRequired,
@@ -198,7 +304,7 @@ PaymentTerm.propTypes = {
     selected: _propTypes["default"].bool,
     trialDuration: _propTypes["default"].string,
     trialPrice: _propTypes["default"].string,
-    amount: _propTypes["default"].number,
+    amount: _propTypes["default"].string,
     trialAmount: _propTypes["default"].number,
     value: _propTypes["default"].string.isRequired,
     monthlyPrice: _propTypes["default"].string,
@@ -208,7 +314,7 @@ PaymentTerm.propTypes = {
     chargeOnText: _propTypes["default"].string
   })),
   isFixedTermOffer: _propTypes["default"].bool,
-  displayName: _propTypes["default"].string,
+  offerDisplayName: _propTypes["default"].string,
   showLegal: _propTypes["default"].bool,
   largePrice: _propTypes["default"].bool,
   optionsInARow: _propTypes["default"].bool

package/dist/payment-type.js

@@ -189,7 +189,8 @@ function PaymentType(_ref) {
     type: 'checkbox',
     name: 'payFasterNextTime',
     value: 'true',
-    required: false
+    required: false,
+    checked: true
   }, isSingleTermChecked && {
     defaultChecked: true
   });
@@ -201,7 +202,9 @@ function PaymentType(_ref) {
     className: "o-forms-input o-forms-input--radio-box ncf__payment-type-selector"
   }, createPaymentTypes()), /*#__PURE__*/_react["default"].createElement("div", {
     className: "o-forms-input__error"
-  }, "Please enter a valid payment type"), createDirectDebitPanel(), createZuoraPanel(), isSingleTerm && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("label", {
+  }, "Please enter a valid payment type"), createDirectDebitPanel(), createZuoraPanel()), /*#__PURE__*/_react["default"].createElement("div", {
+    className: "o-forms-field"
+  }, isSingleTerm && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("label", {
     className: "o-forms-input o-forms-input--checkbox o-forms-input--suffix ncf__payment-type-pay-faster-next-time-checkbox",
     htmlFor: "payFasterNextTime"
   }, /*#__PURE__*/_react["default"].createElement("input", inputCheckProps), /*#__PURE__*/_react["default"].createElement("span", {

package/dist/position.js

@@ -15,7 +15,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _nCommonStaticData = require("n-common-static-data");
 
-var defaultOptions = _nCommonStaticData.demographics.positions.positions;
+var B2CPositions = _nCommonStaticData.demographics.positions.positions;
+var B2BPositions = _nCommonStaticData.b2b.demographics.positions.positions;
 
 function Position(_ref) {
   var value = _ref.value,
@@ -29,8 +30,10 @@ function Position(_ref) {
       selectId = _ref$selectId === void 0 ? 'position' : _ref$selectId,
       _ref$selectName = _ref.selectName,
       selectName = _ref$selectName === void 0 ? 'position' : _ref$selectName,
+      _ref$isB2B = _ref.isB2B,
+      isB2B = _ref$isB2B === void 0 ? false : _ref$isB2B,
       _ref$options = _ref.options,
-      options = _ref$options === void 0 ? defaultOptions : _ref$options,
+      options = _ref$options === void 0 ? isB2B ? B2BPositions : B2CPositions : _ref$options,
       _ref$isRequired = _ref.isRequired,
       isRequired = _ref$isRequired === void 0 ? true : _ref$isRequired,
       _ref$fieldLabel = _ref.fieldLabel,
@@ -81,6 +84,7 @@ Position.propTypes = {
   fieldId: _propTypes["default"].string,
   selectId: _propTypes["default"].string,
   selectName: _propTypes["default"].string,
+  isB2B: _propTypes["default"].bool,
   options: _propTypes["default"].arrayOf(_propTypes["default"].shape({
     code: _propTypes["default"].string,
     description: _propTypes["default"].string