Merge pull request #15 from YotpoLtd/release/21.5.5

Release/21.5.5

Author: WarriorAchilles

Documentation/Integration Guide - Yotpo.docx

@@ -13,7 +13,9 @@ function prepareCustomerJSON(profile) {
     var customerJSON;
 
     try {
-        var customerEmail = YotpoUtils.escape(profile.email, Constants.REGEX_FOR_YOTPO_DATA, '');
+        // Removing the escape for now as this regex removes special chars. Potentially in the future we could implement a more accurate regex
+        // var customerEmail = YotpoUtils.escape(profile.email, Constants.REGEX_FOR_YOTPO_DATA, '');
+        var customerEmail = profile.email;
 
         if (!customerEmail) {
             throw new Error(Constants.EXPORT_CUSTOMER_MISSING_MANDATORY_FIELDS_ERROR);

cartridges/int_yotpo_sfra/cartridge/models/loyalty/common/loyaltyCustomerModel.js

@@ -293,9 +293,13 @@ function prepareOrderJSON(order) {
         var customerEmail = null;
 
         if (!empty(customerProfile)) {
-            customerEmail = empty(customerProfile.email) ? null : YotpoUtils.escape(customerProfile.email, Constants.REGEX_FOR_YOTPO_DATA, '');
+            // Removing the escape for now as this regex removes special chars. Potentially in the future we could implement a more accurate regex
+            //customerEmail = empty(customerProfile.email) ? null : YotpoUtils.escape(customerProfile.email, Constants.REGEX_FOR_YOTPO_DATA, '');
+            customerEmail = empty(customerProfile.email) ? null : customerProfile.email;
         } else {
-            customerEmail = empty(order.customerEmail) ? null : YotpoUtils.escape(order.customerEmail, Constants.REGEX_FOR_YOTPO_DATA, '');
+            // Removing the escape for now as this regex removes special chars. Potentially in the future we could implement a more accurate regex
+            // customerEmail = empty(order.customerEmail) ? null : YotpoUtils.escape(order.customerEmail, Constants.REGEX_FOR_YOTPO_DATA, '');
+            customerEmail = empty(order.customerEmail) ? null : order.customerEmail;
         }
 
         if (!order.orderNo || !customerEmail || !order.currencyCode || empty(orderTotalPrice)) {
@@ -355,7 +359,9 @@ function prepareOrderJSON(order) {
             customerJSON.id = customerProfile.customerNo;
             customerJSON.first_name = YotpoUtils.escape(customerProfile.firstName, Constants.REGEX_FOR_YOTPO_DATA, '');
             customerJSON.last_name = YotpoUtils.escape(customerProfile.lastName, Constants.REGEX_FOR_YOTPO_DATA, '');
-            customerJSON.email = YotpoUtils.escape(customerProfile.email, Constants.REGEX_FOR_YOTPO_DATA, '');
+            // Removing the escape for now as this regex removes special chars. Potentially in the future we could implement a more accurate regex
+            // customerJSON.email = YotpoUtils.escape(customerProfile.email, Constants.REGEX_FOR_YOTPO_DATA, '');
+            customerJSON.email = customerProfile.email;
         }
 
         var orderPriceAjustments = new Array();

cartridges/int_yotpo_sfra/cartridge/models/loyalty/common/loyaltyOrderModel.js

@@ -21,7 +21,7 @@ exports.YOTPO_CONFIGURATION_OBJECT = 'yotpoConfiguration';
 exports.YOTPO_JOBS_CONFIGURATION_OBJECT = 'yotpoJobsConfiguration';
 exports.DATE_FORMAT_FOR_YOTPO_DATA = 'yyyy-MM-dd';
 exports.PLATFORM_FOR_YOTPO_DATA = 'commerce_cloud';
-exports.YOTPO_CARTRIDGE_VERSION = '21.5.4';
+exports.YOTPO_CARTRIDGE_VERSION = '21.5.5';
 exports.REGEX_BASE_FOR_YOTPO_DATA = '^0-9a-zA-Z';
 exports.PRODUCT_REGEX_FOR_YOTPO_DATA = '[^0-9a-zA-Z\\_\\-]+';
 exports.REGEX_FOR_YOTPO_DATA = '[^0-9a-zA-Z\\s\\_\\-]+'; // allowing whitespace in this one

cartridges/int_yotpo_sfra/cartridge/scripts/utils/constants.js

@@ -1,7 +1,7 @@
 {
     "name": "link_yotpo",
     "packageName": "int_yotpo_sfra",
-    "version": "21.5.4",
+    "version": "21.5.5",
     "description": "Yotpo ratings and reviews integration for SFCC Storefront Reference Architecture",
     "author": "CQL Inc.",
     "main": "index.js",