@faststore/api 2.1.98 → 2.1.102

package/src/platforms/vtex/utils/shouldUpdateShippingData.ts

@@ -16,42 +16,23 @@ export const shouldUpdateShippingData = (
     return { updateShipping: false, addressChanged: false }
   }
 
-  const selectedAddress = orderForm.shippingData?.selectedAddresses[0]
-
-  if (checkPostalCode(selectedAddress, session.postalCode)) {
-    return { updateShipping: true, addressChanged: true }
+  if (!hasItems(orderForm)) {
+    return { updateShipping: false, addressChanged: false }
   }
 
+  const [selectedAddress] = orderForm?.shippingData?.selectedAddresses ?? []
   if (
-    checkGeoCoordinates(
-      selectedAddress,
-      session.geoCoordinates,
-      session.postalCode
-    )
+    checkPostalCode(selectedAddress, session.postalCode) ||
+    checkGeoCoordinates(selectedAddress, session.geoCoordinates) ||
+    checkAddressType(selectedAddress, session.addressType)
   ) {
     return { updateShipping: true, addressChanged: true }
   }
 
-  if (checkAddressType(selectedAddress, session.addressType)) {
-    return { updateShipping: true, addressChanged: true }
-  }
-
-  if (!hasItems(orderForm)) {
-    return { updateShipping: false, addressChanged: false }
-  }
-
   // The logisticsInfo will always exist if there´s at least one item inside the cart
   const { logisticsInfo } = orderForm.shippingData!
 
-  if (shouldUpdateDeliveryChannel(logisticsInfo, session)) {
-    return { updateShipping: true, addressChanged: false }
-  }
-
-  if (shouldUpdateDeliveryMethod(logisticsInfo, session)) {
-    return { updateShipping: true, addressChanged: false }
-  }
-
-  if (shouldUpdateDeliveryWindow(logisticsInfo, session)) {
+  if (shouldUpdateDeliveryInfo(logisticsInfo, session)) {
     return { updateShipping: true, addressChanged: false }
   }
   return { updateShipping: false, addressChanged: false }
@@ -61,15 +42,13 @@ export const shouldUpdateShippingData = (
 const hasSessionPostalCodeOrGeoCoordinates = (session: IStoreSession) => {
   return (
     !!session.postalCode ||
-    (session.geoCoordinates &&
-      session.geoCoordinates.latitude &&
-      session.geoCoordinates.longitude)
+    (session.geoCoordinates?.latitude && session.geoCoordinates?.longitude)
   )
 }
 
 // Validate if theres a difference between the session postal code and orderForm postal code
 const checkPostalCode = (
-  address: CheckoutAddress | null | undefined,
+  address: CheckoutAddress | null,
   postalCode: string | null | undefined
 ) => {
   return typeof postalCode === 'string' && address?.postalCode !== postalCode
@@ -77,21 +56,19 @@ const checkPostalCode = (
 
 // Validate if theres a difference between the session geoCoords and orderForm geoCoords
 const checkGeoCoordinates = (
-  address: CheckoutAddress | null | undefined,
-  geoCoordinates: IStoreGeoCoordinates | null | undefined,
-  postalCode: string | null | undefined
+  address: CheckoutAddress | null,
+  geoCoordinates: IStoreGeoCoordinates | null | undefined
 ) => {
   return (
     typeof geoCoordinates?.latitude === 'number' &&
     typeof geoCoordinates?.longitude === 'number' &&
     (address?.geoCoordinates[0] !== geoCoordinates?.longitude ||
-      address?.geoCoordinates[1] !== geoCoordinates?.latitude) &&
-    address?.postalCode !== postalCode
+      address?.geoCoordinates[1] !== geoCoordinates?.latitude)
   )
 }
 
 const checkAddressType = (
-  address: CheckoutAddress | null | undefined,
+  address: CheckoutAddress | null,
   addressType: string | null | undefined
 ) => {
   return typeof addressType === 'string' && address?.addressType !== addressType
@@ -102,73 +79,43 @@ const hasItems = (orderForm: OrderForm) => {
   return orderForm.items.length !== 0
 }
 
-// Validate if the deliveryChannel from the session is different from the selected delivery channel
-// and if so needs to validate if the deliveryChannel for the session is available inside the slas for the item
-const shouldUpdateDeliveryChannel = (
+const shouldUpdateDeliveryInfo = (
   logisticsInfo: LogisticsInfo[],
-  session: IStoreSession | null | undefined
+  session: IStoreSession | null
 ) => {
-  if (!session?.deliveryMode?.deliveryChannel) {
-    return false
-  }
-  const { deliveryChannel } = session.deliveryMode
-  for (const item of logisticsInfo) {
-    if (item.selectedDeliveryChannel !== deliveryChannel) {
-      const matchingSla = item.slas.find(
-        (sla) => sla.deliveryChannel === deliveryChannel
-      )
-      if (matchingSla) {
-        return true
-      }
+  const deliveryChannel = session?.deliveryMode?.deliveryChannel
+  const deliveryMethod = session?.deliveryMode?.deliveryMethod
+  const { startDate, endDate } = session?.deliveryMode?.deliveryWindow || {}
+
+  return logisticsInfo.some(
+    ({ selectedDeliveryChannel, selectedSla, slas }) => {
+      const checkDeliveryChannel =
+        deliveryChannel && selectedDeliveryChannel !== deliveryChannel
+      const checkDeliveryMethod =
+        deliveryMethod && selectedSla !== deliveryMethod
+
+      return slas?.some((sla) => {
+        if (
+          (checkDeliveryChannel && sla.deliveryChannel === deliveryChannel) ||
+          (checkDeliveryMethod && sla.id === deliveryMethod)
+        ) {
+          return true
+        }
+        return (
+          startDate &&
+          endDate &&
+          sla.deliveryChannel === deliveryChannel &&
+          sla.id === deliveryMethod &&
+          (!sla?.deliveryWindow ||
+            sla?.deliveryWindow?.startDateUtc !== startDate ||
+            sla?.deliveryWindow?.endDateUtc !== endDate) &&
+          sla.availableDeliveryWindows?.some(
+            (window) =>
+              window?.startDateUtc === startDate &&
+              window?.endDateUtc === endDate
+          )
+        )
+      })
     }
-  }
-  return false
-}
-
-// Validate if the deliveryMethod from the session is different from the selectedSLA
-// and if so needs to validate if the deliveryMethod for the session is available inside the slas for the item
-const shouldUpdateDeliveryMethod = (
-  logisticsInfo: LogisticsInfo[],
-  session: IStoreSession
-) => {
-  if (!session?.deliveryMode?.deliveryMethod) {
-    return false
-  }
-  const { deliveryMethod } = session.deliveryMode
-  for (const item of logisticsInfo) {
-    if (item.selectedSla !== deliveryMethod) {
-      const matchingSla = item.slas.find((sla) => sla.id === deliveryMethod)
-      if (matchingSla) {
-        return true
-      }
-    }
-  }
-  return false
-}
-
-// Validate if the deliveryWindow from the session is different from the deliveryWindow of the SLA
-// and if so needs to validate if the deliveryWindow for the session is available inside the availableDeliveryWindows for the item
-const shouldUpdateDeliveryWindow = (
-  logisticsInfo: LogisticsInfo[],
-  session: IStoreSession
-) => {
-  if (
-    !session?.deliveryMode?.deliveryWindow?.startDate ||
-    !session?.deliveryMode?.deliveryWindow?.endDate
-  ) {
-    return false
-  }
-  const { startDate, endDate } = session.deliveryMode.deliveryWindow
-  for (const item of logisticsInfo) {
-    for (const sla of item.slas) {
-      const matchingWindow = sla.availableDeliveryWindows?.some(
-        (window) =>
-          window.startDateUtc === startDate && window.endDateUtc === endDate
-      )
-      if (matchingWindow) {
-        return true
-      }
-    }
-  }
-  return false
+  )
 }

package/dist/utils/get-cookie-by-name.d.ts

@@ -1 +0,0 @@
-export default function getCookieByName(cookiename: string, source: string): string;

package/src/utils/get-cookie-by-name.ts

@@ -1,6 +0,0 @@
-export default function getCookieByName(cookiename: string, source: string) {
-  var cookiestring = RegExp(cookiename + '=[^;]+').exec(source)
-  return decodeURIComponent(
-    !!cookiestring ? cookiestring.toString().replace(/^[^=]+./, '') : ''
-  )
-}