@faststore/api 3.95.0 → 3.96.0-dev.17

package/src/__generated__/schema.ts

@@ -2039,7 +2039,10 @@ export type UserOrderDeliveryOptionsItems = {
   name?: Maybe<Scalars['String']>;
   price?: Maybe<Scalars['Float']>;
   quantity?: Maybe<Scalars['Int']>;
+  sellingPrice?: Maybe<Scalars['Float']>;
   tax?: Maybe<Scalars['Float']>;
+  taxPriceTags?: Maybe<Array<Maybe<UserOrderPriceTag>>>;
+  taxPriceTagsTotal?: Maybe<Scalars['Float']>;
   total?: Maybe<Scalars['Float']>;
   uniqueId?: Maybe<Scalars['String']>;
 };

package/src/directives/cacheControl.ts

@@ -11,12 +11,18 @@ export interface CacheControl {
   scope?: string
 }
 
-export const stringify = ({
-  scope = 'private',
-  sMaxAge = 0,
-  staleWhileRevalidate = 0,
-}: CacheControl) =>
-  `${scope}, s-maxage=${sMaxAge}, stale-while-revalidate=${staleWhileRevalidate}`
+export const stringify = (
+  cacheControl: CacheControl,
+  forcePrivate?: boolean
+): string => {
+  const {
+    scope = 'private',
+    sMaxAge = 0,
+    staleWhileRevalidate = 0,
+  } = cacheControl
+  const finalScope = forcePrivate ? 'private' : scope
+  return `${finalScope}, s-maxage=${sMaxAge}, stale-while-revalidate=${staleWhileRevalidate}`
+}
 
 const min = (a: number | undefined, b: number | undefined) => {
   if (typeof a === 'number' && typeof b === 'number') {

package/src/platforms/vtex/resolvers/userOrder.ts

@@ -3,6 +3,7 @@ import type {
   Maybe,
   UserOrderCustomField,
   UserOrderDeliveryOption,
+  UserOrderPriceTag,
 } from '../../..'
 import type { PromiseType } from '../../../typings'
 import type { Query } from './query'
@@ -59,8 +60,14 @@ export const UserOrderResult: Record<string, Resolver<Root>> = {
           `${deliveryChannelsMapping[deliveryChannel as keyof typeof deliveryChannelsMapping] || ''} ${friendlyShippingEstimate} ${address?.neighborhood ? `to ${address?.neighborhood}` : ''}`.trim()
 
         // TODO check other totals like bundleItems etc
+        const { taxPriceTagsTotal, taxPriceTags } = filterTaxPriceTags(
+          (item?.priceTags ?? []) as UserOrderPriceTag[]
+        )
+
         const itemTotal =
-          (item?.sellingPrice ?? 0) * (item?.quantity ?? 0) + (item?.tax ?? 0)
+          (item?.sellingPrice ?? 0) * (item?.quantity ?? 0) +
+          (item?.tax ?? 0) +
+          (taxPriceTagsTotal ?? 0)
 
         if (!acc[groupKey]) {
           acc[groupKey] = {
@@ -90,7 +97,10 @@ export const UserOrderResult: Record<string, Resolver<Root>> = {
             name: item?.name || '',
             quantity: item?.quantity || 0,
             price: item?.price || 0,
+            sellingPrice: item?.sellingPrice || 0,
             imageUrl: item?.imageUrl || '',
+            taxPriceTags: taxPriceTags ?? [],
+            taxPriceTagsTotal: taxPriceTagsTotal ?? 0,
             tax: item?.tax || 0,
             total: itemTotal,
           })
@@ -205,3 +215,22 @@ export const UserOrderResult: Record<string, Resolver<Root>> = {
     //   ]
   },
 }
+
+// logic copied from https://github.com/vtex/my-orders/blob/3271bdd4216851fb21b64093769d73183868e362/react/components/Order/ChangeSummary/ChangeV2/shared/filterPriceTags.js#L59-L60
+export function filterTaxPriceTags(priceTags: UserOrderPriceTag[]) {
+  const multiplier = 100
+
+  const taxPriceTags = priceTags.filter((priceTag) =>
+    priceTag?.name?.includes('TAX')
+  )
+
+  const taxPriceTagsTotal = taxPriceTags.reduce(
+    (acc, curr) => acc + (curr.rawValue ? curr.rawValue * multiplier : 0),
+    0
+  )
+
+  return {
+    taxPriceTags,
+    taxPriceTagsTotal,
+  }
+}

package/src/typeDefs/userOrder.graphql

@@ -682,8 +682,11 @@ type UserOrderDeliveryOptionsItems {
   name: String
   quantity: Int
   price: Float
+  sellingPrice: Float
   imageUrl: String
   tax: Float
+  taxPriceTags: [UserOrderPriceTag]
+  taxPriceTagsTotal: Float
   total: Float
 }