@putiikkipalvelu/storefront-sdk 0.2.5 → 0.3.0

package/dist/index.js

@@ -610,6 +610,138 @@ function createCartResource(fetcher) {
   };
 }
 
+// src/utils/pricing.ts
+function isSaleActive(startDate, endDate) {
+  if (!startDate && !endDate) {
+    return true;
+  }
+  const now = /* @__PURE__ */ new Date();
+  const start = startDate ? new Date(startDate) : null;
+  const end = endDate ? new Date(endDate) : null;
+  if (start && !end) {
+    return now >= start;
+  }
+  if (!start && end) {
+    return now <= end;
+  }
+  if (start && end) {
+    return now >= start && now <= end;
+  }
+  return true;
+}
+function getPriceInfo(product, variation) {
+  if (variation) {
+    const isOnSale2 = isSaleActive(variation.saleStartDate, variation.saleEndDate) && variation.salePrice !== null;
+    const originalPrice2 = variation.price ?? product.price;
+    const effectivePrice2 = isOnSale2 ? variation.salePrice ?? originalPrice2 : originalPrice2;
+    return {
+      effectivePrice: effectivePrice2,
+      originalPrice: originalPrice2,
+      isOnSale: isOnSale2,
+      salePercent: isOnSale2 ? variation.salePercent ?? null : null
+    };
+  }
+  const isOnSale = isSaleActive(product.saleStartDate, product.saleEndDate) && product.salePrice !== null;
+  const originalPrice = product.price;
+  const effectivePrice = isOnSale ? product.salePrice ?? originalPrice : originalPrice;
+  return {
+    effectivePrice,
+    originalPrice,
+    isOnSale,
+    salePercent: isOnSale ? product.salePercent ?? null : null
+  };
+}
+
+// src/utils/cart-calculations.ts
+function calculateCartWithCampaigns(items, campaigns) {
+  const buyXPayYCampaign = campaigns.find(
+    (c) => c.type === "BUY_X_PAY_Y" && c.isActive
+  );
+  const originalTotal = items.reduce((total, { product, variation, cartQuantity }) => {
+    const priceInfo = getPriceInfo(product, variation);
+    return total + priceInfo.effectivePrice * cartQuantity;
+  }, 0);
+  if (!buyXPayYCampaign?.BuyXPayYCampaign) {
+    const calculatedItems2 = items.map((item) => ({
+      item,
+      paidQuantity: item.cartQuantity,
+      freeQuantity: 0,
+      totalQuantity: item.cartQuantity
+    }));
+    return {
+      calculatedItems: calculatedItems2,
+      cartTotal: originalTotal,
+      originalTotal,
+      totalSavings: 0
+    };
+  }
+  const { buyQuantity, payQuantity, applicableCategories } = buyXPayYCampaign.BuyXPayYCampaign;
+  const applicableCategoryIds = new Set(
+    applicableCategories.map((c) => c.id)
+  );
+  const eligibleUnits = items.flatMap((item) => {
+    const { product, variation } = item;
+    const itemCategories = product.categories?.map((cat) => cat.id) || [];
+    const isEligible = itemCategories.some(
+      (id) => applicableCategoryIds.has(id)
+    );
+    if (isEligible) {
+      const priceInfo = getPriceInfo(product, variation);
+      return Array.from({ length: item.cartQuantity }, () => ({
+        price: priceInfo.effectivePrice,
+        productId: product.id,
+        variationId: variation?.id,
+        originalItem: item
+      }));
+    }
+    return [];
+  });
+  if (eligibleUnits.length < buyQuantity) {
+    const calculatedItems2 = items.map((item) => ({
+      item,
+      paidQuantity: item.cartQuantity,
+      freeQuantity: 0,
+      totalQuantity: item.cartQuantity
+    }));
+    return {
+      calculatedItems: calculatedItems2,
+      cartTotal: originalTotal,
+      originalTotal,
+      totalSavings: 0
+    };
+  }
+  eligibleUnits.sort((a, b) => a.price - b.price);
+  const numToMakeFree = buyQuantity - payQuantity;
+  const itemsToMakeFree = eligibleUnits.slice(0, numToMakeFree);
+  const totalSavings = itemsToMakeFree.reduce(
+    (sum, item) => sum + item.price,
+    0
+  );
+  const freeCountMap = /* @__PURE__ */ new Map();
+  for (const freebie of itemsToMakeFree) {
+    const key = `${freebie.productId}${freebie.variationId ? `_${freebie.variationId}` : ""}`;
+    freeCountMap.set(key, (freeCountMap.get(key) || 0) + 1);
+  }
+  const calculatedItems = items.map((item) => {
+    const key = `${item.product.id}${item.variation?.id ? `_${item.variation.id}` : ""}`;
+    const freeQuantity = freeCountMap.get(key) || 0;
+    const paidQuantity = item.cartQuantity - freeQuantity;
+    return {
+      item,
+      paidQuantity: Math.max(0, paidQuantity),
+      freeQuantity,
+      totalQuantity: item.cartQuantity
+    };
+  });
+  const cartTotal = originalTotal - totalSavings;
+  return {
+    calculatedItems,
+    cartTotal,
+    originalTotal,
+    totalSavings
+  };
+}
+
 // src/resources/shipping.ts
 function calculateCartWeight(items) {
   return items.reduce((total, item) => {
@@ -617,48 +749,70 @@ function calculateCartWeight(items) {
     return total + itemWeight * item.cartQuantity;
   }, 0);
 }
+function calculateCartTotal(items) {
+  return items.reduce((total, item) => {
+    const itemPrice = item.variation ? item.variation.salePrice ?? item.variation.price : item.product.salePrice ?? item.product.price;
+    return total + itemPrice * item.cartQuantity;
+  }, 0);
+}
 function createShippingResource(fetcher) {
   return {
     /**
      * Get shipping options for a specific postal code.
-     * Returns home delivery methods and pickup locations.
+     * Returns pickup points and home delivery options in a unified format.
+     *
+     * **Pickup points are returned first** as they are more popular in Finland.
      *
      * @param postalCode - Customer's postal code (e.g., "00100")
      * @param options - Fetch options including optional cartItems for weight-based filtering
-     * @returns Home delivery methods and pickup locations
+     * @returns Unified shipping options (pickupPoints sorted by distance, homeDelivery sorted by price)
      *
      * @example
      * ```typescript
-     * const { homeDeliveryMethods, pickupLocations } = await client.shipping.getWithLocations("00100");
-     *
-     * // Show home delivery options
-     * homeDeliveryMethods.forEach(method => {
-     *   console.log(`${method.name}: ${method.price / 100}€`);
+     * const { pickupPoints, homeDelivery } = await client.shipping.getOptions("00100");
+     *
+     * // Show pickup points (more popular in Finland)
+     * pickupPoints.forEach(point => {
+     *   console.log(`${point.name} - ${point.carrier}`);
+     *   console.log(`  ${point.address}, ${point.city}`);
+     *   console.log(`  ${(point.distance! / 1000).toFixed(1)} km away`);
+     *   console.log(`  Price: ${point.price / 100}€`);
      * });
      *
-     * // Show pickup locations
-     * pickupLocations.forEach(location => {
-     *   console.log(`${location.name} - ${location.carrier}`);
-     *   console.log(`  ${location.address1}, ${location.city}`);
-     *   console.log(`  ${location.distanceInKilometers.toFixed(1)} km away`);
-     *   console.log(`  Price: ${location.price / 100}€`);
+     * // Show home delivery options
+     * homeDelivery.forEach(option => {
+     *   console.log(`${option.name}: ${option.price / 100}€`);
+     *   if (option.estimatedDelivery) {
+     *     console.log(`  Delivery: ${option.estimatedDelivery} days`);
+     *   }
      * });
      * ```
      *
      * @example Weight-based filtering
      * ```typescript
-     * const { homeDeliveryMethods, pickupLocations } = await client.shipping.getWithLocations(
-     *   "00100",
-     *   { cartItems: cartItems }
-     * );
+     * const options = await client.shipping.getOptions("00100", {
+     *   cartItems: cartItems
+     * });
      * // Only shows methods that support the cart's total weight
      * ```
+     *
+     * @example International shipping
+     * ```typescript
+     * const options = await client.shipping.getOptions("112 22", {
+     *   country: "SE"
+     * });
+     * ```
      */
-    async getWithLocations(postalCode, options) {
+    async getOptions(postalCode, options) {
       const params = new URLSearchParams();
       if (options?.cartItems?.length) {
         const cartWeight = calculateCartWeight(options.cartItems);
         params.set("cartWeight", cartWeight.toString());
+        const cartTotal = options.campaigns ? calculateCartWithCampaigns(options.cartItems, options.campaigns).cartTotal : calculateCartTotal(options.cartItems);
+        params.set("cartTotal", cartTotal.toString());
+      }
+      if (options?.country) {
+        params.set("country", options.country);
       }
       const queryString = params.toString();
       const url = `/api/storefront/v1/shipment-methods/${encodeURIComponent(postalCode)}${queryString ? `?${queryString}` : ""}`;
@@ -666,6 +820,12 @@ function createShippingResource(fetcher) {
         method: "GET",
         ...options
       });
+    },
+    /**
+     * @deprecated Use getOptions() instead. This method is kept for backwards compatibility.
+     */
+    async getWithLocations(postalCode, options) {
+      return this.getOptions(postalCode, options);
     }
   };
 }
@@ -1393,146 +1553,6 @@ function createStorefrontClient(config) {
     checkout: createCheckoutResource(fetcher)
   };
 }
-
-// src/utils/pricing.ts
-function isSaleActive(startDate, endDate) {
-  if (!startDate && !endDate) {
-    return true;
-  }
-  const now = /* @__PURE__ */ new Date();
-  const start = startDate ? new Date(startDate) : null;
-  const end = endDate ? new Date(endDate) : null;
-  if (start && !end) {
-    return now >= start;
-  }
-  if (!start && end) {
-    return now <= end;
-  }
-  if (start && end) {
-    return now >= start && now <= end;
-  }
-  return true;
-}
-function getPriceInfo(product, variation) {
-  if (variation) {
-    const isOnSale2 = isSaleActive(variation.saleStartDate, variation.saleEndDate) && variation.salePrice !== null;
-    const originalPrice2 = variation.price ?? product.price;
-    const effectivePrice2 = isOnSale2 ? variation.salePrice ?? originalPrice2 : originalPrice2;
-    return {
-      effectivePrice: effectivePrice2,
-      originalPrice: originalPrice2,
-      isOnSale: isOnSale2,
-      salePercent: isOnSale2 ? variation.salePercent ?? null : null
-    };
-  }
-  const isOnSale = isSaleActive(product.saleStartDate, product.saleEndDate) && product.salePrice !== null;
-  const originalPrice = product.price;
-  const effectivePrice = isOnSale ? product.salePrice ?? originalPrice : originalPrice;
-  return {
-    effectivePrice,
-    originalPrice,
-    isOnSale,
-    salePercent: isOnSale ? product.salePercent ?? null : null
-  };
-}
-
-// src/utils/cart-calculations.ts
-function calculateCartWithCampaigns(items, campaigns) {
-  const buyXPayYCampaign = campaigns.find(
-    (c) => c.type === "BUY_X_PAY_Y" && c.isActive
-  );
-  const originalTotal = items.reduce((total, { product, variation, cartQuantity }) => {
-    const priceInfo = getPriceInfo(product, variation);
-    return total + priceInfo.effectivePrice * cartQuantity;
-  }, 0);
-  const freeShipping = {
-    isEligible: false,
-    minimumSpend: 0,
-    remainingAmount: 0
-  };
-  if (!buyXPayYCampaign?.BuyXPayYCampaign) {
-    const calculatedItems2 = items.map((item) => ({
-      item,
-      paidQuantity: item.cartQuantity,
-      freeQuantity: 0,
-      totalQuantity: item.cartQuantity
-    }));
-    return {
-      calculatedItems: calculatedItems2,
-      cartTotal: originalTotal,
-      originalTotal,
-      totalSavings: 0,
-      freeShipping
-    };
-  }
-  const { buyQuantity, payQuantity, applicableCategories } = buyXPayYCampaign.BuyXPayYCampaign;
-  const applicableCategoryIds = new Set(
-    applicableCategories.map((c) => c.id)
-  );
-  const eligibleUnits = items.flatMap((item) => {
-    const { product, variation } = item;
-    const itemCategories = product.categories?.map((cat) => cat.id) || [];
-    const isEligible = itemCategories.some(
-      (id) => applicableCategoryIds.has(id)
-    );
-    if (isEligible) {
-      const priceInfo = getPriceInfo(product, variation);
-      return Array.from({ length: item.cartQuantity }, () => ({
-        price: priceInfo.effectivePrice,
-        productId: product.id,
-        variationId: variation?.id,
-        originalItem: item
-      }));
-    }
-    return [];
-  });
-  if (eligibleUnits.length < buyQuantity) {
-    const calculatedItems2 = items.map((item) => ({
-      item,
-      paidQuantity: item.cartQuantity,
-      freeQuantity: 0,
-      totalQuantity: item.cartQuantity
-    }));
-    return {
-      calculatedItems: calculatedItems2,
-      cartTotal: originalTotal,
-      originalTotal,
-      totalSavings: 0,
-      freeShipping
-    };
-  }
-  eligibleUnits.sort((a, b) => a.price - b.price);
-  const numToMakeFree = buyQuantity - payQuantity;
-  const itemsToMakeFree = eligibleUnits.slice(0, numToMakeFree);
-  const totalSavings = itemsToMakeFree.reduce(
-    (sum, item) => sum + item.price,
-    0
-  );
-  const freeCountMap = /* @__PURE__ */ new Map();
-  for (const freebie of itemsToMakeFree) {
-    const key = `${freebie.productId}${freebie.variationId ? `_${freebie.variationId}` : ""}`;
-    freeCountMap.set(key, (freeCountMap.get(key) || 0) + 1);
-  }
-  const calculatedItems = items.map((item) => {
-    const key = `${item.product.id}${item.variation?.id ? `_${item.variation.id}` : ""}`;
-    const freeQuantity = freeCountMap.get(key) || 0;
-    const paidQuantity = item.cartQuantity - freeQuantity;
-    return {
-      item,
-      paidQuantity: Math.max(0, paidQuantity),
-      freeQuantity,
-      totalQuantity: item.cartQuantity
-    };
-  });
-  const cartTotal = originalTotal - totalSavings;
-  return {
-    calculatedItems,
-    cartTotal,
-    originalTotal,
-    totalSavings,
-    freeShipping
-  };
-}
 export {
   AuthError,
   NotFoundError,