@financial-times/n-conversion-forms 27.0.4 → 27.0.7

package/components/__snapshots__/delivery-instructions.spec.js.snap

@@ -72,7 +72,7 @@ exports[`DeliveryInstructions renders with a custom value 1`] = `
       For newspaper delivery, we can only deliver to the ground floor, so if you live in an apartment, we’ll leave the newspaper at reception or by the entrance. We deliver in the early hours of the morning so our drivers won’t be able to contact you or ring your doorbell.
     </span>
     <span class="o-forms-title__prompt">
-      Special characters including punctuation cannot be used in the Delivery instructions.
+      Special characters including punctuation cannot be used in the delivery instructions.
     </span>
   </span>
   <span class="o-forms-input o-forms-input--textarea">
@@ -101,7 +101,7 @@ exports[`DeliveryInstructions renders with a disabled input element 1`] = `
       For newspaper delivery, we can only deliver to the ground floor, so if you live in an apartment, we’ll leave the newspaper at reception or by the entrance. We deliver in the early hours of the morning so our drivers won’t be able to contact you or ring your doorbell.
     </span>
     <span class="o-forms-title__prompt">
-      Special characters including punctuation cannot be used in the Delivery instructions.
+      Special characters including punctuation cannot be used in the delivery instructions.
     </span>
   </span>
   <span class="o-forms-input o-forms-input--textarea">
@@ -130,7 +130,7 @@ exports[`DeliveryInstructions renders with an error 1`] = `
       For newspaper delivery, we can only deliver to the ground floor, so if you live in an apartment, we’ll leave the newspaper at reception or by the entrance. We deliver in the early hours of the morning so our drivers won’t be able to contact you or ring your doorbell.
     </span>
     <span class="o-forms-title__prompt">
-      Special characters including punctuation cannot be used in the Delivery instructions.
+      Special characters including punctuation cannot be used in the delivery instructions.
     </span>
   </span>
   <span class="o-forms-input o-forms-input--textarea o-forms-input--invalid">
@@ -158,7 +158,7 @@ exports[`DeliveryInstructions renders with default props 1`] = `
       For newspaper delivery, we can only deliver to the ground floor, so if you live in an apartment, we’ll leave the newspaper at reception or by the entrance. We deliver in the early hours of the morning so our drivers won’t be able to contact you or ring your doorbell.
     </span>
     <span class="o-forms-title__prompt">
-      Special characters including punctuation cannot be used in the Delivery instructions.
+      Special characters including punctuation cannot be used in the delivery instructions.
     </span>
   </span>
   <span class="o-forms-input o-forms-input--textarea">
@@ -186,7 +186,7 @@ exports[`DeliveryInstructions renders with maxlength 1`] = `
       For newspaper delivery, we can only deliver to the ground floor, so if you live in an apartment, we’ll leave the newspaper at reception or by the entrance. We deliver in the early hours of the morning so our drivers won’t be able to contact you or ring your doorbell.
     </span>
     <span class="o-forms-title__prompt">
-      Special characters including punctuation cannot be used in the Delivery instructions.
+      Special characters including punctuation cannot be used in the delivery instructions.
     </span>
   </span>
   <span class="o-forms-input o-forms-input--textarea">
@@ -215,7 +215,7 @@ exports[`DeliveryInstructions renders with rows 1`] = `
       For newspaper delivery, we can only deliver to the ground floor, so if you live in an apartment, we’ll leave the newspaper at reception or by the entrance. We deliver in the early hours of the morning so our drivers won’t be able to contact you or ring your doorbell.
     </span>
     <span class="o-forms-title__prompt">
-      Special characters including punctuation cannot be used in the Delivery instructions.
+      Special characters including punctuation cannot be used in the delivery instructions.
     </span>
   </span>
   <span class="o-forms-input o-forms-input--textarea">

package/components/delivery-instructions.jsx

@@ -1,6 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
+import { identifyFTShippingZone } from '../helpers/supportedCountries';
+
 
 const spanMessageByCountry = {
 	GBR: (
@@ -32,6 +34,57 @@ const spanMessageByCountry = {
 			<a href="https://help.ft.com/contact/">FT Customer Care</a>.
 		</span>
 	),
+	CEMEA_V1: (
+		<>
+			<span className="o-forms-title__prompt">
+				Newspaper delivery is restricted to ground floor addresses.
+				If you live in an apartment the newspaper will be left at reception or by the entrance.
+				Delivery is made in the early hours making it sometimes difficult to identify the right
+				delivery location or gaining access where letter boxes are inside a building.
+			</span>
+			<span className="o-forms-title__prompt">
+				Special characters including punctuation cannot be used in the delivery instructions.
+			</span>
+			<span className="o-forms-title__prompt">
+				If you prefer delivery to a mailbox, please either select the “PO Box” delivery option from the top of this form, or contact&nbsp;
+				<a href="https://help.ft.com/contact/">FT Customer Care</a>.
+			</span>
+		</>
+	),
+	CEMEA_V2: (
+		<>
+			<span className="o-forms-title__prompt">
+				Newspaper delivery is restricted to ground floor addresses.
+				If you live in an apartment the newspaper will be left at reception or by the entrance.
+				Delivery is made in the early hours making it sometimes difficult to identify the right
+				delivery location or gaining access where letter boxes are inside a building.
+			</span>
+			<span className="o-forms-title__prompt">
+				Special characters including punctuation cannot be used in the delivery instructions.
+			</span>
+			<span className="o-forms-title__prompt">
+				If you prefer delivery to a mailbox, please either select the “PO Box” delivery option from the top of this form, or contact&nbsp;
+				<a href="https://help.ft.com/contact/">FT Customer Care</a>.
+			</span>
+		</>
+	),
+	APAC: (
+		<>
+			<span className="o-forms-title__prompt">
+				Newspaper delivery is restricted to ground floor addresses.
+				If you live in an apartment the newspaper will be left at reception or by the entrance.
+				Delivery is made in the early hours making it sometimes difficult to identify the right
+				delivery location or gaining access where letter boxes are inside a building.
+			</span>
+			<span className="o-forms-title__prompt">
+				Special characters including punctuation cannot be used in the delivery instructions.
+			</span>
+			<span className="o-forms-title__prompt">
+				If you prefer delivery to a mailbox, please either select the “PO Box” delivery option from the top of this form, or contact&nbsp;
+				<a href="https://help.ft.com/contact/">FT Customer Care</a>.
+			</span>
+		</>
+	),
 };
 
 export function DeliveryInstructions ({
@@ -79,11 +132,10 @@ export function DeliveryInstructions ({
 	};
 	const deliveryInstructionsMessage = (
 		<span className="o-forms-title__prompt">
-			Special characters including punctuation cannot be used in the Delivery
-			instructions.
+			Special characters including punctuation cannot be used in the delivery instructions.
 		</span>
 	);
-
+	const FTShippingZone = identifyFTShippingZone(country);
 	return (
 		<label
 			id={fieldId}
@@ -93,7 +145,7 @@ export function DeliveryInstructions ({
 		>
 			<span className="o-forms-title">
 				<span className="o-forms-title__main">Delivery instructions</span>
-				{spanMessageByCountry[country]}
+				{spanMessageByCountry[FTShippingZone]}
 				{country === 'GBR' && deliveryInstructionsMessage}
 			</span>
 

package/dist/delivery-instructions.js

@@ -15,6 +15,8 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _supportedCountries = require("../helpers/supportedCountries");
+
 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,7 +34,34 @@ var spanMessageByCountry = {
     className: "o-forms-title__prompt"
   }, "Please note we cannot guarantee delivery of the newspaper to a specific location on your property, which also includes delivery to a specific floor/suite in a building. If you prefer delivery by Canada Post, please either select the \"PO Box\" delivery option from the top of this form, or contact \xA0", /*#__PURE__*/_react["default"].createElement("a", {
     href: "https://help.ft.com/contact/"
-  }, "FT Customer Care"), ".")
+  }, "FT Customer Care"), "."),
+  CEMEA_V1: /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("span", {
+    className: "o-forms-title__prompt"
+  }, "Newspaper delivery is restricted to ground floor addresses. If you live in an apartment the newspaper will be left at reception or by the entrance. Delivery is made in the early hours making it sometimes difficult to identify the right delivery location or gaining access where letter boxes are inside a building."), /*#__PURE__*/_react["default"].createElement("span", {
+    className: "o-forms-title__prompt"
+  }, "Special characters including punctuation cannot be used in the delivery instructions."), /*#__PURE__*/_react["default"].createElement("span", {
+    className: "o-forms-title__prompt"
+  }, "If you prefer delivery to a mailbox, please either select the \u201CPO Box\u201D delivery option from the top of this form, or contact\xA0", /*#__PURE__*/_react["default"].createElement("a", {
+    href: "https://help.ft.com/contact/"
+  }, "FT Customer Care"), ".")),
+  CEMEA_V2: /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("span", {
+    className: "o-forms-title__prompt"
+  }, "Newspaper delivery is restricted to ground floor addresses. If you live in an apartment the newspaper will be left at reception or by the entrance. Delivery is made in the early hours making it sometimes difficult to identify the right delivery location or gaining access where letter boxes are inside a building."), /*#__PURE__*/_react["default"].createElement("span", {
+    className: "o-forms-title__prompt"
+  }, "Special characters including punctuation cannot be used in the delivery instructions."), /*#__PURE__*/_react["default"].createElement("span", {
+    className: "o-forms-title__prompt"
+  }, "If you prefer delivery to a mailbox, please either select the \u201CPO Box\u201D delivery option from the top of this form, or contact\xA0", /*#__PURE__*/_react["default"].createElement("a", {
+    href: "https://help.ft.com/contact/"
+  }, "FT Customer Care"), ".")),
+  APAC: /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("span", {
+    className: "o-forms-title__prompt"
+  }, "Newspaper delivery is restricted to ground floor addresses. If you live in an apartment the newspaper will be left at reception or by the entrance. Delivery is made in the early hours making it sometimes difficult to identify the right delivery location or gaining access where letter boxes are inside a building."), /*#__PURE__*/_react["default"].createElement("span", {
+    className: "o-forms-title__prompt"
+  }, "Special characters including punctuation cannot be used in the delivery instructions."), /*#__PURE__*/_react["default"].createElement("span", {
+    className: "o-forms-title__prompt"
+  }, "If you prefer delivery to a mailbox, please either select the \u201CPO Box\u201D delivery option from the top of this form, or contact\xA0", /*#__PURE__*/_react["default"].createElement("a", {
+    href: "https://help.ft.com/contact/"
+  }, "FT Customer Care"), "."))
 };
 
 function DeliveryInstructions(_ref) {
@@ -79,8 +108,9 @@ function DeliveryInstructions(_ref) {
 
   var deliveryInstructionsMessage = /*#__PURE__*/_react["default"].createElement("span", {
     className: "o-forms-title__prompt"
-  }, "Special characters including punctuation cannot be used in the Delivery instructions.");
+  }, "Special characters including punctuation cannot be used in the delivery instructions.");
 
+  var FTShippingZone = (0, _supportedCountries.identifyFTShippingZone)(country);
   return /*#__PURE__*/_react["default"].createElement("label", {
     id: fieldId,
     className: "o-forms-field o-forms-field--optional",
@@ -90,7 +120,7 @@ function DeliveryInstructions(_ref) {
     className: "o-forms-title"
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "o-forms-title__main"
-  }, "Delivery instructions"), spanMessageByCountry[country], country === 'GBR' && deliveryInstructionsMessage), /*#__PURE__*/_react["default"].createElement("span", {
+  }, "Delivery instructions"), spanMessageByCountry[FTShippingZone], country === 'GBR' && deliveryInstructionsMessage), /*#__PURE__*/_react["default"].createElement("span", {
     className: textAreaWrapperClassNames
   }, /*#__PURE__*/_react["default"].createElement("textarea", textAreaProps)));
 }

package/helpers/index.js

@@ -4,6 +4,7 @@ module.exports = {
 	'cemeaV1ISO': require('./supportedCountries').cemeaV1ISO,
 	'cemeaV2ISO': require('./supportedCountries').cemeaV2ISO,
 	'apacISO': require('./supportedCountries').apacISO,
+	'identifyFTShippingZone': require('./supportedCountries').identifyFTShippingZone,
 	'countriesSupported': require('./supportedCountries').countriesSupported,
 	'countriesSupportedISO': require('./supportedCountries').countriesSupportedISO,
 	'supportedPostcodeValidators': require('./supportedPostcodeValidators').supportedPostcodeValidators,

package/helpers/supportedPostcodeExamples.js

@@ -2,27 +2,27 @@ const { flattenObj } = require('./utilities');
 
 const supportedPostcodeExamples = {
 	cemeaV1: {
-		AUT: '17087',
+		AUT: '1708',
 		ARE: '', //match anything
 		BEL: '6596',
 		BGR: '4000',
 		HRV: '10000',
-		CZE: '00 100',
+		CZE: '122 00',
 		DNK: '1819',
 		FIN: '39500',
 		DEU: '17087',
 		GRC: '241 00',
 		HUN: '3821',
-		ISL: '60411',
+		ISL: '149',
 		ITA: '23844',
-		LIE: '9480',
+		LIE: '9485',
 		LTU: 'LT-12345',
 		NLD: '6971 HJ',
 		NOR: '1608',
 		POL: '43-190',
 		PRT: '2525-517',
 		QAT: '',//match anything
-		ROU: '71234',
+		ROU: '712341',
 		RUS: '191028',
 		SVK: '98401',
 		SVN: '8263',
@@ -41,7 +41,7 @@ const supportedPostcodeExamples = {
 		KOR: '46500',
 		MYS: '59100',
 		PHL: '2799',
-		SGP: '58416',
+		SGP: '584163',
 		TWN: '100',
 		THA: '10330'
 	},
@@ -54,4 +54,4 @@ const supportedPostcodeExamples = {
 
 const allSupportedPostcodeExamples = flattenObj(supportedPostcodeExamples);
 
-module.exports = { allSupportedPostcodeExamples };
+module.exports = { allSupportedPostcodeExamples, supportedPostcodeExamples };

package/helpers/supportedPostcodeValidators.js

@@ -1,47 +1,47 @@
 const supportedPostcodeValidators = {
 	cemeaV1: {
-		AUT: /^\\d{4}$/,
+		AUT: /^\d{4}$/,
 		ARE: /.*$/, //match anything
-		BEL: /^\\d{4}$/,
-		BGR: /^\\d{4}$/,
-		HRV: /^\\d{5}$/,
-		CZE: /^\\d{5}\\s\\(\\d{3}\\s\\d{2}\\)$/,
-		DNK: /^\\d{4}$/,
-		FIN: /^\\d{5}$/,
-		DEU: /^\\d{5}$/,
-		GRC: /^\\d{3}\\s{0,1}\\d{2}$/,
-		HUN: /^\\d{4}$/,
-		ISL: /^\\d{3}$/,
-		ITA: /^\\d{5}$/,
-		LIE: /^\\d{4}$/,
-		LTU: /^[Ll][Tt][- ]{0,1}\\d{5}$/,
-		NLD: /^\\d{4}\\s{0,1}[A-Za-z]{2}$/,
-		NOR: /^\\d{4}$/,
-		POL: /^\\d{2}[- ]{0,1}\\d{3}$/,
-		PRT: /^\\d{4}$/,
+		BEL: /^\d{4}$/,
+		BGR: /^\d{4}$/,
+		HRV: /^\d{5}$/,
+		CZE: /^\d{3}[ ]?\d{2}$/,
+		DNK: /^\d{4}$/,
+		FIN: /^\d{5}$/,
+		DEU: /^\d{5}$/,
+		GRC: /^\d{3}[ ]?\d{2}$/,
+		HUN: /^\d{4}$/,
+		ISL: /^\d{3}$/,
+		ITA: /^\d{5}$/,
+		LIE: /^(948[5-9])|(949[0-7])$/,
+		LTU: /^[Ll][Tt][- ]{0,1}\d{5}$/,
+		NLD: /\d{4}\s{0,1}[A-Za-z]{2}$/,
+		NOR: /^\d{4}$/,
+		POL: /^\d{2}-\d{3}$/,
+		PRT: /^\d{4}([\-]\d{3})?$/,
 		QAT: /.*$/,//match anything
-		ROU: /^\\d{6}$/,
-		RUS: /^\\d{6}$/,
-		SVK: /^\\d{5}\\s\\(\\d{3}\\s\\d{2}\\)$/,
-		SVN: /^([Ss][Ii][- ]{0,1}){0,1}\\d{4}$/,
-		ZAF: /^\\d{4}$/,
-		ESP: /^\\d{5}$/,
-		SWE: /^\\d{3}\\s*\\d{2}$/,
-		CHE: /^\\d{4}$/
+		ROU: /^\d{6}$/,
+		RUS: /^\d{6}$/,
+		SVK: /^\d{3}[ ]?\d{2}$/,
+		SVN: /^\d{4}$/,
+		ZAF: /^\d{4}$/,
+		ESP: /^\d{5}$/,
+		SWE: /^\d{3}[ ]?\d{2}$/,
+		CHE: /^\d{4}$/
 	},
-	cemeaV2: { FRA: /^[0-9]{5}$/, LUX: /^\\d{4}$/, MCO: /^980\\d{2}$/ },
+	cemeaV2: { FRA: /^[0-9]{5}$/, LUX: /^\d{4}$/, MCO: /^980\d{2}$/ },
 	apac: {
-		CHN: /^\\d{6}$/,
+		CHN: /^\d{6}$/,
 		HKG: /.*$/, //match anything
-		IND: /^\\d{6}$/,
-		IDN: /^\\d{5}$/,
-		JPN: /^\\d{7}\\s\\(\\d{3}-\\d{4}\\)$/,
-		KOR: /^\\d{6}\\s\\(\\d{3}-\\d{3}\\)$/,
-		MYS: /^\\d{5}$/,
-		PHL: /^\\d{4}$/,
-		SGP: /^\\d{2}$/,
-		TWN: /^\\d{5}$/,
-		THA: /^\\d{5}$/
+		IND: /^\d{6}$/,
+		IDN: /^\d{5}$/,
+		JPN: /^\d{3}-\d{4}$/,
+		KOR: /^\d{5}$/,
+		MYS: /^\d{5}$/,
+		PHL: /^\d{4}$/,
+		SGP: /^\d{6}$/,
+		TWN: /^\d{3}(\d{2})?$/,
+		THA: /^\d{5}$/
 	},
 	other: {
 		GBR: /^[A-Za-z]{1,2}[0-9][0-9A-Za-z]?[\s-]?[0-9][A-Za-z]{2}$/,

package/helpers/supportedPostcodeValidators.spec.js

@@ -0,0 +1,26 @@
+const { supportedPostcodeValidators } = require('./supportedPostcodeValidators');
+const { supportedPostcodeExamples } = require('./supportedPostcodeExamples');
+
+describe('supportedPostcodeValidators', () => {
+	it('should validate every cemeaV1 supportedPostcodeExamples', () => {
+		const cemeaV1PostcodeCountryCodes = Object.keys(supportedPostcodeExamples.cemeaV1);
+
+		for ( const cemeaV1PostcodeCountryCode of cemeaV1PostcodeCountryCodes ) {
+			expect(supportedPostcodeValidators.cemeaV1[cemeaV1PostcodeCountryCode].test(supportedPostcodeExamples.cemeaV1[cemeaV1PostcodeCountryCode])).toBe(true);
+		}
+	});
+	it('should validate every cemeaV2 supportedPostcodeExamples', () => {
+		const cemeaV2PostcodeCountryCodes = Object.keys(supportedPostcodeExamples.cemeaV2);
+
+		for ( const cemeaV2PostcodeCountryCode of cemeaV2PostcodeCountryCodes ) {
+			expect(supportedPostcodeValidators.cemeaV2[cemeaV2PostcodeCountryCode].test(supportedPostcodeExamples.cemeaV2[cemeaV2PostcodeCountryCode])).toBe(true);
+		}
+	});
+	it('should validate every apac supportedPostcodeExamples', () => {
+		const apacPostcodeCountryCodes = Object.keys(supportedPostcodeExamples.apac);
+
+		for ( const apacPostcodeCountryCode of apacPostcodeCountryCodes ) {
+			expect(supportedPostcodeValidators.apac[apacPostcodeCountryCode].test(supportedPostcodeExamples.apac[apacPostcodeCountryCode])).toBe(true);
+		}
+	});
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@financial-times/n-conversion-forms",
-  "version": "27.0.4",
+  "version": "27.0.7",
   "description": "Containing jsx components and styles for forms included on Accounts and Acqusition apps (next-signup, next-profile, next-retention, etc).",
   "main": "dist/index.js",
   "scripts": {