@wix/headless-restaurants-olo 0.0.44 → 0.0.46

package/dist/services/fulfillment-details-service.js

@@ -44,6 +44,24 @@ export const FulfillmentDetailsService = implementService.withConfig()(Fulfillme
     const availableTimeSlotsForDate = signalsService.signal([]);
     const schedulingType = signalsService.signal(fulfillmentsService.schedulingType?.get());
     // ========================================
+    // Sync selectedFulfillment from FulfillmentsService to dispatchType
+    // ========================================
+    // Sync dispatchType when selectedFulfillment changes in FulfillmentsService
+    // Use peek() to read dispatchType without creating a dependency, so the effect
+    // only runs when selectedFulfillment changes, not when dispatchType changes
+    signalsService.effect(() => {
+        const selectedFulfillment = fulfillmentsService.selectedFulfillment?.get();
+        const newDispatchType = selectedFulfillment?.type
+            ? selectedFulfillment.type
+            : null;
+        // Use peek() to read current value without subscribing to changes
+        const currentDispatchType = dispatchType.peek();
+        // Only update if different to avoid unnecessary updates and circular updates
+        if (currentDispatchType !== newDispatchType) {
+            dispatchType.set(newDispatchType);
+        }
+    });
+    // ========================================
     // Helper Functions
     // ========================================
     /**
@@ -115,8 +133,78 @@ export const FulfillmentDetailsService = implementService.withConfig()(Fulfillme
             asapTimeSlot.set(slot);
         }
     };
+    const convertAddressInputToAddress = (address) => {
+        if (!address)
+            return null;
+        const { 
+        // @ts-expect-error
+        addressLine, 
+        // @ts-expect-error
+        streetAddress, 
+        // @ts-expect-error
+        formattedAddress, 
+        // @ts-expect-error
+        location, ...rest } = address;
+        return {
+            streetAddress: streetAddress,
+            addressLine1: formattedAddress,
+            ...rest,
+        };
+    };
+    const initAddress = async (addr) => {
+        isLoading.set(true);
+        error.set(null);
+        try {
+            const commonAddress = convertAddressInputToAddress(addr);
+            // 1. Get first available time slot per operation with the selected address
+            const firstTimeSlotsResponse = await operationsSDK.calculateFirstAvailableTimeSlotPerFulfillmentType(operation.id, {
+                deliveryAddress: commonAddress,
+            });
+            // Find the time slots for this operation
+            const deliveryTimeSlot = firstTimeSlotsResponse.timeslotsPerFulfillmentType?.find((ts) => ts.fulfilmentType === DispatchType.DELIVERY);
+            if (!deliveryTimeSlot?.timeSlot) {
+                isLoading.set(false);
+                // TODO - localize this message
+                error.set('No available time slots found for the selected address');
+                return;
+            }
+            const firstTimeSlot = processTimeSlots([deliveryTimeSlot], DispatchType.DELIVERY)[0];
+            // 2. Fetch time slots for the selected address and date (using firstTimeSlot.startTime)
+            const targetDate = firstTimeSlot.startTime;
+            if (!targetDate) {
+                isLoading.set(false);
+                return;
+            }
+            await calculateAvailableTimeSlotsForDateFn(targetDate);
+            // Set the date and time slot
+            date.set(targetDate);
+            setTimeslot(firstTimeSlot);
+            // 3. Fetch available dates for the selected address
+            const startDate = new Date();
+            startDate.setHours(0, 0, 0, 0);
+            const endDate = new Date();
+            endDate.setDate(endDate.getDate() + daysAhead);
+            endDate.setHours(23, 59, 59, 999);
+            await calculateAvailableDatesInRangeFn(startDate, endDate);
+        }
+        catch (err) {
+            const errorMessage = err instanceof Error ? err.message : 'Failed to initialize address';
+            error.set(errorMessage);
+            console.error('Error initializing address:', err);
+        }
+        finally {
+            isLoading.set(false);
+        }
+    };
     const setAddress = (addr) => {
         address.set(addr);
+        // Initialize address: fetch first time slot, time slots for date, and available dates
+        if (addr) {
+            initAddress(addr).catch((err) => {
+                console.error('Error initializing address:', err);
+                error.set('Failed to initialize address');
+            });
+        }
     };
     const setDate = async (selectedDate) => {
         date.set(selectedDate);
@@ -129,7 +217,6 @@ export const FulfillmentDetailsService = implementService.withConfig()(Fulfillme
         }
     };
     const setDispatchType = (type) => {
-        console.log('setDispatchType', type);
         dispatchType.set(type);
         // Re-filter available time slots based on new dispatch type
         const currentDate = date.get();
@@ -244,6 +331,7 @@ export const FulfillmentDetailsService = implementService.withConfig()(Fulfillme
             });
             const { timeslotsPerFulfillmentType } = response;
             const currentDispatchType = dispatchType.get();
+            // Process slots filtered by current dispatch type
             const slots = processTimeSlots(timeslotsPerFulfillmentType, currentDispatchType).reverse();
             availableTimeSlotsForDate.set(slots);
             // Auto-select first available slot if none selected
@@ -308,6 +396,12 @@ export const FulfillmentDetailsService = implementService.withConfig()(Fulfillme
         }
         return allTimeSlots.filter((slot) => slot.dispatchType === currentDispatchType);
     });
+    /**
+     * Available dispatch types from config
+     */
+    const availableDispatchTypes = signalsService.computed(() => {
+        return config.availableDispatchTypes ?? [];
+    });
     // ========================================
     // Return Service API
     // ========================================
@@ -323,6 +417,7 @@ export const FulfillmentDetailsService = implementService.withConfig()(Fulfillme
         availableDates,
         availableTimeSlotsForDate,
         availableTimeSlots,
+        availableDispatchTypes,
         schedulingType,
         // Actions
         getTimeslot,
@@ -355,5 +450,6 @@ export function loadFulfillmentDetailsServiceConfig(operation, options) {
         initialDispatchType: options?.initialDispatchType,
         initialAddress: options?.initialAddress,
         daysAhead: options?.daysAhead ?? 30,
+        availableDispatchTypes: options?.availableDispatchTypes,
     };
 }

package/dist/services/item-details-service.js

@@ -63,17 +63,17 @@ export const ItemService = implementService.withConfig()(ItemServiceDefinition,
         : '');
     const priceVariants = config.item?.priceVariants || [];
     let initialVariant;
-    if (!config.editItemMode) {
-        initialVariant = priceVariants.length > 0 ? priceVariants[0] : undefined;
+    if (config.editItemMode && config.editingItemValues?.selectedVariantId) {
+        initialVariant = priceVariants.find((variant) => variant._id === config.editingItemValues?.selectedVariantId);
     }
     else {
-        if (config.editingItemValues?.selectedVariantId) {
-            initialVariant = priceVariants.find((variant) => variant._id === config.editingItemValues?.selectedVariantId);
-        }
-        else {
-            initialVariant =
-                priceVariants.length > 0 ? priceVariants[0] : undefined;
-        }
+        initialVariant =
+            priceVariants.length > 0
+                ? priceVariants.reduce((cheapest, current) => Number(current.priceInfo?.price) <
+                    Number(cheapest.priceInfo?.price)
+                    ? current
+                    : cheapest)
+                : undefined;
     }
     const selectedVariant = signalsService.signal(initialVariant);
     const modifierGroups = config.item?.modifierGroups || [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/headless-restaurants-olo",
-  "version": "0.0.44",
+  "version": "0.0.46",
   "license": "MIT",
   "type": "module",
   "scripts": {
@@ -78,5 +78,5 @@
       "groupId": "com.wixpress.headless-components"
     }
   },
-  "falconPackageHash": "8b0e8f84677d9e75b1242a120c014e61d8e0279095afd8bf291e54aa"
+  "falconPackageHash": "ff154f099ed6c3d14102602cd9650342ca326344b800448bc5237940"
 }