abmp-npm 2.0.20 → 2.0.21

package/backend/members-data-methods.js

@@ -218,8 +218,8 @@ async function updateMember(memberToUpdate) {
   }
 }
 /**
- * Saves member registration data (supports partial updates)
- * @param {Object} data - Member data to save (can be partial - only fields being updated)
+ * Saves member registration data
+ * @param {Object} data - Member data to save
  * @param {string} id - Member ID
  * @returns {Promise<Object>} Result object with type and data/error
  */
@@ -240,29 +240,15 @@ async function saveRegistrationData(data, id) {
       }
     }
 
-    // Fetch existing data to merge with partial update
-    const existingMemberData = await findMemberByWixDataId(id);
-
-    if (!existingMemberData) {
-      return {
-        type: 'error',
-        error: 'Member not found',
-      };
-    }
-
-    // Merge partial data with existing data (incoming data takes precedence)
-    const mergedData = {
-      ...existingMemberData,
-      ...data,
-    };
-
     if (data.addresses && Array.isArray(data.addresses)) {
-      mergedData.locHash = generateGeoHash(data.addresses);
+      data.locHash = generateGeoHash(data.addresses);
     }
 
-    await updateMemberContactInfo(mergedData, existingMemberData);
+    const existingMemberData = await findMemberByWixDataId(id);
+
+    await updateMemberContactInfo(data, existingMemberData);
 
-    const saveData = await updateMember(mergedData);
+    const saveData = await updateMember(data);
     return {
       type: 'success',
       saveData,

package/package.json

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

package/pages/Home.js

@@ -211,9 +211,16 @@ const homePageOnReady = async ({
       // 5) Location text
       const mainAddress = getMainAddress(itemData.addressDisplayOption, addresses);
       $item('#location').text = mainAddress || '';
+
+      // 6) Miles away
+      const isNearbyEnabled = _$w('#nearBy').checked;
       const miles = itemData.distance ?? 0;
-      $item('#differenceInMiles').text = miles ? miles.toFixed(1) : '';
-      if (!miles) {
+
+      if (isNearbyEnabled && miles) {
+        $item('#differenceInMiles').text = miles.toFixed(1);
+        $item('#milesAwayText').text = 'miles away';
+      } else {
+        $item('#differenceInMiles').text = '';
         $item('#milesAwayText').text = '';
       }
 

package/pages/personalDetails.js

@@ -1087,10 +1087,8 @@ async function personalDetailsOnReady({
     const personalChanges = getPersonalData();
     const originalUrl = beforeData.url;
 
-    // Only send personal fields + required identifiers (partial update)
     const formData = {
-      _id: itemMemberObj._id,
-      memberId: itemMemberObj.memberId,
+      ...itemMemberObj,
       ...personalChanges,
     };
 
@@ -1098,7 +1096,7 @@ async function personalDetailsOnReady({
     console.group('Personal Details Save Attempt');
     console.log('Current Data:', beforeData);
     console.log('Changes Being Applied:', personalChanges);
-    console.log('Final Form Data (partial):', formData);
+    console.log('Final Form Data:', formData);
     console.groupEnd();
 
     const result = await saveData(formData);
@@ -1130,10 +1128,8 @@ async function personalDetailsOnReady({
     const beforeData = JSON.parse(JSON.stringify(itemMemberObj));
     const businessChanges = getBusinessAndServicesData();
 
-    // Only send business fields + required identifiers (partial update)
     const formData = {
-      _id: itemMemberObj._id,
-      memberId: itemMemberObj.memberId,
+      ...itemMemberObj,
       ...businessChanges,
     };
 
@@ -1141,7 +1137,7 @@ async function personalDetailsOnReady({
     console.group('Business Services Save Attempt');
     console.log('Current Data:', beforeData);
     console.log('Changes Being Applied:', businessChanges);
-    console.log('Final Form Data (partial):', formData);
+    console.log('Final Form Data:', formData);
     console.log('Image Changes:', {
       profileImage: uploadedImages.profileImage,
       logoImage: uploadedImages.logoImage,
@@ -1963,10 +1959,8 @@ async function personalDetailsOnReady({
     const beforeData = JSON.parse(JSON.stringify(itemMemberObj));
     const contactChanges = getContactAndBookingData();
 
-    // Only send contact fields + required identifiers (partial update)
     const formData = {
-      _id: itemMemberObj._id,
-      memberId: itemMemberObj.memberId,
+      ...itemMemberObj,
       ...contactChanges,
     };
 
@@ -1974,7 +1968,7 @@ async function personalDetailsOnReady({
     console.group('Contact & Booking Save Attempt');
     console.log('Current Data:', beforeData);
     console.log('Changes Being Applied:', contactChanges);
-    console.log('Final Form Data (partial):', formData);
+    console.log('Final Form Data:', formData);
     console.log('Address Changes:', {
       addressCount: contactChanges.addresses?.length || 0,
       addressDisplayOptions: contactChanges.addressDisplayOption,
@@ -2038,10 +2032,8 @@ async function personalDetailsOnReady({
   }
 
   async function saveGalleryToCMS() {
-    // Only send gallery field + required identifiers (partial update)
     const formData = {
-      _id: itemMemberObj._id,
-      memberId: itemMemberObj.memberId,
+      ...itemMemberObj,
       gallery: itemMemberObj.gallery,
     };