@faststore/core 4.8.1-dev.0 → 4.8.1-dev.2

package/cms/faststore/my-account/components/cms_component__accountorderdelivery.jsonc

@@ -60,6 +60,86 @@
       "type": "string",
       "title": "Total Label",
       "default": "Total"
+    },
+    "deliveryChannelLabel": {
+      "type": "string",
+      "title": "Delivery Channel Label",
+      "default": "Delivery"
+    },
+    "pickupChannelLabel": {
+      "type": "string",
+      "title": "Pickup Channel Label",
+      "default": "Pickup"
+    },
+    "takeAwayChannelLabel": {
+      "type": "string",
+      "title": "Take Away Channel Label",
+      "default": "Take away"
+    },
+    "businessDaysZeroTemplate": {
+      "type": "string",
+      "title": "Business Days Zero Template",
+      "default": "Today"
+    },
+    "businessDaysOneTemplate": {
+      "type": "string",
+      "title": "Business Days One Template",
+      "default": "In 1 business day"
+    },
+    "businessDaysOtherTemplate": {
+      "type": "string",
+      "title": "Business Days Other Template",
+      "default": "Up to {count} business days"
+    },
+    "daysZeroTemplate": {
+      "type": "string",
+      "title": "Days Zero Template",
+      "default": "Today"
+    },
+    "daysOneTemplate": {
+      "type": "string",
+      "title": "Days One Template",
+      "default": "In 1 day"
+    },
+    "daysOtherTemplate": {
+      "type": "string",
+      "title": "Days Other Template",
+      "default": "Up to {count} days"
+    },
+    "hoursZeroTemplate": {
+      "type": "string",
+      "title": "Hours Zero Template",
+      "default": "Now"
+    },
+    "hoursOneTemplate": {
+      "type": "string",
+      "title": "Hours One Template",
+      "default": "In 1 hour"
+    },
+    "hoursOtherTemplate": {
+      "type": "string",
+      "title": "Hours Other Template",
+      "default": "Up to {count} hours"
+    },
+    "minutesZeroTemplate": {
+      "type": "string",
+      "title": "Minutes Zero Template",
+      "default": "Now"
+    },
+    "minutesOneTemplate": {
+      "type": "string",
+      "title": "Minutes One Template",
+      "default": "In 1 minute"
+    },
+    "minutesOtherTemplate": {
+      "type": "string",
+      "title": "Minutes Other Template",
+      "default": "Up to {count} minutes"
+    },
+    "toNeighborhoodTemplate": {
+      "type": "string",
+      "title": "To Neighborhood Template",
+      "default": "to {neighborhood}"
     }
   },
   "readOnly": false,

package/cms/faststore/my-account/components/cms_component__accountorderdetails.jsonc

@@ -70,6 +70,31 @@
       "type": "string",
       "title": "Reject Modal Confirm Text",
       "default": "Reject"
+    },
+    "approveSuccessToast": {
+      "type": "string",
+      "title": "Approve Success Toast",
+      "default": "{policy} policy approved successfully."
+    },
+    "approveErrorToast": {
+      "type": "string",
+      "title": "Approve Error Toast",
+      "default": "Policy couldn't be approved due to a technical issue."
+    },
+    "rejectSuccessToast": {
+      "type": "string",
+      "title": "Reject Success Toast",
+      "default": "{policy} policy rejected successfully. Order denied."
+    },
+    "rejectErrorToast": {
+      "type": "string",
+      "title": "Reject Error Toast",
+      "default": "Policy couldn't be rejected due to a technical issue."
+    },
+    "pendingFurtherApprovalsAlert": {
+      "type": "string",
+      "title": "Pending Further Approvals Alert",
+      "default": "Your approval is recorded. This order is still pending further approvals."
     }
   },
   "readOnly": false,

package/cms/faststore/my-account/components/cms_component__accountorderslist.jsonc

@@ -61,6 +61,16 @@
       "title": "Pending Approval Label",
       "default": "Pending my approval"
     },
+    "statusFilterLabel": {
+      "type": "string",
+      "title": "Status Filter Label",
+      "default": "Status"
+    },
+    "orderDateFilterLabel": {
+      "type": "string",
+      "title": "Order Date Filter Label",
+      "default": "Order Date"
+    },
     "paginationOfLabel": {
       "type": "string",
       "title": "Pagination Of Label",

package/cms/faststore/my-account/components/cms_component__accountorderstatus.jsonc

@@ -16,16 +16,56 @@
       "title": "Order Placed Step",
       "default": "Order placed"
     },
+    "approvedStep": {
+      "type": "string",
+      "title": "Approved Step",
+      "default": "Approved"
+    },
+    "pendingApprovalStep": {
+      "type": "string",
+      "title": "Pending Approval Step",
+      "default": "Pending approval"
+    },
+    "deniedStep": {
+      "type": "string",
+      "title": "Denied Step",
+      "default": "Denied"
+    },
+    "paymentApprovedStep": {
+      "type": "string",
+      "title": "Payment Approved Step",
+      "default": "Payment Approved"
+    },
     "paymentPendingStep": {
       "type": "string",
       "title": "Payment Pending Step",
       "default": "Payment Pending"
     },
+    "paymentAuthorizationStep": {
+      "type": "string",
+      "title": "Payment Authorization Step",
+      "default": "Payment authorization"
+    },
+    "paymentDeniedStep": {
+      "type": "string",
+      "title": "Payment Denied Step",
+      "default": "Payment Denied"
+    },
+    "readyForDeliveryStep": {
+      "type": "string",
+      "title": "Ready For Delivery Step",
+      "default": "Ready for Delivery"
+    },
     "handlingStep": {
       "type": "string",
       "title": "Handling Step",
       "default": "Handling order"
     },
+    "canceledStep": {
+      "type": "string",
+      "title": "Canceled Step",
+      "default": "Canceled"
+    },
     "invoicedStep": {
       "type": "string",
       "title": "Invoiced Step",
@@ -35,6 +75,56 @@
       "type": "string",
       "title": "Delivered Step",
       "default": "Delivered"
+    },
+    "shipOrderStep": {
+      "type": "string",
+      "title": "Ship Order Step",
+      "default": "Ship order"
+    },
+    "orderPlacedStatus": {
+      "type": "string",
+      "title": "Order Placed Status",
+      "default": "Order Placed"
+    },
+    "pendingApprovalStatus": {
+      "type": "string",
+      "title": "Pending Approval Status",
+      "default": "Pending approval"
+    },
+    "paymentPendingStatus": {
+      "type": "string",
+      "title": "Payment Pending Status",
+      "default": "Payment Pending"
+    },
+    "paymentApprovedStatus": {
+      "type": "string",
+      "title": "Payment Approved Status",
+      "default": "Payment Approved"
+    },
+    "paymentDeniedStatus": {
+      "type": "string",
+      "title": "Payment Denied Status",
+      "default": "Payment Denied"
+    },
+    "readyForDeliveryStatus": {
+      "type": "string",
+      "title": "Ready For Delivery Status",
+      "default": "Ready for Delivery"
+    },
+    "invoicedStatus": {
+      "type": "string",
+      "title": "Invoiced Status",
+      "default": "Invoiced"
+    },
+    "cancellationRequestedStatus": {
+      "type": "string",
+      "title": "Cancellation Requested Status",
+      "default": "Cancellation Requested"
+    },
+    "canceledStatus": {
+      "type": "string",
+      "title": "Canceled Status",
+      "default": "Canceled"
     }
   },
   "readOnly": false,

package/cms/faststore/my-account/components/cms_component__accountordersummary.jsonc

@@ -20,6 +20,31 @@
       "type": "string",
       "title": "Interest Label",
       "default": "Interest"
+    },
+    "itemsTotalLabel": {
+      "type": "string",
+      "title": "Items Total Label",
+      "default": "Items Total"
+    },
+    "discountsTotalLabel": {
+      "type": "string",
+      "title": "Discounts Total Label",
+      "default": "Discounts Total"
+    },
+    "shippingTotalLabel": {
+      "type": "string",
+      "title": "Shipping Total Label",
+      "default": "Shipping Total"
+    },
+    "taxTotalLabel": {
+      "type": "string",
+      "title": "Tax Total Label",
+      "default": "Tax Total"
+    },
+    "changeTotalLabel": {
+      "type": "string",
+      "title": "Change Total Label",
+      "default": "Change Total"
     }
   },
   "readOnly": false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faststore/core",
-  "version": "4.8.1-dev.0",
+  "version": "4.8.1-dev.2",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -71,11 +71,11 @@
     "style-loader": "^3.3.1",
     "swr": "^2.2.5",
     "use-sync-external-store": "^1.6.0",
-    "@faststore/api": "4.8.1-dev.0",
-    "@faststore/sdk": "4.8.1-dev.0",
-    "@faststore/ui": "4.8.1-dev.0",
-    "@faststore/lighthouse": "4.8.1-dev.0",
-    "@faststore/diagnostics": "4.8.1-dev.0"
+    "@faststore/api": "4.8.1-dev.2",
+    "@faststore/diagnostics": "4.8.1-dev.2",
+    "@faststore/sdk": "4.8.1-dev.2",
+    "@faststore/lighthouse": "4.8.1-dev.2",
+    "@faststore/ui": "4.8.1-dev.2"
   },
   "devDependencies": {
     "@cypress/code-coverage": "^3.12.1",

package/src/components/account/Drawer/OrganizationDrawer/ContractSwitcher/ContractSwitcher.tsx

@@ -12,16 +12,12 @@ export type ContractSwitcherProps = {
   onClose: () => void
 }
 
-/**
- * Contract that can be displayed by the switcher. `isDefault` is optional so the
- * component compiles against both the local mock and the real
- * `useAvailableContracts` hook (which does not expose a default yet).
- */
+/** Contract that can be displayed by the switcher. */
 type SwitcherContract = {
   id: string
   corporateName: string
   isActive: boolean
-  isDefault?: boolean
+  isDefault: boolean
 }
 
 const initialOf = (name: string) => name.trim().charAt(0).toUpperCase()
@@ -73,6 +69,7 @@ const ContractSwitcherCurrentSession = ({
             name="Star"
             width={20}
             height={20}
+            aria-label="Default contract"
           />
         )}
       </div>
@@ -159,6 +156,7 @@ const ContractSwitcherOptionList = ({
                 name="Star"
                 width={20}
                 height={20}
+                aria-label="Default contract"
               />
             )}
           </button>

package/src/components/account/Drawer/OrganizationDrawer/OrganizationDrawer.tsx

@@ -2,6 +2,7 @@ import { SlideOver, useFadeEffect } from '@faststore/ui'
 import { useEffect, useState } from 'react'
 
 import { getStoreURL } from 'src/sdk/localization/useLocalizationConfig'
+import { useAvailableContracts } from 'src/sdk/account/useAvailableContracts'
 import { useSession } from 'src/sdk/session'
 import {
   expireCookieClient,
@@ -23,6 +24,8 @@ type OrganizationDrawerProps = {
   isOpen: boolean
   closeDrawer: () => void
   isRepresentative: boolean
+  /** Open straight into the contract switcher (My Account "Switch" button). */
+  initialView?: OrganizationDrawerView
 }
 
 const clearBrowserStorageForCurrentDomain = async () => {
@@ -140,16 +143,17 @@ export const OrganizationDrawer = ({
   isOpen,
   closeDrawer,
   isRepresentative,
+  initialView = 'menu',
 }: OrganizationDrawerProps) => {
   const { fade, fadeOut } = useFadeEffect()
   const { b2b, person } = useSession()
-  const [view, setView] = useState<OrganizationDrawerView>('menu')
+  const [view, setView] = useState<OrganizationDrawerView>(initialView)
 
   useEffect(() => {
     if (!isOpen) {
-      setView('menu')
+      setView(initialView)
     }
-  }, [isOpen])
+  }, [isOpen, initialView])
 
   const contractName =
     b2b?.contractName?.trim() ||
@@ -168,6 +172,16 @@ export const OrganizationDrawer = ({
   const canSwitchContract = Boolean(b2b?.unitId)
   const isOrgMember = Boolean(b2b?.unitId)
 
+  // Only fetch the contract list while the drawer is open for an org member,
+  // so nothing is requested on initial page render (TTFB budget).
+  const { contracts } = useAvailableContracts(isOpen && canSwitchContract)
+  const activeContractId = b2b?.customerId?.trim() ?? ''
+  const activeContract =
+    (activeContractId
+      ? contracts.find((contract) => contract.id === activeContractId)
+      : undefined) ?? contracts.find((contract) => contract.isActive)
+  const isActiveContractDefault = Boolean(activeContract?.isDefault)
+
   return (
     <SlideOver
       data-fs-organization-drawer
@@ -190,6 +204,7 @@ export const OrganizationDrawer = ({
               onCloseDrawer={closeDrawer}
               contractName={contractName}
               contractUrl={contractUrl}
+              isDefault={isActiveContractDefault}
               onChangeContract={
                 canSwitchContract ? () => setView('switch') : undefined
               }

package/src/components/account/Drawer/OrganizationDrawer/OrganizationDrawerFooter.tsx

@@ -1,4 +1,5 @@
 import { Icon, IconButton, Link } from '@faststore/ui'
+import { useAccountNavigationLabels } from 'src/sdk/account/accountPageContext'
 
 export interface OrganizationDrawerFooterProps {
   orgName: string
@@ -6,6 +7,8 @@ export interface OrganizationDrawerFooterProps {
   userEmail?: string
   showManageLink?: boolean
   manageUrl?: string
+  manageLabel?: string
+  logoutLabel?: string
   onLogoutClick?: () => void
 }
 
@@ -15,8 +18,16 @@ export const OrganizationDrawerFooter = ({
   userEmail,
   showManageLink,
   manageUrl,
+  manageLabel: manageLabelProp,
+  logoutLabel: logoutLabelProp,
   onLogoutClick,
 }: OrganizationDrawerFooterProps) => {
+  const navigationLabels = useAccountNavigationLabels()
+  const manageLabel =
+    manageLabelProp ?? navigationLabels?.manageLabel ?? 'Manage'
+  const logoutLabel =
+    logoutLabelProp ?? navigationLabels?.logoutLabel ?? 'Logout'
+
   return (
     <div data-fs-organization-drawer-footer>
       <div data-fs-organization-drawer-footer-org>
@@ -31,7 +42,7 @@ export const OrganizationDrawerFooter = ({
         </div>
         {showManageLink && manageUrl && (
           <Link href={manageUrl} data-fs-organization-drawer-footer-manage>
-            Manage
+            {manageLabel}
           </Link>
         )}
       </div>
@@ -45,7 +56,7 @@ export const OrganizationDrawerFooter = ({
         </div>
         <IconButton
           data-fs-organization-drawer-footer-logout
-          aria-label="Log out"
+          aria-label={logoutLabel}
           icon={<Icon name="SignOut" width={20} height={20} />}
           onClick={onLogoutClick}
         />

package/src/components/account/Drawer/OrganizationDrawer/OrganizationDrawerHeader.tsx

@@ -59,6 +59,7 @@ export const OrganizationDrawerHeader = ({
                   name="Star"
                   width={20}
                   height={20}
+                  aria-label="Default contract"
                 />
               )}
               {onChangeContract && (

package/src/components/account/Drawer/OrganizationDrawer/section.module.scss

@@ -128,6 +128,10 @@
       [data-fs-organization-drawer-header-default] {
         flex-shrink: 0;
         color: var(--fs-color-link);
+
+        // The Star symbol only declares stroke="currentColor", so without this
+        // the fill falls back to the SVG default (black).
+        fill: currentColor;
       }
 
       [data-fs-organization-drawer-header-change] {
@@ -331,6 +335,9 @@
         [data-fs-contract-switcher-default] {
           flex-shrink: 0;
           color: var(--fs-color-link);
+
+          // See the drawer header star: the symbol carries no fill of its own.
+          fill: currentColor;
         }
 
         // Footer: Cancel / Confirm

package/src/components/account/Drawer/OrganizationSignInButton/OrganizationSignInButton.tsx

@@ -13,21 +13,19 @@ export const OrganizationSignInButton = ({
 }) => {
   const [isOpen, setIsOpen] = useState(false)
 
-  const { person } = useSession()
+  const { person, b2b } = useSession()
   const navigationLabels = useAccountNavigationLabels()
   const companyLabel = navigationLabels?.companyLabel ?? 'Company'
   const contractLabel = navigationLabels?.contractLabel ?? 'Contract'
+  const activeContractName = b2b?.contractName?.trim()
+  const label =
+    activeContractName || (person?.id ? companyLabel : contractLabel)
 
   const openDrawer = (
     event: MouseEvent<HTMLAnchorElement> | MouseEvent<HTMLButtonElement>
   ) => {
-    // if (session.person) {
-    // biome-ignore lint/correctness/noConstantCondition: <explanation>
-    if (true) {
-      event.preventDefault()
-
-      setIsOpen(true)
-    }
+    event.preventDefault()
+    setIsOpen(true)
   }
 
   const closeDrawer = () => {
@@ -45,7 +43,7 @@ export const OrganizationSignInButton = ({
         icon={<Icon name={icon} width={18} height={18} weight="bold" />}
         iconPosition="left"
       >
-        {person?.id ? companyLabel : contractLabel}
+        {label}
       </Button>
 
       {isOpen && (

package/src/components/account/Menu/Menu.tsx

@@ -1,10 +1,13 @@
 import { Button } from '@faststore/ui'
 import { useRouter } from 'next/router'
+import { useState } from 'react'
 
 import Link from 'src/components/ui/Link'
 import styles from '../section.module.scss'
 
+import { OrganizationDrawer } from '../Drawer/OrganizationDrawer/OrganizationDrawer'
 import { useAccountNavigationLabels } from 'src/sdk/account/accountPageContext'
+import { useSession } from 'src/sdk/session'
 import useScreenResize from 'src/sdk/ui/useScreenResize'
 
 interface NavItem {
@@ -43,6 +46,9 @@ const Menu = ({ avatarImageUrl, accountName, items }: MenuProps) => {
   const { isDesktop } = useScreenResize()
   const navigationLabels = useAccountNavigationLabels()
   const switchLabel = navigationLabels?.switchLabel ?? 'Switch'
+  const { b2b } = useSession()
+  const [isSwitcherOpen, setIsSwitcherOpen] = useState(false)
+  const canSwitchContract = Boolean(b2b?.unitId)
 
   return (
     <div className={styles.menu}>
@@ -56,16 +62,27 @@ const Menu = ({ avatarImageUrl, accountName, items }: MenuProps) => {
             )}
             <h2>{accountName}</h2>
           </div>
-          <Button
-            className={styles.switchButton}
-            variant="secondary"
-            size="small"
-          >
-            {switchLabel}
-          </Button>
+          {canSwitchContract && (
+            <Button
+              className={styles.switchButton}
+              variant="secondary"
+              size="small"
+              onClick={() => setIsSwitcherOpen(true)}
+            >
+              {switchLabel}
+            </Button>
+          )}
         </div>
       ) : null}
       <Nav items={items} />
+      {isSwitcherOpen && (
+        <OrganizationDrawer
+          isOpen
+          closeDrawer={() => setIsSwitcherOpen(false)}
+          isRepresentative={Boolean(b2b?.isRepresentative)}
+          initialView="switch"
+        />
+      )}
     </div>
   )
 }

package/src/components/account/orders/ListOrders/FilterSlider/FilterFacetPendingApproval/FilterFacetPendingApproval.tsx

@@ -3,6 +3,10 @@ import { useMemo } from 'react'
 import type { SelectedFacet } from 'src/sdk/search/useMyAccountFilter'
 
 export interface FilterFacetPendingApprovalProps {
+  /**
+   * Localized label shown next to the toggle.
+   */
+  label: string
   /**
    * Current selected facets from filter context
    */
@@ -14,9 +18,10 @@ export interface FilterFacetPendingApprovalProps {
 }
 
 function FilterFacetPendingApproval({
+  label,
   selected,
   dispatch,
-}: FilterFacetPendingApprovalProps) {
+}: Readonly<FilterFacetPendingApprovalProps>) {
   const isSelected = useMemo(
     () =>
       selected.some((f) => f.key === 'pendingMyApproval' && f.value === 'true'),
@@ -52,9 +57,9 @@ function FilterFacetPendingApproval({
         testId="pending-approval-toggle"
         checked={isSelected}
         onChange={handleToggleChange}
-        aria-label="Filter orders pending approval"
+        aria-label={label}
       />
-      <label htmlFor="pending-approval-toggle">Pending my approval</label>
+      <label htmlFor="pending-approval-toggle">{label}</label>
     </div>
   )
 }

package/src/components/account/orders/ListOrders/FilterSlider/FilterSlider.tsx

@@ -220,6 +220,7 @@ function FilterSlider({
               )}
               {type === 'StoreFacetPendingApproval' && isExpanded && (
                 <FilterFacetPendingApproval
+                  label={label}
                   selected={selected}
                   dispatch={dispatch}
                 />

package/src/components/account/orders/ListOrders/ListOrders.tsx

@@ -111,7 +111,7 @@ function getAllFacets({
     {
       __typename: 'StoreFacetBoolean',
       key: 'status',
-      label: 'Status',
+      label: labels.statusFilterLabel,
       values: FastStoreOrderStatus.map((status, index) => ({
         label: statusFacetLabels[index] ?? status,
         quantity: 0,
@@ -122,7 +122,7 @@ function getAllFacets({
     {
       __typename: 'StoreFacetRange',
       key: 'dateRange',
-      label: 'Order Date',
+      label: labels.orderDateFilterLabel,
       from: filters.dateInitial,
       to: filters.dateFinal,
     },

package/src/components/account/orders/ListOrders/listOrdersLabels.ts

@@ -13,6 +13,8 @@ export type ListOrdersSectionLabels = {
   placedOnLabel?: string
   deliveryByLabel?: string
   pendingApprovalLabel?: string
+  statusFilterLabel?: string
+  orderDateFilterLabel?: string
   paginationOfLabel?: string
   previousPageLabel?: string
   nextPageLabel?: string
@@ -44,6 +46,8 @@ export const defaultListOrdersLabels: Required<ListOrdersSectionLabels> = {
   placedOnLabel: 'Placed on',
   deliveryByLabel: 'Delivery by',
   pendingApprovalLabel: 'Pending my approval',
+  statusFilterLabel: 'Status',
+  orderDateFilterLabel: 'Order Date',
   paginationOfLabel: 'of',
   previousPageLabel: 'Previous Page',
   nextPageLabel: 'Next Page',