abmp-npm 1.1.90 → 1.1.92

package/backend/contacts-methods.js

@@ -3,7 +3,33 @@ const { auth } = require('@wix/essentials');
 
 const elevatedGetContact = auth.elevate(contacts.getContact);
 const elevatedUpdateContact = auth.elevate(contacts.updateContact);
+const elevatedCreateContact = auth.elevate(contacts.createContact);
 
+/**
+ * Create a contact in Wix CRM
+ * @param {Object} contactData - Contact data
+ * @param {boolean} allowDuplicates - Allow duplicates if contact with same email already exists, will be true only when handling existing members, after that should be removed
+ * @returns {Promise<Object>} - Contact data
+ */
+async function createSiteContact(contactData, allowDuplicates = false) {
+  if (!contactData || !(contactData.contactFormEmail || contactData.email)) {
+    throw new Error('Contact data is required');
+  }
+  const phones =
+    Array.isArray(contactData.phones) && contactData.phones.length > 0 ? contactData.phones : [];
+  const contactInfo = {
+    name: {
+      first: contactData.firstName,
+      last: contactData.lastName,
+    },
+    emails: [
+      { items: [{ email: contactData.contactFormEmail || contactData.email, primary: true }] },
+    ],
+    phones: [{ items: phones.map(phone => ({ phone })) }],
+  };
+  const createContactResponse = await elevatedCreateContact(contactInfo, { allowDuplicates });
+  return createContactResponse.contact._id;
+}
 /**
  * Generic contact update helper function
  * @param {string} contactId - The contact ID in Wix CRM
@@ -14,18 +40,13 @@ async function updateContactInfo(contactId, updateInfoCallback, operationName) {
   if (!contactId) {
     throw new Error('Contact ID is required');
   }
-  console.log('updateContactInfo contactId', contactId);
-  console.log('updateContactInfo operationName', operationName);
+
   try {
     const contact = await elevatedGetContact(contactId);
-    console.log('updateContactInfo contact', contact);
     const currentInfo = contact.info;
-    console.log('updateContactInfo currentInfo', currentInfo);
     const updatedInfo = updateInfoCallback(currentInfo);
-    console.log('updateContactInfo updatedInfo', updatedInfo);
-    const updatedContact = await elevatedUpdateContact(contactId, updatedInfo, contact.revision);
-    console.log('updateContactInfo updatedContact', updatedContact);
-    return updatedContact;
+
+    await elevatedUpdateContact(contactId, updatedInfo, contact.revision);
   } catch (error) {
     console.error(`Error in ${operationName}:`, error);
     throw new Error(`Failed to ${operationName}: ${error.message}`);
@@ -38,8 +59,6 @@ async function updateContactInfo(contactId, updateInfoCallback, operationName) {
  * @param {string} newEmail - The new email address
  */
 async function updateContactEmail(contactId, newEmail) {
-  console.log('updateContactEmail contactId', contactId);
-  console.log('updateContactEmail newEmail', newEmail);
   if (!newEmail) {
     throw new Error('New email is required');
   }
@@ -62,27 +81,33 @@ async function updateContactEmail(contactId, newEmail) {
 }
 
 /**
- * Updates contact names in Wix CRM
- * @param {string} contactId - The contact ID in Wix CRM
- * @param {string} firstName - The new first name
- * @param {string} lastName - The new last name
+ * Updates contact names in Wix CRM for both contact and member
+ * @param {Object} params - Parameters object
+ * @param {string} params.wixContactId - The contact ID in Wix CRM
+ * @param {string} params.wixMemberId - The member ID in Wix CRM
+ * @param {string} params.firstName - The new first name
+ * @param {string} params.lastName - The new last name
  */
-async function updateContactNames(contactId, firstName, lastName) {
+async function updateMemberAndContactNames({ wixContactId, wixMemberId, firstName, lastName }) {
+  //TODO: rethink if we should keep all info just in contact, meaning no need to update the member
   if (!firstName && !lastName) {
     throw new Error('At least one name field is required');
   }
 
-  return await updateContactInfo(
-    contactId,
-    currentInfo => ({
-      ...currentInfo,
-      name: {
-        first: firstName || currentInfo?.name?.first || '',
-        last: lastName || currentInfo?.name?.last || '',
-      },
-    }),
-    'update contact names'
-  );
+  const createNameUpdate = currentInfo => ({
+    ...currentInfo,
+    name: {
+      first: firstName || currentInfo?.name?.first || '',
+      last: lastName || currentInfo?.name?.last || '',
+    },
+  });
+
+  const updatePromises = [
+    wixContactId && updateContactInfo(wixContactId, createNameUpdate, 'update contact names'),
+    wixMemberId && updateContactInfo(wixMemberId, createNameUpdate, 'update member names'),
+  ].filter(Boolean);
+
+  return await Promise.all(updatePromises);
 }
 
 /**
@@ -95,7 +120,6 @@ async function updateContactNames(contactId, firstName, lastName) {
 const updateIfChanged = (existingValues, newValues, updater, argsBuilder) => {
   const hasChanged = existingValues.some((val, idx) => val !== newValues[idx]);
   if (!hasChanged) return null;
-  console.log('updateIfChanged hasChanged', hasChanged);
   return updater(...argsBuilder(newValues));
 };
 
@@ -105,18 +129,18 @@ const updateIfChanged = (existingValues, newValues, updater, argsBuilder) => {
  * @param {Object} existingMemberData - Existing member data
  */
 const updateMemberContactInfo = async (data, existingMemberData) => {
-  const { contactId } = existingMemberData;
-  console.log('updateMemberContactInfo contactId', contactId);
+  const { wixContactId, wixMemberId } = existingMemberData;
+
   const updateConfig = [
     {
       fields: ['contactFormEmail'],
       updater: updateContactEmail,
-      args: ([email]) => [contactId, email],
+      args: ([email]) => [wixContactId, email],
     },
     {
       fields: ['firstName', 'lastName'],
-      updater: updateContactNames,
-      args: ([firstName, lastName]) => [contactId, firstName, lastName],
+      updater: updateMemberAndContactNames,
+      args: ([firstName, lastName]) => [{ firstName, lastName, wixContactId, wixMemberId }],
     },
   ];
 
@@ -128,11 +152,10 @@ const updateMemberContactInfo = async (data, existingMemberData) => {
     })
     .filter(Boolean);
 
-  const resp = await Promise.all(updatePromises);
-  console.log('updateMemberContactInfo updatePromises', resp);
-  return resp;
+  await Promise.all(updatePromises);
 };
 
 module.exports = {
   updateMemberContactInfo,
+  createSiteContact,
 };

package/backend/daily-pull/bulk-process-methods.js

@@ -168,7 +168,7 @@ const bulkProcessAndSaveMemberData = async ({
     const toChangeWixMembersEmails = [];
     const toSaveMembersData = uniqueUrlsMembersData.map(member => {
       const { isLoginEmailChanged, isNewToDb: _isNewToDb, ...restMemberData } = member;
-      if (member.contactId && isLoginEmailChanged) {
+      if (member.wixMemberId && isLoginEmailChanged) {
         toChangeWixMembersEmails.push(member);
       }
       return restMemberData; //we don't want to store the isLoginEmailChanged in the database, it's just a flag to know if we need to change the login email in Members area

package/backend/daily-pull/utils.js

@@ -35,7 +35,17 @@ const extractBaseUrl = url => {
   return url;
 };
 const incrementUrlCounter = (existingUrl, baseUrl) => {
-  if (existingUrl && existingUrl === baseUrl) {
+  if (!existingUrl || !baseUrl) {
+    return baseUrl;
+  }
+  // Normalize for comparison (case-insensitive)
+  const normalizedExisting = existingUrl.toLowerCase();
+  const normalizedBase = baseUrl.toLowerCase();
+
+  if (
+    normalizedExisting === normalizedBase ||
+    normalizedExisting.startsWith(`${normalizedBase}-`)
+  ) {
     console.log(
       `Found member with same url ${existingUrl} for baseUrl ${baseUrl}, increasing counter by 1`
     );
@@ -44,6 +54,9 @@ const incrementUrlCounter = (existingUrl, baseUrl) => {
     const lastCounter = isNumeric ? parseInt(lastSegment, 10) : 0;
     return `${baseUrl}-${lastCounter + 1}`;
   }
+
+  // No conflict, return baseUrl with counter 1 to be safe
+  return `${baseUrl}-1`;
 };
 /**
  * Validates core member data requirements

package/backend/forms-methods.js

@@ -16,7 +16,7 @@ const contactSubmission = async (data, memberDataId) => {
     console.log('Member contact form is not enabled for user, skipping contact submission!');
     return;
   }
-  let memberContactId = memberData.contactId;
+  let memberContactId = memberData.wixContactId;
   if (!memberContactId) {
     /**
      * Create a member contact here since some members may have never logged in
@@ -27,7 +27,7 @@ const contactSubmission = async (data, memberDataId) => {
      */
     console.info('Member contact id not found for user, creating new contact!');
     const member = await createContactAndMemberIfNew(memberData);
-    memberContactId = member.contactId;
+    memberContactId = member.wixContactId;
   }
   console.log('memberContactId', memberContactId);
   const emailTriggered = await triggerAutomation(automationEmailTriggerId, {
@@ -40,7 +40,7 @@ const contactSubmission = async (data, memberDataId) => {
   data = {
     ...data,
     phone: Number(data.phone),
-    memberContactId: memberContactId,
+    memberContactId,
     memberEmail: memberData.contactFormEmail,
   };
   await wixData.insert(COLLECTIONS.CONTACT_US_SUBMISSIONS, data);

package/backend/login/sso-methods.js

@@ -5,7 +5,7 @@ const { decode } = require('jwt-js-decode');
 const { CONFIG_KEYS, SSO_TOKEN_AUTH_API_URL } = require('../consts');
 const { MEMBER_ACTIONS } = require('../daily-pull/consts');
 const { getCurrentMember } = require('../members-area-methods');
-const { getMemberByContactId, prepareMemberForSSOLogin } = require('../members-data-methods');
+const { getCMSMemberByWixMemberId, prepareMemberForSSOLogin } = require('../members-data-methods');
 const {
   formatDateToMonthYear,
   getAddressDisplayOptions,
@@ -37,12 +37,12 @@ async function validateMemberToken(memberIdInput) {
     }
 
     const [dbMember, siteConfigs] = await Promise.all([
-      getMemberByContactId(member._id),
+      getCMSMemberByWixMemberId(member._id),
       getSiteConfigs(),
     ]);
     const siteAssociation = siteConfigs[CONFIG_KEYS.SITE_ASSOCIATION];
     const membersExternalPortalUrl = siteConfigs[CONFIG_KEYS.MEMBERS_EXTERNAL_PORTAL_URL];
-    console.log('dbMember by contact id is:', dbMember);
+    console.log('dbMember by wix member id is:', dbMember);
     console.log('member._id', member._id);
 
     if (!dbMember?._id) {

package/backend/members-area-methods.js

@@ -2,10 +2,11 @@ const { auth } = require('@wix/essentials');
 const { members, authentication } = require('@wix/members');
 const elevatedCreateMember = auth.elevate(members.createMember);
 
-function prepareContactData(partner) {
+function prepareMemberData(partner) {
   const phones = Array.isArray(partner.phones) ? partner.phones : []; //some users don't have phones
   const options = {
     member: {
+      //Keeping contact creation in member data for future purposes, in case we need to use it later
       contact: {
         ...partner,
         phones,
@@ -22,9 +23,8 @@ async function createMemberFunction(member) {
 }
 const createSiteMember = async memberDetails => {
   try {
-    const options = prepareContactData(memberDetails);
-    const contactId = await createMemberFunction(options);
-    return contactId;
+    const options = prepareMemberData(memberDetails);
+    return await createMemberFunction(options);
   } catch (error) {
     console.error(`Error in createSiteMember ${error.message}`);
     throw error;
@@ -37,22 +37,25 @@ const getCurrentMember = async () => {
 };
 
 /**
- * Updates Wix member login email if the member has a contactId (registered Wix member)
- * @param {Object} member - Member object with contactId and email
+ * Updates Wix member login email if the member has a wixMemberId (registered Wix member)
+ * @param {Object} member - Member object with wixMemberId and email
  * @param {Object} result - Result object to track Wix member updates
  */
 async function updateWixMemberLoginEmail(member, result = {}) {
-  if (!member.contactId) {
-    console.log(`Member ${member.memberId} has no contactId - skipping Wix login email update`);
+  if (!member.wixMemberId) {
+    console.log(`Member ${member.memberId} has no wixMemberId - skipping Wix login email update`);
     return;
   }
 
   try {
     console.log(
-      `Updating Wix login email for member ${member.memberId} (contactId: ${member.contactId})`
+      `Updating Wix login email for member ${member.memberId} (wixMemberId: ${member.wixMemberId})`
     );
 
-    const updatedWixMember = await authentication.changeLoginEmail(member.contactId, member.email);
+    const updatedWixMember = await authentication.changeLoginEmail(
+      member.wixMemberId,
+      member.email
+    );
 
     console.log(
       `✅ Successfully updated Wix login email for member ${member.memberId}: ${updatedWixMember.loginEmail}`
@@ -75,7 +78,7 @@ async function updateWixMemberLoginEmail(member, result = {}) {
     }
     result.wixMemberErrors.push({
       memberId: member.memberId,
-      contactId: member.contactId,
+      wixMemberId: member.wixMemberId,
       email: member.email,
       error: error.message,
     });

package/backend/members-data-methods.js

@@ -1,10 +1,10 @@
 const { COLLECTIONS } = require('../public/consts');
 
 const { MEMBERSHIPS_TYPES } = require('./consts');
-const { updateMemberContactInfo } = require('./contacts-methods');
+const { updateMemberContactInfo, createSiteContact } = require('./contacts-methods');
 const { MEMBER_ACTIONS } = require('./daily-pull/consts');
 const { wixData } = require('./elevated-modules');
-const { createSiteMember } = require('./members-area-methods');
+const { createSiteMember, getCurrentMember } = require('./members-area-methods');
 const {
   chunkArray,
   normalizeUrlForComparison,
@@ -42,10 +42,17 @@ async function createContactAndMemberIfNew(memberData) {
       phones: memberData.phones,
       contactFormEmail: memberData.contactFormEmail || memberData.email,
     };
-    const contactId = await createSiteMember(toCreateMemberData);
+    const needsWixMember = !memberData.wixMemberId;
+    const needsWixContact = !memberData.wixContactId;
+    const createPromises = [
+      needsWixMember && createSiteMember(toCreateMemberData),
+      needsWixContact && createSiteContact(toCreateMemberData),
+    ].filter(Boolean);
+    const [newWixMemberId, newWixContactId] = await Promise.all(createPromises);
     let memberDataWithContactId = {
       ...memberData,
-      contactId,
+      wixMemberId: newWixMemberId || memberData.wixMemberId,
+      wixContactId: newWixContactId || memberData.wixContactId,
     };
     const updatedResult = await updateMember(memberDataWithContactId);
     memberDataWithContactId = {
@@ -169,26 +176,26 @@ async function getMemberBySlug({
   }
 }
 
-async function getMemberByContactId(contactId) {
-  if (!contactId) {
-    throw new Error('Contact ID is required');
+async function getCMSMemberByWixMemberId(wixMemberId) {
+  if (!wixMemberId) {
+    throw new Error('Wix Member ID is required');
   }
   try {
     const members = await wixData
       .query(COLLECTIONS.MEMBERS_DATA)
-      .eq('contactId', contactId)
+      .eq('wixMemberId', wixMemberId)
       .limit(2)
       .find()
       .then(res => res.items);
     if (members.length > 1) {
       throw new Error(
-        `[getMemberByContactId] Multiple members found with contactId ${contactId} membersIds are : [${members.map(member => member.memberId).join(', ')}]`
+        `[getCMSMemberByWixMemberId] Multiple members found with wixMemberId ${wixMemberId} membersIds are : [${members.map(member => member.memberId).join(', ')}]`
       );
     }
     return members[0] || null;
   } catch (error) {
     throw new Error(
-      `[getMemberByContactId] Failed to retrieve member by contactId ${contactId} data: ${error.message}`
+      `[getCMSMemberByWixMemberId] Failed to retrieve member by wixMemberId ${wixMemberId} data: ${error.message}`
     );
   }
 }
@@ -452,11 +459,11 @@ const getQAUsers = async () => {
  * @param {Object} memberData - Member data from DB
  * @returns {Promise<Object>} - Member data with contactId
  */
-async function ensureMemberHasContact(memberData) {
+async function ensureWixMemberAndContactExist(memberData) {
   if (!memberData) {
     throw new Error('Member data is required');
   }
-  if (!memberData.contactId) {
+  if (!memberData.wixContactId || !memberData.wixMemberId) {
     const memberDataWithContactId = await createContactAndMemberIfNew(memberData);
     return memberDataWithContactId;
   }
@@ -474,7 +481,7 @@ async function prepareMemberForSSOLogin(data) {
       throw new Error(`Member data not found for memberId ${memberId}`);
     }
     console.log('memberData', memberData);
-    return await ensureMemberHasContact(memberData);
+    return await ensureWixMemberAndContactExist(memberData);
   } catch (error) {
     console.error('Error in prepareMemberForSSOLogin', error.message);
     throw error;
@@ -491,13 +498,58 @@ async function prepareMemberForQALogin(email) {
       throw new Error(`Member data not found for email ${email}`);
     }
     console.log('memberData', memberData);
-    return await ensureMemberHasContact(memberData);
+    return await ensureWixMemberAndContactExist(memberData);
   } catch (error) {
     console.error('Error in prepareMemberForQALogin', error.message);
     throw error;
   }
 }
 
+/**
+ * Tracks a button click with member and location info.
+ * @param {Object} params - Parameters
+ * @param {string} params.pageName - Name of the page/popup where button was clicked
+ * @param {string} params.buttonName - Name/ID of the button that was clicked
+ * @returns {Promise<Object>} - Saved record or null if member not found
+ */
+async function trackButtonClick({ pageName, buttonName }) {
+  const wixMember = await getCurrentMember();
+
+  if (!wixMember) {
+    console.warn('[trackButtonClick]: No logged in member found');
+    return null;
+  }
+
+  const dbMember = await getCMSMemberByWixMemberId(wixMember._id);
+
+  if (!dbMember) {
+    console.warn(
+      `[trackButtonClick]: Member not found in MembersDataLatest for contactId: ${wixMember._id}`
+    );
+    return null;
+  }
+
+  const memberName = dbMember.fullName || 'Unknown';
+  const memberId = dbMember.memberId;
+
+  const clickData = {
+    memberName,
+    memberId,
+    pageName,
+    buttonName,
+    clickedAt: new Date(),
+  };
+
+  try {
+    const result = await wixData.insert(COLLECTIONS.BUTTON_CLICKS, clickData);
+    console.log(`Tracked ${buttonName} click on ${pageName} for member ${memberId}`);
+    return result;
+  } catch (error) {
+    console.error(`Error tracking ${buttonName} click:`, error);
+    throw error;
+  }
+}
+
 module.exports = {
   findMemberByWixDataId,
   createContactAndMemberIfNew,
@@ -505,7 +557,7 @@ module.exports = {
   bulkSaveMembers,
   findMemberById,
   getMemberBySlug,
-  getMemberByContactId,
+  getCMSMemberByWixMemberId,
   getAllEmptyAboutYouMembers,
   updateMember,
   getAllMembersWithExternalImages,
@@ -518,4 +570,5 @@ module.exports = {
   prepareMemberForSSOLogin,
   prepareMemberForQALogin,
   checkUrlUniqueness,
+  trackButtonClick,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abmp-npm",
-  "version": "1.1.90",
+  "version": "1.1.92",
   "main": "index.js",
   "scripts": {
     "check-cycles": "madge --circular .",

package/pages/Home.js

@@ -216,12 +216,19 @@ const homePageOnReady = async ({
         $item('#milesAwayText').text = '';
       }
 
-      // 7) "Show maps" button enabled only if there's at least one visible address
+      // 7) "Show maps" button enabled only if there's a full address with valid coordinates
       const visible = checkAddressIsVisible(addresses);
-      if (visible.length && visible[0].addressStatus === ADDRESS_STATUS_TYPES.FULL_ADDRESS) {
+      const fullAddressWithValidCoords = visible.find(
+        addr =>
+          addr.addressStatus === ADDRESS_STATUS_TYPES.FULL_ADDRESS &&
+          addr.latitude &&
+          addr.longitude
+      );
+
+      if (fullAddressWithValidCoords) {
         $item('#showMaps').enable();
         $item('#showMaps').show();
-        const { latitude, longitude } = visible[0];
+        const { latitude, longitude } = fullAddressWithValidCoords;
         $item('#showMaps').link = `https://maps.google.com/?q=${latitude},${longitude}`;
         $item('#showMaps').target = '_blank';
       } else {

package/pages/LearnMore.js

@@ -0,0 +1,27 @@
+const PAGE_NAME = 'Learn More';
+const BUTTON_NAME = 'Upgrade Now';
+
+/**
+ * Creates the Learn More popup handler
+ * @param {Object} params - Parameters
+ * @param {Function} params.$w - Wix $w selector
+ * @param {Function} params.trackClick - Backend function to track the click (handles member lookup internally)
+ */
+function learnMoreOnReady({ $w: _$w, trackClick }) {
+  _$w('#learnMoreBtn').onClick(async () => {
+    try {
+      await trackClick({
+        pageName: PAGE_NAME,
+        buttonName: BUTTON_NAME,
+      });
+
+      console.log(`Tracked ${BUTTON_NAME} click on ${PAGE_NAME}`);
+    } catch (error) {
+      console.error('Error tracking button click:', error);
+    }
+  });
+}
+
+module.exports = {
+  learnMoreOnReady,
+};

package/pages/index.js

@@ -8,4 +8,5 @@ module.exports = {
   ...require('./SelectBannerImages.js'),
   ...require('./deleteConfirm.js'),
   ...require('./SaveAlerts.js'),
+  ...require('./LearnMore.js'),
 };

package/public/consts.js

@@ -13,6 +13,7 @@ const COLLECTIONS = {
   STATE_CITY_MAP: 'City',
   UPDATED_LOGIN_EMAILS: 'updatedLoginEmails',
   QA_USERS: 'QA_Users', //Make QA users configurable per site
+  BUTTON_CLICKS: 'ButtonClicks',
 };
 
 /**