ok cool

karmanyaahm · karmanyaahm · commit 3564012380d3 · 2025-10-09T12:06:04.000-05:00
diff --git a/public/member/apiService.js b/public/member/apiService.js
@@ -13,6 +13,9 @@ import { GOOGLE_APPS_SCRIPT_URL } from './constants.js';
  * @returns {Promise} - Promise representing the fetch request
  */
 export function postToAppsScript(data, onSuccess = null, onError = null) {
+    // Log data being sent to the API for debugging
+    console.log('Sending data to Google Apps Script:', data);
+    
     return fetch(GOOGLE_APPS_SCRIPT_URL, {
         method: 'POST',
         headers: {
diff --git a/public/member/constants.js b/public/member/constants.js
@@ -16,52 +16,52 @@ export const irlShopItems = [
     {
         id: "drinks",
         name: "Drinks (Capri Sun, Soda)",
-        price: 100,
+        price: 108,
     },
     
     {
         id: "drinks",
         name: "Celcius",
-        price: 150,
+        price: 161,
     },
     // Snack Packs
     {
         id: "smallsnacks",
         name: "Fruit Snacks/Rice Krispies)",
-        price: 50,
+        price: 54,
     },
     
     // Chips
     {
         id: "chips",
         name: "Chips",
-        price: 100,
+        price: 108,
     },
     
     // Candy
     {
         id: "candy",
         name: "Candy (Twix, M&Ms, Snickers, Sour Patch, Airhead)",
-        price: 150,
+        price: 161,
     },
     
     // Microwaveable Foods
     {
         id: "popcorn",
         name: "Popcorn",
-        price: 100,
+        price: 108,
     },
     {
         id: "microwavemeals",
         name: "Microwave Meals (Ramen/Mac and Cheese)",
-        price: 150,
+        price: 161,
     },
     
     // Pop Tarts
     {
         id: "poptarts",
         name: "Pop Tarts",
-        price: 100,
+        price: 108,
     },
     {
         id: "shirtXS",
@@ -134,6 +134,6 @@ export const activityData = {
     "VexU": [],
     "BusinessOrAdvertising": [],
     "LM": [],
-    "VolunteerTabling": [],
+    "Volunteer": [],
     "Other": []
 };
diff --git a/public/member/membershipForm.js b/public/member/membershipForm.js
@@ -59,9 +59,15 @@ function setupFormSubmissionHandler() {
                 'TYPE': 'MEMBERSHIP' // Default type for membership form
             };
             
+            // Log form data for debugging
+            console.log("Form data before processing:", Object.fromEntries(formData));
+            
             // Process all form fields
             processFormFields(memberForm, data);
             
+            // Log processed data
+            console.log("Processed data being submitted:", data);
+            
             // Submit data to Google Apps Script
             submitMembershipForm(memberForm, data, submitButton, originalButtonText);
         });
@@ -96,18 +102,26 @@ function processFormFields(form, data) {
             return;
         }
         
-        // Handle radio buttons - only process if checked
-        if (element.type === 'radio' && !element.checked) {
-            return;
+        // Handle radio buttons 
+        if (element.type === 'radio') {
+            // Only process checked radio buttons
+            if (element.checked) {
+                // If value is not 'other', add it to the data object
+                if (element.value !== 'other') {
+                    data[fieldName] = element.value;
+                }
+                // 'other' values will be handled separately below
+            }
+            return; // Skip further processing for radio buttons
         }
         
         // Skip text inputs that are part of "other" options (will be processed later)
         if (element.type === 'text' && element.id.startsWith('other')) {
             return;
         }
         
-        // Standard field processing for non-other fields
-        if (element.type !== 'radio' && element.type !== 'checkbox') {
+        // Standard field processing for non-radio and non-checkbox fields
+        if (element.type !== 'checkbox') {
             if (element.value.trim() !== '' || element.required) {
                 data[fieldName] = element.value;
             }
diff --git a/public/member/shopFunctions.js b/public/member/shopFunctions.js
@@ -6,12 +6,19 @@
 import { shopItems, irlShopItems, HCB_BASE_URL } from './constants.js';
 import { getPurchasesByEid } from './eidStats.js';
 
+// Track current shop mode globally
+let currentShopMode = 'regular';
+
 /**
  * Initialize shop functionality
  */
 export function initShopFunctionality() {
+    // Check if we're in IRL mode from URL
+    const searchParams = new URLSearchParams(window.location.search);
+    currentShopMode = searchParams.get('irl') === '1' ? 'irl' : 'regular';
+    
     // Generate the shop table
-    generateShopTable();
+    generateShopTable(currentShopMode);
     
     // Add event listener to checkout button
     const checkoutBtn = document.getElementById('checkoutBtn');
@@ -58,21 +65,74 @@ export function processShopItems(itemsArray = shopItems) {
     });
 }
 
+/**
+ * Switch between shop types (IRL vs Regular) without page reload
+ * @param {string} mode - The shop mode to switch to ('irl' or 'regular')
+ */
+export function switchShopType(mode) {
+    // Show a brief loading message
+    const container = document.getElementById('shopTableContainer');
+    if (container) {
+        const loadingMsg = document.createElement('div');
+        loadingMsg.textContent = 'Loading...';
+        loadingMsg.style.padding = '10px';
+        loadingMsg.style.textAlign = 'center';
+        container.innerHTML = '';
+        container.appendChild(loadingMsg);
+    }
+    
+    // Small delay to allow UI update
+    setTimeout(() => {
+        // Update current shop mode
+        currentShopMode = mode === 'irl' ? 'irl' : 'regular';
+        
+        // Update URL without reloading the page
+        const url = new URL(window.location);
+        if (currentShopMode === 'irl') {
+            url.searchParams.set('irl', '1');
+        } else {
+            url.searchParams.set('irl', '0');
+        }
+        window.history.pushState({}, '', url);
+        
+        // Clear existing table
+        if (container) {
+            container.innerHTML = '';
+        }
+        
+        // Regenerate the shop table with the new mode
+        generateShopTable(currentShopMode);
+        
+        // Recalculate total
+        updateTotal();
+    }, 100); // Short delay for better user experience
+}
+
 /**
  * Generate shop table from items array
+ * @param {string} mode - The shop mode ('irl' or 'regular')
  */
-export function generateShopTable() {
+export function generateShopTable(mode = null) {
     const container = document.getElementById('shopTableContainer');
     if (!container) return;
     
-    // Check if we're in IRL mode
-    const isIrlMode = new URLSearchParams(window.location.search).has('irl');
+    // If mode is not provided, use the current shop mode or determine from URL
+    if (mode === null) {
+        const searchParams = new URLSearchParams(window.location.search);
+        mode = searchParams.get('irl') === '1' ? 'irl' : 'regular';
+        currentShopMode = mode;
+    }
+    
+    const isIrlMode = mode === 'irl';
     
     // Get the items to display based on mode
-    let itemsToProcess = [...shopItems]; // Make a copy of the array
+    let itemsToProcess = [];
     if (isIrlMode) {
-        // In IRL mode, show IRL items first, then regular items
-        itemsToProcess = [...irlShopItems, ...shopItems];
+        // In IRL mode, show ONLY IRL items
+        itemsToProcess = [...irlShopItems];
+    } else {
+        // In regular mode, show ONLY regular shop items
+        itemsToProcess = [...shopItems];
     }
     
     // Process items to propagate values
@@ -179,18 +239,32 @@ export function generateShopTable() {
     table.appendChild(tbody);
     container.appendChild(table);
     
-    // Add "Snack Shop" link if we're NOT already in IRL mode
-    if (!isIrlMode) {
-        const snackShopLink = document.createElement('a');
-        snackShopLink.href = window.location.pathname + '?irl=1';
-        snackShopLink.textContent = 'Snack Shop';
-        snackShopLink.style.color = '#0066cc';
-        snackShopLink.style.textDecoration = 'underline';
-        snackShopLink.style.display = 'inline-block';
-        snackShopLink.style.marginTop = '10px';
-        snackShopLink.style.fontSize = '0.9em';
-        container.appendChild(snackShopLink);
+    // Add shop switch link
+    const shopSwitchLink = document.createElement('a');
+    shopSwitchLink.href = '#'; // Use # to prevent page navigation
+    
+    if (isIrlMode) {
+        shopSwitchLink.textContent = 'Switch to Online Shop';
+        shopSwitchLink.setAttribute('data-target-mode', 'regular');
+    } else {
+        shopSwitchLink.textContent = 'Switch to Snack Shop';
+        shopSwitchLink.setAttribute('data-target-mode', 'irl');
     }
+    
+    // Add click event listener to switch shop type without page reload
+    shopSwitchLink.addEventListener('click', function(e) {
+        e.preventDefault(); // Prevent the default link behavior
+        const targetMode = this.getAttribute('data-target-mode');
+        switchShopType(targetMode);
+    });
+    
+    shopSwitchLink.style.color = '#0066cc';
+    shopSwitchLink.style.textDecoration = 'underline';
+    shopSwitchLink.style.display = 'inline-block';
+    shopSwitchLink.style.marginTop = '10px';
+    shopSwitchLink.style.fontSize = '0.9em';
+    shopSwitchLink.style.cursor = 'pointer';
+    container.appendChild(shopSwitchLink);
 }
 
 /**
