diff --git a/scripts/__dropins__/storefront-order/api/confirmCancelOrder/confirmCancelOrder.d.ts b/scripts/__dropins__/storefront-order/api/confirmCancelOrder/confirmCancelOrder.d.ts
index 1d3b88864..8d935709a 100644
--- a/scripts/__dropins__/storefront-order/api/confirmCancelOrder/confirmCancelOrder.d.ts
+++ b/scripts/__dropins__/storefront-order/api/confirmCancelOrder/confirmCancelOrder.d.ts
@@ -13,6 +13,8 @@
  * from Adobe.
  *******************************************************************/
 export declare const confirmCancelOrder: (orderId: string, confirmationKey: string) => Promise<{
+    subtotalExclTax: any;
+    subtotalInclTax: any;
     billingAddress: {
         city: any;
         company: any;
@@ -83,8 +85,6 @@ export declare const confirmCancelOrder: (orderId: string, confirmationKey: stri
     }[];
     grandTotal: any;
     totalGiftcard: any;
-    subtotalExclTax: any;
-    subtotalInclTax: any;
     taxes: any;
     totalTax: any;
     totalShipping: any;
diff --git a/scripts/__dropins__/storefront-order/chunks/initialize.js b/scripts/__dropins__/storefront-order/chunks/initialize.js
index b547b5260..bb6c02da4 100644
--- a/scripts/__dropins__/storefront-order/chunks/initialize.js
+++ b/scripts/__dropins__/storefront-order/chunks/initialize.js
@@ -1,6 +1,6 @@
 /*! Copyright 2024 Adobe
 All Rights Reserved. */
-import{merge as cn,Initializer as hn}from"@dropins/tools/lib.js";import{events as L}from"@dropins/tools/event-bus.js";import{h as ln}from"./network-error.js";import{PRODUCT_DETAILS_FRAGMENT as an,PRICE_DETAILS_FRAGMENT as sn,GIFT_CARD_DETAILS_FRAGMENT as pn,ORDER_ITEM_DETAILS_FRAGMENT as Rn,BUNDLE_ORDER_ITEM_DETAILS_FRAGMENT as tn,ORDER_SUMMARY_FRAGMENT as En,ADDRESS_FRAGMENT as Tn,RETURNS_FRAGMENT as yn}from"../fragments.js";import{f as gn,h as On}from"./fetch-graphql.js";const Nn=n=>n||0,fn=n=>{var i,_,u,c,R,s,E,t,T;return{...n,onlyXLeftInStock:(n==null?void 0:n.only_x_left_in_stock)??0,stockStatus:(n==null?void 0:n.stock_status)??"",priceRange:{maximumPrice:{regularPrice:{currency:((u=(_=(i=n==null?void 0:n.price_range)==null?void 0:i.maximum_price)==null?void 0:_.regular_price)==null?void 0:u.currency)??"",value:((s=(R=(c=n==null?void 0:n.price_range)==null?void 0:c.maximum_price)==null?void 0:R.regular_price)==null?void 0:s.value)??0}}},canonicalUrl:(n==null?void 0:n.canonical_url)??"",urlKey:(n==null?void 0:n.url_key)||"",id:(n==null?void 0:n.uid)||"",name:(n==null?void 0:n.name)||"",sku:(n==null?void 0:n.sku)||"",image:((E=n==null?void 0:n.image)==null?void 0:E.url)||"",productType:(n==null?void 0:n.__typename)||"",thumbnail:{label:((t=n==null?void 0:n.thumbnail)==null?void 0:t.label)||"",url:((T=n==null?void 0:n.thumbnail)==null?void 0:T.url)||""}}},Sn=n=>{if(!n||!("selected_options"in n))return;const i={};for(const _ of n.selected_options)i[_.label]=_.value;return i},Mn=n=>{const i=n==null?void 0:n.map(u=>({uid:u.uid,label:u.label,values:u.values.map(c=>c.product_name).join(", ")})),_={};return i==null||i.forEach(u=>{_[u.label]=u.values}),Object.keys(_).length>0?_:null},Gn=n=>(n==null?void 0:n.length)>0?{count:n.length,result:n.map(i=>i.title).join(", ")}:null,Fn=n=>({quantityCanceled:(n==null?void 0:n.quantity_canceled)??0,quantityInvoiced:(n==null?void 0:n.quantity_invoiced)??0,quantityOrdered:(n==null?void 0:n.quantity_ordered)??0,quantityRefunded:(n==null?void 0:n.quantity_refunded)??0,quantityReturned:(n==null?void 0:n.quantity_returned)??0,quantityShipped:(n==null?void 0:n.quantity_shipped)??0,quantityReturnRequested:(n==null?void 0:n.quantity_return_requested)??0}),un=n=>({city:(n==null?void 0:n.city)??"",company:(n==null?void 0:n.company)??"",countryCode:(n==null?void 0:n.country_code)??"",fax:(n==null?void 0:n.fax)??"",firstName:(n==null?void 0:n.firstname)??"",lastName:(n==null?void 0:n.lastname)??"",middleName:(n==null?void 0:n.middlename)??"",postCode:(n==null?void 0:n.postcode)??"",prefix:(n==null?void 0:n.prefix)??"",region:(n==null?void 0:n.region)??"",regionId:(n==null?void 0:n.region_id)??"",street:(n==null?void 0:n.street)??[],suffix:(n==null?void 0:n.suffix)??"",telephone:(n==null?void 0:n.telephone)??"",vatId:(n==null?void 0:n.vat_id)??""}),qn=n=>{const i={value:0,currency:""};return{grandTotal:(n==null?void 0:n.grand_total)??i,totalGiftcard:(n==null?void 0:n.total_giftcard)??i,subtotalExclTax:(n==null?void 0:n.subtotal_excl_tax)??i,subtotalInclTax:(n==null?void 0:n.subtotal_incl_tax)??i,taxes:(n==null?void 0:n.taxes)??[],totalTax:(n==null?void 0:n.total_tax)??i,totalShipping:(n==null?void 0:n.total_shipping)??i,discounts:(n==null?void 0:n.discounts)??[]}},bn=n=>{var t,T,a,p,G,F,q,x,v,N,f,l,b,A,h,S,O,M,g,y,C,U,w,P,z,Y,Q,j,K,V,X,H,J,W,Z,D,e,m,o,I,r,d,nn,_n;const{quantityCanceled:i,quantityInvoiced:_,quantityOrdered:u,quantityRefunded:c,quantityReturned:R,quantityShipped:s,quantityReturnRequested:E}=Fn(n);return{selectedOptions:(n==null?void 0:n.selected_options)??[],productSalePrice:n==null?void 0:n.product_sale_price,status:(n==null?void 0:n.status)??"",type:n==null?void 0:n.__typename,eligibleForReturn:(n==null?void 0:n.eligible_for_return)??!1,productSku:(n==null?void 0:n.product_sku)??"",productName:(n==null?void 0:n.product_name)??"",productUrlKey:(n==null?void 0:n.product_url_key)??"",quantityCanceled:i,quantityInvoiced:_,quantityOrdered:u,quantityRefunded:c,quantityReturned:R,quantityShipped:s,quantityReturnRequested:E,id:n==null?void 0:n.id,discounted:((p=(a=(T=(t=n==null?void 0:n.product)==null?void 0:t.price_range)==null?void 0:T.maximum_price)==null?void 0:a.regular_price)==null?void 0:p.value)*(n==null?void 0:n.quantity_ordered)!==((G=n==null?void 0:n.product_sale_price)==null?void 0:G.value)*(n==null?void 0:n.quantity_ordered),total:{value:((F=n==null?void 0:n.product_sale_price)==null?void 0:F.value)*(n==null?void 0:n.quantity_ordered)||0,currency:((q=n==null?void 0:n.product_sale_price)==null?void 0:q.currency)||""},totalInclTax:{value:((x=n==null?void 0:n.product_sale_price)==null?void 0:x.value)*(n==null?void 0:n.quantity_ordered)||0,currency:(v=n==null?void 0:n.product_sale_price)==null?void 0:v.currency},price:{value:((N=n==null?void 0:n.product_sale_price)==null?void 0:N.value)||0,currency:(f=n==null?void 0:n.product_sale_price)==null?void 0:f.currency},prices:{price:(l=n==null?void 0:n.prices)==null?void 0:l.price,priceIncludingTax:(b=n==null?void 0:n.prices)==null?void 0:b.price_including_tax,originalPrice:(A=n==null?void 0:n.prices)==null?void 0:A.original_price,originalPriceIncludingTax:(h=n==null?void 0:n.prices)==null?void 0:h.original_price_including_tax,discounts:(S=n==null?void 0:n.prices)==null?void 0:S.discounts},itemPrices:{price:(O=n==null?void 0:n.prices)==null?void 0:O.price,priceIncludingTax:(M=n==null?void 0:n.prices)==null?void 0:M.price_including_tax,originalPrice:(g=n==null?void 0:n.prices)==null?void 0:g.original_price,originalPriceIncludingTax:(y=n==null?void 0:n.prices)==null?void 0:y.original_price_including_tax,discounts:(C=n==null?void 0:n.prices)==null?void 0:C.discounts},priceInclTax:{value:((U=n==null?void 0:n.product_sale_price)==null?void 0:U.value)||0,currency:(w=n==null?void 0:n.product_sale_price)==null?void 0:w.currency},totalQuantity:Nn(n==null?void 0:n.quantity_ordered),regularPrice:{value:(Q=(Y=(z=(P=n==null?void 0:n.product)==null?void 0:P.price_range)==null?void 0:z.maximum_price)==null?void 0:Y.regular_price)==null?void 0:Q.value,currency:(X=(V=(K=(j=n==null?void 0:n.product)==null?void 0:j.price_range)==null?void 0:K.maximum_price)==null?void 0:V.regular_price)==null?void 0:X.currency},product:fn(n==null?void 0:n.product),thumbnail:{label:((J=(H=n==null?void 0:n.product)==null?void 0:H.thumbnail)==null?void 0:J.label)||"",url:((Z=(W=n==null?void 0:n.product)==null?void 0:W.thumbnail)==null?void 0:Z.url)||""},subtotalExclTax:{currency:(D=n==null?void 0:n.subtotal_excl_tax)==null?void 0:D.currency,value:(e=n==null?void 0:n.subtotal_excl_tax)==null?void 0:e.value},subtotalInclTax:{currency:(m=n==null?void 0:n.subtotal_incl_tax)==null?void 0:m.currency,value:(o=n==null?void 0:n.subtotal_incl_tax)==null?void 0:o.value},giftCard:(n==null?void 0:n.__typename)==="GiftCardOrderItem"?{senderName:((I=n.gift_card)==null?void 0:I.sender_name)||"",senderEmail:((r=n.gift_card)==null?void 0:r.sender_email)||"",recipientEmail:((d=n.gift_card)==null?void 0:d.recipient_email)||"",recipientName:((nn=n.gift_card)==null?void 0:nn.recipient_name)||"",message:((_n=n.gift_card)==null?void 0:_n.message)||""}:void 0,configurableOptions:Sn(n),bundleOptions:n.__typename==="BundleOrderItem"?Mn(n.bundle_options):null,downloadableLinks:n.__typename==="DownloadableOrderItem"?Gn(n==null?void 0:n.downloadable_links):null}},B=n=>n==null?void 0:n.filter(i=>i.__typename).map(i=>bn(i)),xn=n=>({token:(n==null?void 0:n.token)??"",email:(n==null?void 0:n.email)??"",status:(n==null?void 0:n.status)??"",number:(n==null?void 0:n.number)??"",id:(n==null?void 0:n.id)??"",carrier:n.carrier??"",coupons:(n==null?void 0:n.applied_coupons)??[],orderDate:(n==null?void 0:n.order_date)??"",isVirtual:(n==null?void 0:n.is_virtual)??!1,availableActions:(n==null?void 0:n.available_actions)??[],orderStatusChangeDate:(n==null?void 0:n.order_status_change_date)??"",shippingMethod:(n==null?void 0:n.shipping_method)??""}),$=(n,i)=>{var N,f,l,b,A,h,S,O,M;const _=xn(n),u=un(n==null?void 0:n.billing_address),c=un(n==null?void 0:n.shipping_address),R=(N=n.shipments)==null?void 0:N.map(g=>({...g,items:g.items.map(y=>({id:y.id,productName:y.product_name,productSku:y.product_sku,quantityShipped:y.quantity_shipped,orderItem:bn(y.order_item)}))})),s=B(n.items),E=((f=kn(n==null?void 0:n.returns))==null?void 0:f.ordersReturn)??[],t=i?E.filter(g=>g.returnNumber===i):E,T=B(n.items_eligible_for_return),a=qn(n==null?void 0:n.total),p=(l=n==null?void 0:n.payment_methods)==null?void 0:l[0],G=n==null?void 0:n.shipping_method,F=s==null?void 0:s.reduce((g,y)=>g+(y==null?void 0:y.totalQuantity),0),q={amount:((b=a==null?void 0:a.totalShipping)==null?void 0:b.value)??0,currency:((A=a==null?void 0:a.totalShipping)==null?void 0:A.currency)||"",code:(_==null?void 0:_.shippingMethod)??""},x=[{code:(p==null?void 0:p.type)??"",name:(p==null?void 0:p.name)??""}],v={..._,...a,billingAddress:u,shippingAddress:c,shipments:R,items:s,returns:t,itemsEligibleForReturn:T,totalQuantity:F,shippingMethod:G,shipping:q,payments:x};return cn(v,(M=(O=(S=(h=k==null?void 0:k.getConfig())==null?void 0:h.models)==null?void 0:S.OrderDataModel)==null?void 0:O.transformer)==null?void 0:M.call(O,n))},vn=(n,i,_)=>{var u,c,R,s,E,t,T;if((s=(R=(c=(u=i==null?void 0:i.data)==null?void 0:u.customer)==null?void 0:c.orders)==null?void 0:R.items)!=null&&s.length&&n==="orderData"){const a=(T=(t=(E=i==null?void 0:i.data)==null?void 0:E.customer)==null?void 0:t.orders)==null?void 0:T.items[0];return $(a,_)}return null},kn=n=>{var R,s,E,t,T;if(!((R=n==null?void 0:n.items)!=null&&R.length))return null;const i=n==null?void 0:n.items,_=n==null?void 0:n.page_info,c={ordersReturn:[...i].sort((a,p)=>+p.number-+a.number).map(a=>{var N,f;const{order:p,status:G,number:F,created_at:q}=a,x=((f=(N=a==null?void 0:a.shipping)==null?void 0:N.tracking)==null?void 0:f.map(l=>{const{status:b,carrier:A,tracking_number:h}=l;return{status:b,carrier:A,trackingNumber:h}}))??[],v=a.items.map(l=>{var g;const b=l==null?void 0:l.quantity,A=l==null?void 0:l.status,h=l==null?void 0:l.request_quantity,S=l==null?void 0:l.uid,O=l==null?void 0:l.order_item,M=((g=B([O]))==null?void 0:g.reduce((y,C)=>C,{}))??{};return{uid:S,quantity:b,status:A,requestQuantity:h,...M}});return{createdReturnAt:q,returnStatus:G,token:p==null?void 0:p.token,orderNumber:p==null?void 0:p.number,returnNumber:F,items:v,tracking:x}}),..._?{pageInfo:{pageSize:_.page_size,totalPages:_.total_pages,currentPage:_.current_page}}:{}};return cn(c,(T=(t=(E=(s=k==null?void 0:k.getConfig())==null?void 0:s.models)==null?void 0:E.CustomerOrdersReturnModel)==null?void 0:t.transformer)==null?void 0:T.call(t,{...i,..._}))},Vn=(n,i)=>{var u,c;if(!((u=n==null?void 0:n.data)!=null&&u.guestOrder))return null;const _=(c=n==null?void 0:n.data)==null?void 0:c.guestOrder;return $(_,i)},Cn=(n,i)=>{var u,c;if(!((u=n==null?void 0:n.data)!=null&&u.guestOrderByToken))return null;const _=(c=n==null?void 0:n.data)==null?void 0:c.guestOrderByToken;return $(_,i)},Ln=`
+import{merge as d,Initializer as yn}from"@dropins/tools/lib.js";import{events as B}from"@dropins/tools/event-bus.js";import{h as nn}from"./network-error.js";import{PRODUCT_DETAILS_FRAGMENT as _n,PRICE_DETAILS_FRAGMENT as un,GIFT_CARD_DETAILS_FRAGMENT as cn,ORDER_ITEM_DETAILS_FRAGMENT as ln,BUNDLE_ORDER_ITEM_DETAILS_FRAGMENT as sn,ORDER_SUMMARY_FRAGMENT as an,ADDRESS_FRAGMENT as pn,RETURNS_FRAGMENT as Rn}from"../fragments.js";import{f as tn,h as gn}from"./fetch-graphql.js";const bn=n=>n||0,An=n=>{var i,_,u,l,R,a,E,t,T;return{...n,onlyXLeftInStock:(n==null?void 0:n.only_x_left_in_stock)??0,stockStatus:(n==null?void 0:n.stock_status)??"",priceRange:{maximumPrice:{regularPrice:{currency:((u=(_=(i=n==null?void 0:n.price_range)==null?void 0:i.maximum_price)==null?void 0:_.regular_price)==null?void 0:u.currency)??"",value:((a=(R=(l=n==null?void 0:n.price_range)==null?void 0:l.maximum_price)==null?void 0:R.regular_price)==null?void 0:a.value)??0}}},canonicalUrl:(n==null?void 0:n.canonical_url)??"",urlKey:(n==null?void 0:n.url_key)||"",id:(n==null?void 0:n.uid)||"",name:(n==null?void 0:n.name)||"",sku:(n==null?void 0:n.sku)||"",image:((E=n==null?void 0:n.image)==null?void 0:E.url)||"",productType:(n==null?void 0:n.__typename)||"",thumbnail:{label:((t=n==null?void 0:n.thumbnail)==null?void 0:t.label)||"",url:((T=n==null?void 0:n.thumbnail)==null?void 0:T.url)||""}}},hn=n=>{if(!n||!("selected_options"in n))return;const i={};for(const _ of n.selected_options)i[_.label]=_.value;return i},On=n=>{const i=n==null?void 0:n.map(u=>({uid:u.uid,label:u.label,values:u.values.map(l=>l.product_name).join(", ")})),_={};return i==null||i.forEach(u=>{_[u.label]=u.values}),Object.keys(_).length>0?_:null},Nn=n=>(n==null?void 0:n.length)>0?{count:n.length,result:n.map(i=>i.title).join(", ")}:null,fn=n=>({quantityCanceled:(n==null?void 0:n.quantity_canceled)??0,quantityInvoiced:(n==null?void 0:n.quantity_invoiced)??0,quantityOrdered:(n==null?void 0:n.quantity_ordered)??0,quantityRefunded:(n==null?void 0:n.quantity_refunded)??0,quantityReturned:(n==null?void 0:n.quantity_returned)??0,quantityShipped:(n==null?void 0:n.quantity_shipped)??0,quantityReturnRequested:(n==null?void 0:n.quantity_return_requested)??0}),r=n=>({city:(n==null?void 0:n.city)??"",company:(n==null?void 0:n.company)??"",countryCode:(n==null?void 0:n.country_code)??"",fax:(n==null?void 0:n.fax)??"",firstName:(n==null?void 0:n.firstname)??"",lastName:(n==null?void 0:n.lastname)??"",middleName:(n==null?void 0:n.middlename)??"",postCode:(n==null?void 0:n.postcode)??"",prefix:(n==null?void 0:n.prefix)??"",region:(n==null?void 0:n.region)??"",regionId:(n==null?void 0:n.region_id)??"",street:(n==null?void 0:n.street)??[],suffix:(n==null?void 0:n.suffix)??"",telephone:(n==null?void 0:n.telephone)??"",vatId:(n==null?void 0:n.vat_id)??""}),Sn=n=>{const i={value:0,currency:""};return{grandTotal:(n==null?void 0:n.grand_total)??i,totalGiftcard:(n==null?void 0:n.total_giftcard)??i,subtotalExclTax:(n==null?void 0:n.subtotal_excl_tax)??i,subtotalInclTax:(n==null?void 0:n.subtotal_incl_tax)??i,taxes:(n==null?void 0:n.taxes)??[],totalTax:(n==null?void 0:n.total_tax)??i,totalShipping:(n==null?void 0:n.total_shipping)??i,discounts:(n==null?void 0:n.discounts)??[]}},En=n=>{var t,T,c,p,F,q,x,k,v,N,f,s,A,h,O,S,M,G,b,C,g,y,w,P,z,Y,Q,j,K,V,X,H,J,W,Z,D,e,m,o,I;const{quantityCanceled:i,quantityInvoiced:_,quantityOrdered:u,quantityRefunded:l,quantityReturned:R,quantityShipped:a,quantityReturnRequested:E}=fn(n);return{selectedOptions:(n==null?void 0:n.selected_options)??[],productSalePrice:n==null?void 0:n.product_sale_price,status:(n==null?void 0:n.status)??"",type:n==null?void 0:n.__typename,eligibleForReturn:(n==null?void 0:n.eligible_for_return)??!1,productSku:(n==null?void 0:n.product_sku)??"",productName:(n==null?void 0:n.product_name)??"",productUrlKey:(n==null?void 0:n.product_url_key)??"",quantityCanceled:i,quantityInvoiced:_,quantityOrdered:u,quantityRefunded:l,quantityReturned:R,quantityShipped:a,quantityReturnRequested:E,id:n==null?void 0:n.id,discounted:((p=(c=(T=(t=n==null?void 0:n.product)==null?void 0:t.price_range)==null?void 0:T.maximum_price)==null?void 0:c.regular_price)==null?void 0:p.value)*(n==null?void 0:n.quantity_ordered)!==((F=n==null?void 0:n.product_sale_price)==null?void 0:F.value)*(n==null?void 0:n.quantity_ordered),total:{value:((q=n==null?void 0:n.product_sale_price)==null?void 0:q.value)*(n==null?void 0:n.quantity_ordered)||0,currency:((x=n==null?void 0:n.product_sale_price)==null?void 0:x.currency)||""},totalInclTax:{value:((k=n==null?void 0:n.product_sale_price)==null?void 0:k.value)*(n==null?void 0:n.quantity_ordered)||0,currency:(v=n==null?void 0:n.product_sale_price)==null?void 0:v.currency},price:{value:((N=n==null?void 0:n.product_sale_price)==null?void 0:N.value)||0,currency:(f=n==null?void 0:n.product_sale_price)==null?void 0:f.currency},prices:{price:(s=n==null?void 0:n.prices)==null?void 0:s.price,priceIncludingTax:(A=n==null?void 0:n.prices)==null?void 0:A.price_including_tax,originalPrice:(h=n==null?void 0:n.prices)==null?void 0:h.original_price,originalPriceIncludingTax:(O=n==null?void 0:n.prices)==null?void 0:O.original_price_including_tax,discounts:(S=n==null?void 0:n.prices)==null?void 0:S.discounts},itemPrices:{price:(M=n==null?void 0:n.prices)==null?void 0:M.price,priceIncludingTax:(G=n==null?void 0:n.prices)==null?void 0:G.price_including_tax,originalPrice:(b=n==null?void 0:n.prices)==null?void 0:b.original_price,originalPriceIncludingTax:(C=n==null?void 0:n.prices)==null?void 0:C.original_price_including_tax,discounts:(g=n==null?void 0:n.prices)==null?void 0:g.discounts},priceInclTax:{value:((y=n==null?void 0:n.product_sale_price)==null?void 0:y.value)||0,currency:(w=n==null?void 0:n.product_sale_price)==null?void 0:w.currency},totalQuantity:bn(n==null?void 0:n.quantity_ordered),regularPrice:{value:(Q=(Y=(z=(P=n==null?void 0:n.product)==null?void 0:P.price_range)==null?void 0:z.maximum_price)==null?void 0:Y.regular_price)==null?void 0:Q.value,currency:(X=(V=(K=(j=n==null?void 0:n.product)==null?void 0:j.price_range)==null?void 0:K.maximum_price)==null?void 0:V.regular_price)==null?void 0:X.currency},product:An(n==null?void 0:n.product),thumbnail:{label:((J=(H=n==null?void 0:n.product)==null?void 0:H.thumbnail)==null?void 0:J.label)||"",url:((Z=(W=n==null?void 0:n.product)==null?void 0:W.thumbnail)==null?void 0:Z.url)||""},giftCard:(n==null?void 0:n.__typename)==="GiftCardOrderItem"?{senderName:((D=n.gift_card)==null?void 0:D.sender_name)||"",senderEmail:((e=n.gift_card)==null?void 0:e.sender_email)||"",recipientEmail:((m=n.gift_card)==null?void 0:m.recipient_email)||"",recipientName:((o=n.gift_card)==null?void 0:o.recipient_name)||"",message:((I=n.gift_card)==null?void 0:I.message)||""}:void 0,configurableOptions:hn(n),bundleOptions:n.__typename==="BundleOrderItem"?On(n.bundle_options):null,downloadableLinks:n.__typename==="DownloadableOrderItem"?Nn(n==null?void 0:n.downloadable_links):null}},$=n=>n==null?void 0:n.filter(i=>i.__typename).map(i=>En(i)),Mn=n=>({token:(n==null?void 0:n.token)??"",email:(n==null?void 0:n.email)??"",status:(n==null?void 0:n.status)??"",number:(n==null?void 0:n.number)??"",id:(n==null?void 0:n.id)??"",carrier:n.carrier??"",coupons:(n==null?void 0:n.applied_coupons)??[],orderDate:(n==null?void 0:n.order_date)??"",isVirtual:(n==null?void 0:n.is_virtual)??!1,availableActions:(n==null?void 0:n.available_actions)??[],orderStatusChangeDate:(n==null?void 0:n.order_status_change_date)??"",shippingMethod:(n==null?void 0:n.shipping_method)??""}),U=(n,i)=>{var s,A,h,O,S,M,G,b,C;const _=Mn(n),u=r(n==null?void 0:n.billing_address),l=r(n==null?void 0:n.shipping_address),R=(s=n.shipments)==null?void 0:s.map(g=>({...g,items:g.items.map(y=>({id:y.id,productName:y.product_name,productSku:y.product_sku,quantityShipped:y.quantity_shipped,orderItem:En(y.order_item)}))})),a=$(n.items),E=((A=Fn(n==null?void 0:n.returns))==null?void 0:A.ordersReturn)??[],t=i?E.filter(g=>g.returnNumber===i):E,T=$(n.items_eligible_for_return),c=Sn(n==null?void 0:n.total),p=(h=n==null?void 0:n.payment_methods)==null?void 0:h[0],F=n==null?void 0:n.shipping_method,q=a==null?void 0:a.reduce((g,y)=>g+(y==null?void 0:y.totalQuantity),0),x={amount:((O=c==null?void 0:c.totalShipping)==null?void 0:O.value)??0,currency:((S=c==null?void 0:c.totalShipping)==null?void 0:S.currency)||"",code:(_==null?void 0:_.shippingMethod)??""},k=[{code:(p==null?void 0:p.type)??"",name:(p==null?void 0:p.name)??""}],v=c==null?void 0:c.subtotalExclTax,N=c==null?void 0:c.subtotalInclTax;console.log("orderData",n);const f={..._,...c,subtotalExclTax:v,subtotalInclTax:N,billingAddress:u,shippingAddress:l,shipments:R,items:a,returns:t,itemsEligibleForReturn:T,totalQuantity:q,shippingMethod:F,shipping:x,payments:k};return d(f,(C=(b=(G=(M=L==null?void 0:L.getConfig())==null?void 0:M.models)==null?void 0:G.OrderDataModel)==null?void 0:b.transformer)==null?void 0:C.call(b,n))},Gn=(n,i,_)=>{var u,l,R,a,E,t,T;if((a=(R=(l=(u=i==null?void 0:i.data)==null?void 0:u.customer)==null?void 0:l.orders)==null?void 0:R.items)!=null&&a.length&&n==="orderData"){const c=(T=(t=(E=i==null?void 0:i.data)==null?void 0:E.customer)==null?void 0:t.orders)==null?void 0:T.items[0];return U(c,_)}return null},Fn=n=>{var R,a,E,t,T;if(!((R=n==null?void 0:n.items)!=null&&R.length))return null;const i=n==null?void 0:n.items,_=n==null?void 0:n.page_info,l={ordersReturn:[...i].sort((c,p)=>+p.number-+c.number).map(c=>{var N,f;const{order:p,status:F,number:q,created_at:x}=c,k=((f=(N=c==null?void 0:c.shipping)==null?void 0:N.tracking)==null?void 0:f.map(s=>{const{status:A,carrier:h,tracking_number:O}=s;return{status:A,carrier:h,trackingNumber:O}}))??[],v=c.items.map(s=>{var b;const A=s==null?void 0:s.quantity,h=s==null?void 0:s.status,O=s==null?void 0:s.request_quantity,S=s==null?void 0:s.uid,M=s==null?void 0:s.order_item,G=((b=$([M]))==null?void 0:b.reduce((C,g)=>g,{}))??{};return{uid:S,quantity:A,status:h,requestQuantity:O,...G}});return{createdReturnAt:x,returnStatus:F,token:p==null?void 0:p.token,orderNumber:p==null?void 0:p.number,returnNumber:q,items:v,tracking:k}}),..._?{pageInfo:{pageSize:_.page_size,totalPages:_.total_pages,currentPage:_.current_page}}:{}};return d(l,(T=(t=(E=(a=L==null?void 0:L.getConfig())==null?void 0:a.models)==null?void 0:E.CustomerOrdersReturnModel)==null?void 0:t.transformer)==null?void 0:T.call(t,{...i,..._}))},Yn=(n,i)=>{var u,l;if(!((u=n==null?void 0:n.data)!=null&&u.guestOrder))return null;const _=(l=n==null?void 0:n.data)==null?void 0:l.guestOrder;return U(_,i)},qn=(n,i)=>{var u,l;if(!((u=n==null?void 0:n.data)!=null&&u.guestOrderByToken))return null;const _=(l=n==null?void 0:n.data)==null?void 0:l.guestOrderByToken;return U(_,i)},xn=`
   query ORDER_BY_NUMBER($orderNumber: String!, $pageSize: Int) {
     customer {
       orders(filter: { number: { eq: $orderNumber } }) {
@@ -104,15 +104,15 @@ import{merge as cn,Initializer as hn}from"@dropins/tools/lib.js";import{events a
       }
     }
   }
-  ${an}
+  ${_n}
+  ${un}
+  ${cn}
+  ${ln}
   ${sn}
+  ${an}
   ${pn}
   ${Rn}
-  ${tn}
-  ${En}
-  ${Tn}
-  ${yn}
-`,Bn=async({orderId:n,returnRef:i,queryType:_,returnsPageSize:u=50})=>await gn(Ln,{method:"GET",cache:"force-cache",variables:{orderNumber:n,pageSize:u}}).then(c=>vn(_??"orderData",c,i)).catch(ln),$n=`
+`,kn=async({orderId:n,returnRef:i,queryType:_,returnsPageSize:u=50})=>await tn(xn,{method:"GET",cache:"force-cache",variables:{orderNumber:n,pageSize:u}}).then(l=>Gn(_??"orderData",l,i)).catch(nn),vn=`
   query ORDER_BY_TOKEN($token: String!) {
     guestOrderByToken(input: { token: $token }) {
       email
@@ -201,12 +201,12 @@ import{merge as cn,Initializer as hn}from"@dropins/tools/lib.js";import{events a
       }
     }
   }
-  ${an}
+  ${_n}
+  ${un}
+  ${cn}
+  ${ln}
   ${sn}
+  ${an}
   ${pn}
   ${Rn}
-  ${tn}
-  ${En}
-  ${Tn}
-  ${yn}
-`,Un=async(n,i)=>await gn($n,{method:"GET",cache:"no-cache",variables:{token:n}}).then(_=>{var u;return(u=_.errors)!=null&&u.length&&_.errors[0].message==="Please login to view the order."?On(_.errors):Cn(_,i)}).catch(ln),wn="orderData",Pn=async n=>{var s;const i=typeof(n==null?void 0:n.orderRef)=="string"?n==null?void 0:n.orderRef:"",_=typeof(n==null?void 0:n.returnRef)=="string"?n==null?void 0:n.returnRef:"",u=i&&typeof(n==null?void 0:n.orderRef)=="string"&&((s=n==null?void 0:n.orderRef)==null?void 0:s.length)>20,c=(n==null?void 0:n.orderData)??null;if(c){L.emit("order/data",{...c,returnNumber:_});return}if(!i)return;const R=u?await Un(i,_):await Bn({orderId:i,returnRef:_,queryType:wn});R?L.emit("order/data",{...R,returnNumber:_}):L.emit("order/error",{source:"order",type:"network",error:"The data was not received."})},An=new hn({init:async n=>{const i={};An.config.setConfig({...i,...n}),n&&Object.keys(n).length!==0&&Pn(n).catch(console.error)},listeners:()=>[]}),k=An.config;export{$ as a,Vn as b,Un as c,k as d,Bn as g,An as i,kn as t};
+`,Cn=async(n,i)=>await tn(vn,{method:"GET",cache:"no-cache",variables:{token:n}}).then(_=>{var u;return(u=_.errors)!=null&&u.length&&_.errors[0].message==="Please login to view the order."?gn(_.errors):qn(_,i)}).catch(nn),Ln="orderData",Bn=async n=>{var a;const i=typeof(n==null?void 0:n.orderRef)=="string"?n==null?void 0:n.orderRef:"",_=typeof(n==null?void 0:n.returnRef)=="string"?n==null?void 0:n.returnRef:"",u=i&&typeof(n==null?void 0:n.orderRef)=="string"&&((a=n==null?void 0:n.orderRef)==null?void 0:a.length)>20,l=(n==null?void 0:n.orderData)??null;if(l){B.emit("order/data",{...l,returnNumber:_});return}if(!i)return;const R=u?await Cn(i,_):await kn({orderId:i,returnRef:_,queryType:Ln});R?B.emit("order/data",{...R,returnNumber:_}):B.emit("order/error",{source:"order",type:"network",error:"The data was not received."})},Tn=new yn({init:async n=>{const i={};Tn.config.setConfig({...i,...n}),n&&Object.keys(n).length!==0&&Bn(n).catch(console.error)},listeners:()=>[]}),L=Tn.config;export{U as a,Yn as b,Cn as c,L as d,kn as g,Tn as i,Fn as t};
diff --git a/scripts/__dropins__/storefront-order/data/transforms/transform-order-details.d.ts b/scripts/__dropins__/storefront-order/data/transforms/transform-order-details.d.ts
index 74cbc361f..b98fdd20b 100644
--- a/scripts/__dropins__/storefront-order/data/transforms/transform-order-details.d.ts
+++ b/scripts/__dropins__/storefront-order/data/transforms/transform-order-details.d.ts
@@ -13,6 +13,8 @@ export declare const transformLinks: (links: {
 } | null;
 export declare const transformOrderItems: (items: OrderItemProps[]) => OrderItemModel[];
 export declare const transformOrderData: (orderData: OrderProps, returnRef?: string) => {
+    subtotalExclTax: any;
+    subtotalInclTax: any;
     billingAddress: {
         city: any;
         company: any;
@@ -83,8 +85,6 @@ export declare const transformOrderData: (orderData: OrderProps, returnRef?: str
     }[];
     grandTotal: any;
     totalGiftcard: any;
-    subtotalExclTax: any;
-    subtotalInclTax: any;
     taxes: any;
     totalTax: any;
     totalShipping: any;
diff --git a/scripts/__dropins__/storefront-order/types/api/getOrderDetails.types.d.ts b/scripts/__dropins__/storefront-order/types/api/getOrderDetails.types.d.ts
index 50d39b212..76331be44 100644
--- a/scripts/__dropins__/storefront-order/types/api/getOrderDetails.types.d.ts
+++ b/scripts/__dropins__/storefront-order/types/api/getOrderDetails.types.d.ts
@@ -62,6 +62,8 @@ export interface DiscountProps {
     label: string;
 }
 export interface TotalProps {
+    subtotal_excl_tax?: MoneyProps;
+    subtotal_incl_tax?: MoneyProps;
     total_giftcard?: MoneyProps;
     grand_total?: GrandTotalProps;
     subtotal?: SubtotalProps;