Allow changing useLegacyShippingZoneStockAvailability shop settings (#6536)

IKarbowiak · lkostrowski · web-flow · commit 15eced3c88dd · 2026-04-27T13:51:06.000Z
Co-authored-by: Lukasz Ostrowski &lt;lukasz.ostrowski@saleor.io&gt;
diff --git a/.changeset/quick-items-change.md b/.changeset/quick-items-change.md
@@ -0,0 +1,6 @@
+---
+"saleor-dashboard": patch
+---
+
+Added a "Stock availability" toggle in Site Settings to control `useLegacyShippingZoneStockAvailability`.
+
diff --git a/locale/defaultMessages.json b/locale/defaultMessages.json
@@ -1472,6 +1472,10 @@
   "6Y1YDn": {
     "string": "Updated extension permissions"
   },
+  "6ZnMfQ": {
+    "context": "card header and checkbox label",
+    "string": "Use legacy shipping zone stock availability"
+  },
   "6ZubLQ": {
     "string": "Manage available refunds reasons"
   },
@@ -9710,6 +9714,10 @@
     "context": "order history message",
     "string": "Invoice was sent to customer by {sentBy}"
   },
+  "qeAmFa": {
+    "context": "section description",
+    "string": "When enabled, stock availability is filtered by shipping zones and the destination address (legacy behavior). When disabled, it is determined only by the direct warehouse-channel link. <a>Learn more</a>."
+  },
   "qf8OtW": {
     "string": "Continue with Saleor Cloud"
   },
@@ -10496,6 +10504,10 @@
   "v3WWK+": {
     "string": "Status is invalid"
   },
+  "v5yLSE": {
+    "context": "section title",
+    "string": "Stock availability"
+  },
   "v8UngX": {
     "string": "Search warehouses..."
   },
@@ -10872,6 +10884,10 @@
     "context": "dialog header",
     "string": "Cancel order #{orderNumber}"
   },
+  "wmybDi": {
+    "context": "intro to webhook list",
+    "string": "When disabled, the following channel-scoped stock webhooks become available:"
+  },
   "wn3di2": {
     "string": "This password is too commonly used"
   },
diff --git a/src/fragments/shop.ts b/src/fragments/shop.ts
@@ -57,6 +57,7 @@ export const shopFragment = gql`
     limitQuantityPerCheckout
     enableAccountConfirmationByEmail
     useLegacyUpdateWebhookEmission
+    useLegacyShippingZoneStockAvailability
     preserveAllAddressFields
     passwordLoginMode
   }
diff --git a/src/graphql/hooks.generated.ts b/src/graphql/hooks.generated.ts
@@ -3407,6 +3407,7 @@ export const ShopFragmentDoc = gql`
   limitQuantityPerCheckout
   enableAccountConfirmationByEmail
   useLegacyUpdateWebhookEmission
+  useLegacyShippingZoneStockAvailability
   preserveAllAddressFields
   passwordLoginMode
 }
diff --git a/src/graphql/types.generated.ts b/src/graphql/types.generated.ts
@@ -11789,7 +11789,7 @@ export type LimitInfoFragment = { __typename: 'Limits', channels?: number | null
 
 export type ShopLimitFragment = { __typename: 'Shop', limits: { __typename: 'LimitInfo', currentUsage: { __typename: 'Limits', channels?: number | null, orders?: number | null, productVariants?: number | null, staffUsers?: number | null, warehouses?: number | null }, allowedUsage: { __typename: 'Limits', channels?: number | null, orders?: number | null, productVariants?: number | null, staffUsers?: number | null, warehouses?: number | null } } };
 
-export type ShopFragment = { __typename: 'Shop', customerSetPasswordUrl: string | null, defaultMailSenderAddress: string | null, defaultMailSenderName: string | null, description: string | null, name: string, reserveStockDurationAnonymousUser: number | null, reserveStockDurationAuthenticatedUser: number | null, limitQuantityPerCheckout: number | null, enableAccountConfirmationByEmail: boolean | null, useLegacyUpdateWebhookEmission: boolean | null, preserveAllAddressFields: boolean, passwordLoginMode: PasswordLoginModeEnum, companyAddress: { __typename: 'Address', city: string, cityArea: string, companyName: string, countryArea: string, firstName: string, id: string, lastName: string, phone: string | null, postalCode: string, streetAddress1: string, streetAddress2: string, country: { __typename: 'CountryDisplay', code: string, country: string } } | null, countries: Array<{ __typename: 'CountryDisplay', code: string, country: string }>, domain: { __typename: 'Domain', host: string } };
+export type ShopFragment = { __typename: 'Shop', customerSetPasswordUrl: string | null, defaultMailSenderAddress: string | null, defaultMailSenderName: string | null, description: string | null, name: string, reserveStockDurationAnonymousUser: number | null, reserveStockDurationAuthenticatedUser: number | null, limitQuantityPerCheckout: number | null, enableAccountConfirmationByEmail: boolean | null, useLegacyUpdateWebhookEmission: boolean | null, useLegacyShippingZoneStockAvailability: boolean, preserveAllAddressFields: boolean, passwordLoginMode: PasswordLoginModeEnum, companyAddress: { __typename: 'Address', city: string, cityArea: string, companyName: string, countryArea: string, firstName: string, id: string, lastName: string, phone: string | null, postalCode: string, streetAddress1: string, streetAddress2: string, country: { __typename: 'CountryDisplay', code: string, country: string } } | null, countries: Array<{ __typename: 'CountryDisplay', code: string, country: string }>, domain: { __typename: 'Domain', host: string } };
 
 export type StaffMemberFragment = { __typename: 'User', id: string, email: string, firstName: string, isActive: boolean, lastName: string };
 
@@ -13432,7 +13432,7 @@ export type ShopSettingsUpdateMutationVariables = Exact<{
 }>;
 
 
-export type ShopSettingsUpdateMutation = { __typename: 'Mutation', shopSettingsUpdate: { __typename: 'ShopSettingsUpdate', errors: Array<{ __typename: 'ShopError', code: ShopErrorCode, field: string | null, message: string | null }>, shop: { __typename: 'Shop', customerSetPasswordUrl: string | null, defaultMailSenderAddress: string | null, defaultMailSenderName: string | null, description: string | null, name: string, reserveStockDurationAnonymousUser: number | null, reserveStockDurationAuthenticatedUser: number | null, limitQuantityPerCheckout: number | null, enableAccountConfirmationByEmail: boolean | null, useLegacyUpdateWebhookEmission: boolean | null, preserveAllAddressFields: boolean, passwordLoginMode: PasswordLoginModeEnum, companyAddress: { __typename: 'Address', city: string, cityArea: string, companyName: string, countryArea: string, firstName: string, id: string, lastName: string, phone: string | null, postalCode: string, streetAddress1: string, streetAddress2: string, country: { __typename: 'CountryDisplay', code: string, country: string } } | null, countries: Array<{ __typename: 'CountryDisplay', code: string, country: string }>, domain: { __typename: 'Domain', host: string } } | null } | null, shopAddressUpdate: { __typename: 'ShopAddressUpdate', errors: Array<{ __typename: 'ShopError', code: ShopErrorCode, field: string | null, message: string | null }>, shop: { __typename: 'Shop', companyAddress: { __typename: 'Address', city: string, cityArea: string, companyName: string, countryArea: string, firstName: string, id: string, lastName: string, phone: string | null, postalCode: string, streetAddress1: string, streetAddress2: string, country: { __typename: 'CountryDisplay', code: string, country: string } } | null } | null } | null };
+export type ShopSettingsUpdateMutation = { __typename: 'Mutation', shopSettingsUpdate: { __typename: 'ShopSettingsUpdate', errors: Array<{ __typename: 'ShopError', code: ShopErrorCode, field: string | null, message: string | null }>, shop: { __typename: 'Shop', customerSetPasswordUrl: string | null, defaultMailSenderAddress: string | null, defaultMailSenderName: string | null, description: string | null, name: string, reserveStockDurationAnonymousUser: number | null, reserveStockDurationAuthenticatedUser: number | null, limitQuantityPerCheckout: number | null, enableAccountConfirmationByEmail: boolean | null, useLegacyUpdateWebhookEmission: boolean | null, useLegacyShippingZoneStockAvailability: boolean, preserveAllAddressFields: boolean, passwordLoginMode: PasswordLoginModeEnum, companyAddress: { __typename: 'Address', city: string, cityArea: string, companyName: string, countryArea: string, firstName: string, id: string, lastName: string, phone: string | null, postalCode: string, streetAddress1: string, streetAddress2: string, country: { __typename: 'CountryDisplay', code: string, country: string } } | null, countries: Array<{ __typename: 'CountryDisplay', code: string, country: string }>, domain: { __typename: 'Domain', host: string } } | null } | null, shopAddressUpdate: { __typename: 'ShopAddressUpdate', errors: Array<{ __typename: 'ShopError', code: ShopErrorCode, field: string | null, message: string | null }>, shop: { __typename: 'Shop', companyAddress: { __typename: 'Address', city: string, cityArea: string, companyName: string, countryArea: string, firstName: string, id: string, lastName: string, phone: string | null, postalCode: string, streetAddress1: string, streetAddress2: string, country: { __typename: 'CountryDisplay', code: string, country: string } } | null } | null } | null };
 
 export type RefundSettingsUpdateMutationVariables = Exact<{
   refundSettingsInput: RefundSettingsUpdateInput;
@@ -13449,7 +13449,7 @@ export type RefundReasonReferenceClearMutation = { __typename: 'Mutation', refun
 export type SiteSettingsQueryVariables = Exact<{ [key: string]: never; }>;
 
 
-export type SiteSettingsQuery = { __typename: 'Query', shop: { __typename: 'Shop', customerSetPasswordUrl: string | null, defaultMailSenderAddress: string | null, defaultMailSenderName: string | null, description: string | null, name: string, reserveStockDurationAnonymousUser: number | null, reserveStockDurationAuthenticatedUser: number | null, limitQuantityPerCheckout: number | null, enableAccountConfirmationByEmail: boolean | null, useLegacyUpdateWebhookEmission: boolean | null, preserveAllAddressFields: boolean, passwordLoginMode: PasswordLoginModeEnum, companyAddress: { __typename: 'Address', city: string, cityArea: string, companyName: string, countryArea: string, firstName: string, id: string, lastName: string, phone: string | null, postalCode: string, streetAddress1: string, streetAddress2: string, country: { __typename: 'CountryDisplay', code: string, country: string } } | null, countries: Array<{ __typename: 'CountryDisplay', code: string, country: string }>, domain: { __typename: 'Domain', host: string } } };
+export type SiteSettingsQuery = { __typename: 'Query', shop: { __typename: 'Shop', customerSetPasswordUrl: string | null, defaultMailSenderAddress: string | null, defaultMailSenderName: string | null, description: string | null, name: string, reserveStockDurationAnonymousUser: number | null, reserveStockDurationAuthenticatedUser: number | null, limitQuantityPerCheckout: number | null, enableAccountConfirmationByEmail: boolean | null, useLegacyUpdateWebhookEmission: boolean | null, useLegacyShippingZoneStockAvailability: boolean, preserveAllAddressFields: boolean, passwordLoginMode: PasswordLoginModeEnum, companyAddress: { __typename: 'Address', city: string, cityArea: string, companyName: string, countryArea: string, firstName: string, id: string, lastName: string, phone: string | null, postalCode: string, streetAddress1: string, streetAddress2: string, country: { __typename: 'CountryDisplay', code: string, country: string } } | null, countries: Array<{ __typename: 'CountryDisplay', code: string, country: string }>, domain: { __typename: 'Domain', host: string } } };
 
 export type StaffMemberAddMutationVariables = Exact<{
   input: StaffCreateInput;
diff --git a/src/siteSettings/components/SiteSettingsPage/SiteSettingsPage.tsx b/src/siteSettings/components/SiteSettingsPage/SiteSettingsPage.tsx
@@ -6,13 +6,16 @@ import CompanyAddressInput from "@dashboard/components/CompanyAddressInput";
 import { type ConfirmButtonTransitionState } from "@dashboard/components/ConfirmButton";
 import Form from "@dashboard/components/Form";
 import { DetailPageLayout } from "@dashboard/components/Layouts";
+import { Link } from "@dashboard/components/Link";
 import PageSectionHeader from "@dashboard/components/PageSectionHeader";
 import { Savebar } from "@dashboard/components/Savebar";
+import VerticalSpacer from "@dashboard/components/VerticalSpacer";
 import { configurationMenuUrl } from "@dashboard/configuration/urls";
 import {
   type PasswordLoginModeEnum,
   type ShopErrorFragment,
   type SiteSettingsQuery,
+  WebhookEventTypeAsyncEnum,
 } from "@dashboard/graphql";
 import useAddressValidation from "@dashboard/hooks/useAddressValidation";
 import { type SubmitPromise } from "@dashboard/hooks/useForm";
@@ -22,12 +25,22 @@ import { commonMessages } from "@dashboard/intl";
 import createSingleAutocompleteSelectHandler from "@dashboard/utils/handlers/singleAutocompleteSelectChangeHandler";
 import { mapCountriesToChoices } from "@dashboard/utils/maps";
 import { Box, Checkbox, Divider, Text } from "@saleor/macaw-ui-next";
-import { useIntl } from "react-intl";
+import { FormattedMessage, useIntl } from "react-intl";
 
 import SiteCheckoutSettingsCard from "../SiteCheckoutSettingsCard";
 import { SitePasswordLoginCard } from "../SitePasswordLoginCard/SitePasswordLoginCard";
 import { messages } from "./messages";
 
+const stockAvailabilityWebhooks = [
+  WebhookEventTypeAsyncEnum.PRODUCT_VARIANT_OUT_OF_STOCK_IN_CHANNEL,
+  WebhookEventTypeAsyncEnum.PRODUCT_VARIANT_BACK_IN_STOCK_IN_CHANNEL,
+  WebhookEventTypeAsyncEnum.PRODUCT_VARIANT_OUT_OF_STOCK_FOR_CLICK_AND_COLLECT,
+  WebhookEventTypeAsyncEnum.PRODUCT_VARIANT_BACK_IN_STOCK_FOR_CLICK_AND_COLLECT,
+];
+
+const stockAvailabilityDocsUrl =
+  "https://docs.saleor.io/developer/stock/overview#legacy-stock-availability";
+
 interface SiteSettingsPageAddressFormData {
   city: string;
   companyName: string;
@@ -46,6 +59,7 @@ export interface SiteSettingsPageFormData extends SiteSettingsPageAddressFormDat
   limitQuantityPerCheckout: number;
   emailConfirmation: boolean;
   useLegacyUpdateWebhookEmission: boolean;
+  useLegacyShippingZoneStockAvailability: boolean;
   preserveAllAddressFields: boolean;
   passwordLoginMode: PasswordLoginModeEnum;
 }
@@ -101,6 +115,7 @@ const SiteSettingsPage = (props: SiteSettingsPageProps) => {
     limitQuantityPerCheckout: shop?.limitQuantityPerCheckout ?? 0,
     emailConfirmation: shop?.enableAccountConfirmationByEmail ?? false,
     useLegacyUpdateWebhookEmission: shop?.useLegacyUpdateWebhookEmission ?? true,
+    useLegacyShippingZoneStockAvailability: shop?.useLegacyShippingZoneStockAvailability ?? true,
     preserveAllAddressFields: shop?.preserveAllAddressFields ?? false,
     passwordLoginMode: shop?.passwordLoginMode,
   };
@@ -133,6 +148,9 @@ const SiteSettingsPage = (props: SiteSettingsPageProps) => {
         const handlePreserveAddressFieldsChange = isEnabled => {
           change({ target: { name: "preserveAllAddressFields", value: isEnabled } });
         };
+        const handleLegacyStockAvailabilityChange = isEnabled => {
+          change({ target: { name: "useLegacyShippingZoneStockAvailability", value: isEnabled } });
+        };
 
         return (
           <DetailPageLayout gridTemplateColumns={1}>
@@ -251,6 +269,62 @@ const SiteSettingsPage = (props: SiteSettingsPageProps) => {
                   </DashboardCard>
                 </Box>
                 <Divider />
+                <Box
+                  display="grid"
+                  __gridTemplateColumns="1fr 3fr"
+                  paddingLeft={6}
+                  paddingBottom={8}
+                >
+                  <Box paddingTop={6}>
+                    <Text size={3} fontWeight="bold" lineHeight={2}>
+                      {intl.formatMessage(messages.sectionStockAvailabilityTitle)}
+                    </Text>
+                    <VerticalSpacer />
+                    <Text size={3} fontWeight="regular">
+                      <FormattedMessage
+                        {...messages.sectionStockAvailabilityDescription}
+                        values={{
+                          a: chunks => (
+                            <Link href={stockAvailabilityDocsUrl} target="_blank">
+                              {chunks}
+                            </Link>
+                          ),
+                        }}
+                      />
+                    </Text>
+                  </Box>
+                  <DashboardCard>
+                    <DashboardCard.Header>
+                      <DashboardCard.Title>
+                        {intl.formatMessage(messages.sectionStockAvailabilityHeader)}
+                      </DashboardCard.Title>
+                    </DashboardCard.Header>
+                    <DashboardCard.Content>
+                      <Box display="flex" flexDirection="column" gap={3}>
+                        <Checkbox
+                          data-test-id="legacy-shipping-zone-stock-availability-checkbox"
+                          checked={data.useLegacyShippingZoneStockAvailability}
+                          onCheckedChange={handleLegacyStockAvailabilityChange}
+                        >
+                          <Text>{intl.formatMessage(messages.sectionStockAvailabilityHeader)}</Text>
+                        </Checkbox>
+                        <Box display="flex" flexDirection="column" gap={1}>
+                          <Text size={2} color="default2">
+                            {intl.formatMessage(messages.sectionStockAvailabilityWebhooksIntro)}
+                          </Text>
+                          <Box as="ul" margin={0} paddingLeft={5}>
+                            {stockAvailabilityWebhooks.map(name => (
+                              <Box as="li" key={name}>
+                                <Text size={2}>{name}</Text>
+                              </Box>
+                            ))}
+                          </Box>
+                        </Box>
+                      </Box>
+                    </DashboardCard.Content>
+                  </DashboardCard>
+                </Box>
+                <Divider />
                 <Box
                   display="grid"
                   __gridTemplateColumns="1fr 3fr"
diff --git a/src/siteSettings/components/SiteSettingsPage/messages.ts b/src/siteSettings/components/SiteSettingsPage/messages.ts
@@ -88,4 +88,25 @@ export const messages = defineMessages({
       "Controls whether users can authenticate using password-based login. You can allow it for everyone, restrict it to customers only, or disable it entirely.",
     description: "section description",
   },
+  sectionStockAvailabilityTitle: {
+    id: "v5yLSE",
+    defaultMessage: "Stock availability",
+    description: "section title",
+  },
+  sectionStockAvailabilityDescription: {
+    id: "qeAmFa",
+    defaultMessage:
+      "When enabled, stock availability is filtered by shipping zones and the destination address (legacy behavior). When disabled, it is determined only by the direct warehouse-channel link. <a>Learn more</a>.",
+    description: "section description",
+  },
+  sectionStockAvailabilityHeader: {
+    id: "6ZnMfQ",
+    defaultMessage: "Use legacy shipping zone stock availability",
+    description: "card header and checkbox label",
+  },
+  sectionStockAvailabilityWebhooksIntro: {
+    id: "wmybDi",
+    defaultMessage: "When disabled, the following channel-scoped stock webhooks become available:",
+    description: "intro to webhook list",
+  },
 });
diff --git a/src/siteSettings/fixtures.ts b/src/siteSettings/fixtures.ts
@@ -42,6 +42,7 @@ export const shop: SiteSettingsQuery["shop"] = {
   limitQuantityPerCheckout: 50,
   enableAccountConfirmationByEmail: true,
   useLegacyUpdateWebhookEmission: true,
+  useLegacyShippingZoneStockAvailability: true,
   preserveAllAddressFields: false,
   passwordLoginMode: PasswordLoginModeEnum.ENABLED,
 };
diff --git a/src/siteSettings/views/index.tsx b/src/siteSettings/views/index.tsx
@@ -72,6 +72,7 @@ const SiteSettings = () => {
       enableAccountConfirmationByEmail: data.emailConfirmation,
       limitQuantityPerCheckout: data.limitQuantityPerCheckout || null,
       useLegacyUpdateWebhookEmission: data.useLegacyUpdateWebhookEmission,
+      useLegacyShippingZoneStockAvailability: data.useLegacyShippingZoneStockAvailability,
       preserveAllAddressFields: data.preserveAllAddressFields,
       passwordLoginMode: data.passwordLoginMode,
     };

-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +---
 +"saleor-dashboard": patch
 +---
++
 +Added a "Stock availability" toggle in Site Settings to control `useLegacyShippingZoneStockAvailability`.
++
Original file line number	Diff line number	Diff line change
@@ -57,6 +57,7 @@ export const shopFragment = gql`
`57`	`57`	`limitQuantityPerCheckout`
`58`	`58`	`enableAccountConfirmationByEmail`
`59`	`59`	`useLegacyUpdateWebhookEmission`
	`60`	`+ useLegacyShippingZoneStockAvailability`
`60`	`61`	`preserveAllAddressFields`
`61`	`62`	`passwordLoginMode`
`62`	`63`	`}`
Original file line number	Diff line number	Diff line change
@@ -3407,6 +3407,7 @@ export const ShopFragmentDoc = gql`
`3407`	`3407`	`limitQuantityPerCheckout`
`3408`	`3408`	`enableAccountConfirmationByEmail`
`3409`	`3409`	`useLegacyUpdateWebhookEmission`
	`3410`	`+ useLegacyShippingZoneStockAvailability`
`3410`	`3411`	`preserveAllAddressFields`
`3411`	`3412`	`passwordLoginMode`
`3412`	`3413`	`}`