abmp-npm 2.0.24 → 2.0.26

package/backend/members-data-methods.js

@@ -31,7 +31,7 @@ async function findMemberByWixDataId(memberId) {
   }
 }
 
-async function createContactAndMemberIfNew(memberData) {
+async function createContactAndMemberIfNew(memberData, allowDuplicates = false) {
   if (!memberData) {
     throw new Error('Member data is required');
   }
@@ -47,7 +47,9 @@ async function createContactAndMemberIfNew(memberData) {
     const needsWixContact = !memberData.wixContactId;
     const [newWixMemberId, newWixContactId] = await Promise.all([
       needsWixMember ? createSiteMember(toCreateMemberData) : Promise.resolve(null),
-      needsWixContact ? createSiteContact(toCreateMemberData) : Promise.resolve(null),
+      needsWixContact
+        ? createSiteContact(toCreateMemberData, allowDuplicates)
+        : Promise.resolve(null),
     ]);
     let memberDataWithContactId = {
       ...memberData,
@@ -526,9 +528,10 @@ async function prepareMemberForQALogin(email) {
  * @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
+ * @param {Object} [params.data] - Optional data object to store with the click (e.g., form data being saved)
  * @returns {Promise<Object>} - Saved record or null if member not found
  */
-async function trackButtonClick({ pageName, buttonName }) {
+async function trackButtonClick({ pageName, buttonName, data }) {
   const wixMember = await getCurrentMember();
 
   if (!wixMember) {
@@ -554,6 +557,7 @@ async function trackButtonClick({ pageName, buttonName }) {
     pageName,
     buttonName,
     clickedAt: new Date(),
+    ...(data && { data }),
   };
 
   try {

package/backend/tasks/tasks-process-methods.js

@@ -562,7 +562,7 @@ const scheduleCreateContactsFromMembers = async () => {
 const createContactsFromMembers = async data => {
   const { chunk, chunkIndex } = data;
   console.log(`Creating contacts from ${chunk.length} members in chunk ${chunkIndex}`);
-  const createPromises = chunk.map(member => createContactAndMemberIfNew(member));
+  const createPromises = chunk.map(member => createContactAndMemberIfNew(member, true));
   const createResults = await Promise.all(createPromises);
   console.log(
     `Created ${createResults.length} contacts from ${chunk.length} members in chunk ${chunkIndex}`

package/package.json

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

package/pages/personalDetails.js

@@ -38,6 +38,13 @@ const MAIN_STATE_BOX_STATES = {
 
 const FALLBACK_ADDRESS_STATUS = ADDRESS_STATUS_TYPES.STATE_CITY_ZIP;
 
+const PAGE_NAME = 'Personal Details';
+const BUTTON_NAMES = {
+  PERSONAL: 'Save Personal Details',
+  BUSINESS: 'Save Business & Services',
+  CONTACT: 'Save Contact & Booking',
+};
+
 const FORM_SECTION_HANDLER_MAP = {
   PERSONAL: { section: 'personal', handler: null }, // handler will be set in init
   BUSINESS_SERVICES: { section: 'businessServices', handler: null },
@@ -52,6 +59,7 @@ async function personalDetailsOnReady({
   saveRegistrationData,
   validateMemberToken,
   checkUrlUniqueness,
+  trackClick,
 }) {
   let itemMemberObj = {};
   let originalMemberData = {};
@@ -1094,6 +1102,12 @@ async function personalDetailsOnReady({
       ...personalChanges,
     };
 
+    trackClick({
+      pageName: PAGE_NAME,
+      buttonName: BUTTON_NAMES.PERSONAL,
+      data: formData,
+    });
+
     // Log the specific personal data changes
     console.group('Personal Details Save Attempt');
     console.log('Current Data:', beforeData);
@@ -1137,6 +1151,12 @@ async function personalDetailsOnReady({
       ...businessChanges,
     };
 
+    trackClick({
+      pageName: PAGE_NAME,
+      buttonName: BUTTON_NAMES.BUSINESS,
+      data: formData,
+    });
+
     // Log the specific business data changes
     console.group('Business Services Save Attempt');
     console.log('Current Data:', beforeData);
@@ -1385,13 +1405,27 @@ async function personalDetailsOnReady({
   }
 
   function setupAddressRepeaterEventListeners() {
-    _$w('#mainAddressCheckbox').onChange(event => {
+    _$w('#mainAddressCheckbox').onChange(async event => {
       const data = _$w('#addressesList').data;
       const clickedItemData = data.find(item => item._id === event.context.itemId);
       const $item = _$w.at(event.context);
+      const checkbox = $item('#mainAddressCheckbox');
+      const isBeingUnchecked = !event.target.checked;
+
+      if (isBeingUnchecked) {
+        const addressDisplayOptions = itemMemberObj.addressDisplayOption || [];
+        const mainAddressOption = addressDisplayOptions.find(opt => opt.isMain === true);
+
+        // If this address is the main address, prevent unchecking
+        if (mainAddressOption && mainAddressOption.key === clickedItemData._id) {
+          checkbox.checked = true;
+          await wixWindow.openLightbox(LIGHTBOX_NAMES.MAIN_ADDRESS_ERROR);
+          return;
+        }
+      }
 
       _$w('#mainAddressCheckbox').checked = false;
-      $item('#mainAddressCheckbox').checked = true;
+      checkbox.checked = true;
 
       if (clickedItemData.address.addressStatus === ADDRESS_STATUS_TYPES.DONT_SHOW) {
         updateAddressStatus(clickedItemData._id, ADDRESS_STATUS_TYPES.STATE_CITY_ZIP);
@@ -1970,6 +2004,12 @@ async function personalDetailsOnReady({
       ...contactChanges,
     };
 
+    trackClick({
+      pageName: PAGE_NAME,
+      buttonName: BUTTON_NAMES.CONTACT,
+      data: formData,
+    });
+
     // Log the specific contact & booking data changes
     console.group('Contact & Booking Save Attempt');
     console.log('Current Data:', beforeData);

package/public/consts.js

@@ -84,6 +84,7 @@ const LIGHTBOX_NAMES = {
   DELETE_CONFIRM: 'deleteConfirm',
   SELECT_BANNER_IMAGES: 'Select Banner Images',
   CONTACT_US: 'Contact Us',
+  MAIN_ADDRESS_ERROR: 'mainAddressError',
 };
 
 const FREE_WEBSITE_TEXT_STATES = {