abmp-npm 2.0.15 → 2.0.16

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/members-data-methods.js

@@ -4,7 +4,7 @@ const { MEMBERSHIPS_TYPES } = require('./consts');
 const { updateMemberContactInfo } = 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,
@@ -477,6 +477,51 @@ async function getSiteMemberId(data) {
   }
 }
 
+/**
+ * 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 getMemberByContactId(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,
@@ -496,4 +541,5 @@ module.exports = {
   getQAUsers,
   getSiteMemberId,
   checkUrlUniqueness,
+  trackButtonClick,
 };

package/package.json

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

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',
 };
 
 /**