djkato/saleor-dashboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SALEOR-1629 - Fix voucher page bugs (#1031)

Browse source
This commit is contained in:
Dawid Tarasiuk 2021-05-06 13:43:26 +02:00 committed by GitHub
parent 0e054cc1e4
commit 8e038dc786
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 133 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -29,6 +29,7 @@ All notable, unreleased changes to this project will be documented in this file.
- Update CollectionBulkDelete error type - #1030 by @d-wysocki
- Remove mailing settings - #1027 by @dominik-zeglen
- Update schema to contain email plugin changes - #1029 by @dominik-zeglen
- Fix creating shipping voucher - #1031 by @orzechdev
- Unconfirmed order manipulation - #967 by @tomaszszymanski129
- Add multiline field plugins - #974 by @dominik-zeglen
- Handle limit reached error - #990 by @dominik-zeglen

5
cypress/elements/discounts/vouchers.js
View file

@ -2,8 +2,9 @@ export const VOUCHERS_SELECTORS = {
createVoucherButton: "[data-test-id='create-voucher']",
voucherCodeInput: "[name='code']",
discountRadioButtons: "[name='discountType']",
percentageDiscountRadioButton: "[name='discountType'][value='PERCENTAGE']",
fixedDiscountRadioButton: "[name='discountType'][value='FIXED']",
percentageDiscountRadioButton:
"[name='discountType'][value='VALUE_PERCENTAGE']",
fixedDiscountRadioButton: "[name='discountType'][value='VALUE_FIXED']",
shippingDiscountRadioButton: "[name='discountType'][value='SHIPPING']",
discountValueInputs: "[name='value']"
};

35
src/discounts/components/VoucherCreatePage/VoucherCreatePage.tsx
View file

@ -8,18 +8,18 @@ import Form from "@saleor/components/Form";
import Grid from "@saleor/components/Grid";
import PageHeader from "@saleor/components/PageHeader";
import SaveButtonBar from "@saleor/components/SaveButtonBar";
import { createChannelsChangeHandler } from "@saleor/discounts/handlers";
import {
createChannelsChangeHandler,
createDiscountTypeChangeHandler
} from "@saleor/discounts/handlers";
import { DiscountErrorFragment } from "@saleor/fragments/types/DiscountErrorFragment";
import { sectionNames } from "@saleor/intl";
import { validatePrice } from "@saleor/products/utils/validation";
import React from "react";
import { useIntl } from "react-intl";
import {
DiscountValueTypeEnum,
VoucherTypeEnum
} from "../../../types/globalTypes";
import { RequirementsPicker } from "../../types";
import { VoucherTypeEnum } from "../../../types/globalTypes";
import { DiscountTypeEnum, RequirementsPicker } from "../../types";
import VoucherDates from "../VoucherDates";
import VoucherInfo from "../VoucherInfo";
import VoucherLimits from "../VoucherLimits";
@ -32,7 +32,7 @@ export interface FormData {
applyOncePerOrder: boolean;
channelListings: ChannelVoucherData[];
code: string;
discountType: DiscountValueTypeEnum;
discountType: DiscountTypeEnum;
endDate: string;
endTime: string;
hasEndDate: boolean;
@ -78,7 +78,7 @@ const VoucherCreatePage: React.FC<VoucherCreatePageProps> = ({
applyOncePerOrder: false,
channelListings,
code: "",
discountType: DiscountValueTypeEnum.FIXED,
discountType: DiscountTypeEnum.VALUE_FIXED,
endDate: "",
endTime: "",
hasEndDate: false,
@ -95,17 +95,22 @@ const VoucherCreatePage: React.FC<VoucherCreatePageProps> = ({
return (
<Form initial={initialForm} onSubmit={onSubmit}>
{({ change, data, hasChanged, submit, triggerChange }) => {
const handleDiscountTypeChange = createDiscountTypeChangeHandler(
change
);
const handleChannelChange = createChannelsChangeHandler(
data.channelListings,
onChannelsChange,
triggerChange
);
const formDisabled = data.channelListings?.some(
channel =>
validatePrice(channel.discountValue) ||
(data.requirementsPicker === RequirementsPicker.ORDER &&
validatePrice(channel.minSpent))
);
const formDisabled =
data.discountType.toString() !== "SHIPPING" &&
data.channelListings?.some(
channel =>
validatePrice(channel.discountValue) ||
(data.requirementsPicker === RequirementsPicker.ORDER &&
validatePrice(channel.minSpent))
);
return (
<Container>
<AppHeader onBack={onBack}>
@ -123,7 +128,7 @@ const VoucherCreatePage: React.FC<VoucherCreatePageProps> = ({
data={data}
errors={errors}
disabled={disabled}
onChange={change}
onChange={event => handleDiscountTypeChange(data, event)}
variant="create"
/>
<CardSpacer />

40
src/discounts/components/VoucherDetailsPage/VoucherDetailsPage.tsx
View file

@ -11,8 +11,11 @@ import Grid from "@saleor/components/Grid";
import PageHeader from "@saleor/components/PageHeader";
import SaveButtonBar from "@saleor/components/SaveButtonBar";
import { Tab, TabContainer } from "@saleor/components/Tab";
import { createChannelsChangeHandler } from "@saleor/discounts/handlers";
import { RequirementsPicker } from "@saleor/discounts/types";
import {
createChannelsChangeHandler,
createDiscountTypeChangeHandler
} from "@saleor/discounts/handlers";
import { DiscountTypeEnum, RequirementsPicker } from "@saleor/discounts/types";
import { DiscountErrorFragment } from "@saleor/fragments/types/DiscountErrorFragment";
import { sectionNames } from "@saleor/intl";
import { validatePrice } from "@saleor/products/utils/validation";
@ -56,7 +59,7 @@ export interface VoucherDetailsPageFormData {
applyOncePerOrder: boolean;
channelListings: ChannelVoucherData[];
code: string;
discountType: DiscountValueTypeEnum;
discountType: DiscountTypeEnum;
endDate: string;
endTime: string;
hasEndDate: boolean;
@ -156,15 +159,19 @@ const VoucherDetailsPage: React.FC<VoucherDetailsPageProps> = ({
requirementsPickerInitValue = RequirementsPicker.NONE;
}
const discountType =
voucher?.type === VoucherTypeEnum.SHIPPING
? DiscountTypeEnum.SHIPPING
: voucher?.discountValueType === DiscountValueTypeEnum.PERCENTAGE
? DiscountTypeEnum.VALUE_PERCENTAGE
: DiscountTypeEnum.VALUE_FIXED;
const initialForm: VoucherDetailsPageFormData = {
applyOncePerCustomer: voucher?.applyOncePerCustomer || false,
applyOncePerOrder: voucher?.applyOncePerOrder || false,
channelListings,
code: voucher?.code || "",
discountType: maybe(
() => voucher.discountValueType,
DiscountValueTypeEnum.FIXED
),
discountType,
endDate: splitDateTime(maybe(() => voucher.endDate, "")).date,
endTime: splitDateTime(maybe(() => voucher.endDate, "")).time,
hasEndDate: maybe(() => !!voucher.endDate),
@ -183,17 +190,22 @@ const VoucherDetailsPage: React.FC<VoucherDetailsPageProps> = ({
return (
<Form initial={initialForm} onSubmit={onSubmit}>
{({ change, data, hasChanged, submit, triggerChange }) => {
const handleDiscountTypeChange = createDiscountTypeChangeHandler(
change
);
const handleChannelChange = createChannelsChangeHandler(
data.channelListings,
onChannelsChange,
triggerChange
);
const formDisabled = data.channelListings?.some(
channel =>
validatePrice(channel.discountValue) ||
(data.requirementsPicker === RequirementsPicker.ORDER &&
validatePrice(channel.minSpent))
);
const formDisabled =
data.discountType.toString() !== "SHIPPING" &&
data.channelListings?.some(
channel =>
validatePrice(channel.discountValue) ||
(data.requirementsPicker === RequirementsPicker.ORDER &&
validatePrice(channel.minSpent))
);
return (
<Container>
<AppHeader onBack={onBack}>
@ -214,7 +226,7 @@ const VoucherDetailsPage: React.FC<VoucherDetailsPageProps> = ({
data={data}
disabled={disabled}
errors={errors}
onChange={change}
onChange={event => handleDiscountTypeChange(data, event)}
/>
<CardSpacer />
{data.discountType.toString() !== "SHIPPING" ? (

8
src/discounts/components/VoucherTypes/VoucherTypes.tsx
View file

@ -3,13 +3,13 @@ import CardContent from "@material-ui/core/CardContent";
import CardTitle from "@saleor/components/CardTitle";
import Grid from "@saleor/components/Grid";
import RadioGroupField from "@saleor/components/RadioGroupField";
import { DiscountTypeEnum } from "@saleor/discounts/types";
import { DiscountErrorFragment } from "@saleor/fragments/types/DiscountErrorFragment";
import { getFormErrors } from "@saleor/utils/errors";
import getDiscountErrorMessage from "@saleor/utils/errors/discounts";
import React from "react";
import { useIntl } from "react-intl";
import { DiscountValueTypeEnum } from "../../../types/globalTypes";
import { VoucherDetailsPageFormData } from "../VoucherDetailsPage";
interface VoucherTypesProps {
@ -35,21 +35,21 @@ const VoucherTypes = ({
defaultMessage: "Fixed Amount",
description: "voucher discount type"
}),
value: DiscountValueTypeEnum.FIXED
value: DiscountTypeEnum.VALUE_FIXED
},
{
label: intl.formatMessage({
defaultMessage: "Percentage",
description: "voucher discount type"
}),
value: DiscountValueTypeEnum.PERCENTAGE
value: DiscountTypeEnum.VALUE_PERCENTAGE
},
{
label: intl.formatMessage({
defaultMessage: "Free Shipping",
description: "voucher discount type"
}),
value: "SHIPPING"
value: DiscountTypeEnum.SHIPPING
}
];

4
src/discounts/components/VoucherValue/VoucherValue.tsx
View file

@ -14,6 +14,7 @@ import Skeleton from "@saleor/components/Skeleton";
import TableHead from "@saleor/components/TableHead";
import TextFieldWithChoice from "@saleor/components/TextFieldWithChoice";
import { ChannelInput } from "@saleor/discounts/handlers";
import { DiscountTypeEnum } from "@saleor/discounts/types";
import { DiscountErrorFragment } from "@saleor/fragments/types/DiscountErrorFragment";
import { renderCollection } from "@saleor/misc";
import { getFormErrors } from "@saleor/utils/errors";
@ -21,7 +22,6 @@ import getDiscountErrorMessage from "@saleor/utils/errors/discounts";
import React from "react";
import { FormattedMessage, useIntl } from "react-intl";
import { DiscountValueTypeEnum } from "../../../types/globalTypes";
import { translateVoucherTypes } from "../../translations";
import { VoucherDetailsPageFormData } from "../VoucherDetailsPage";
import { useStyles } from "./styles";
@ -108,7 +108,7 @@ const VoucherValue: React.FC<VoucherValueProps> = props => {
ChoiceProps={{
label:
data.discountType ===
DiscountValueTypeEnum.FIXED
DiscountTypeEnum.VALUE_FIXED
? listing.currency
: "%",
name: "discountType" as keyof FormData,

2
src/discounts/fixtures.ts
View file

@ -153,6 +153,7 @@ export const voucherList: VoucherList_vouchers_edges_node[] = [
country: "Germany"
}
],
type: "ENTIRE_ORDER" as VoucherTypeEnum,
discountValueType: "PERCENTAGE" as DiscountValueTypeEnum,
endDate: null,
id: "Vm91Y2hlcjox",
@ -183,6 +184,7 @@ export const voucherList: VoucherList_vouchers_edges_node[] = [
],
code: "FREE2020",
countries: [],
type: "ENTIRE_ORDER" as VoucherTypeEnum,
discountValueType: "FIXED" as DiscountValueTypeEnum,
endDate: null,
id: "Vm91Y2hlcjoy",

27
src/discounts/handlers.ts
View file

@ -1,8 +1,10 @@
import { ChannelSaleData, ChannelVoucherData } from "@saleor/channels/utils";
import { SaleDetailsPageFormData } from "@saleor/discounts/components/SaleDetailsPage";
import { VoucherDetailsPageFormData } from "@saleor/discounts/components/VoucherDetailsPage";
import { RequirementsPicker } from "@saleor/discounts/types";
import { DiscountTypeEnum, RequirementsPicker } from "@saleor/discounts/types";
import { ChangeEvent, FormChange } from "@saleor/hooks/useForm";
import { RequireOnlyOne } from "@saleor/misc";
import { VoucherTypeEnum } from "@saleor/types/globalTypes";
import { diff } from "fast-array-diff";
export interface ChannelArgs {
discountValue: string;
@ -14,6 +16,29 @@ export type ChannelInput = RequireOnlyOne<
"discountValue" | "minSpent"
>;
export function createDiscountTypeChangeHandler(change: FormChange) {
return (formData: VoucherDetailsPageFormData, event: ChangeEvent) => {
if (formData.type === VoucherTypeEnum.SHIPPING) {
// if previously type was shipping
change({
target: {
name: "type",
value: VoucherTypeEnum.ENTIRE_ORDER
}
});
} else if (event.target.value === DiscountTypeEnum.SHIPPING) {
// if currently type should be shipping
change({
target: {
name: "type",
value: VoucherTypeEnum.ENTIRE_ORDER
}
});
}
change(event);
};
}
export function createChannelsChangeHandler(
channelListings: ChannelVoucherData[],
updateChannels: (data: ChannelVoucherData[]) => void,

6
src/discounts/types.ts
View file

@ -3,3 +3,9 @@ export enum RequirementsPicker {
ITEM = "ITEM",
NONE = "NONE"
}
export enum DiscountTypeEnum {
VALUE_FIXED = "VALUE_FIXED",
VALUE_PERCENTAGE = "VALUE_PERCENTAGE",
SHIPPING = "SHIPPING"
}

4
src/discounts/types/VoucherCataloguesAdd.ts
View file

@ -3,7 +3,7 @@
// @generated
// This file was automatically generated and should not be edited.
import { CatalogueInput, DiscountErrorCode, DiscountValueTypeEnum, VoucherTypeEnum } from "./../../types/globalTypes";
import { CatalogueInput, DiscountErrorCode, VoucherTypeEnum, DiscountValueTypeEnum } from "./../../types/globalTypes";
// ====================================================
// GraphQL mutation operation: VoucherCataloguesAdd
@ -172,11 +172,11 @@ export interface VoucherCataloguesAdd_voucherCataloguesAdd_voucher {
startDate: any;
endDate: any | null;
usageLimit: number | null;
type: VoucherTypeEnum;
discountValueType: DiscountValueTypeEnum;
countries: (VoucherCataloguesAdd_voucherCataloguesAdd_voucher_countries | null)[] | null;
minCheckoutItemsQuantity: number | null;
channelListings: VoucherCataloguesAdd_voucherCataloguesAdd_voucher_channelListings[] | null;
type: VoucherTypeEnum;
used: number;
applyOncePerOrder: boolean;
applyOncePerCustomer: boolean;

4
src/discounts/types/VoucherCataloguesRemove.ts
View file

@ -3,7 +3,7 @@
// @generated
// This file was automatically generated and should not be edited.
import { CatalogueInput, DiscountErrorCode, DiscountValueTypeEnum, VoucherTypeEnum } from "./../../types/globalTypes";
import { CatalogueInput, DiscountErrorCode, VoucherTypeEnum, DiscountValueTypeEnum } from "./../../types/globalTypes";
// ====================================================
// GraphQL mutation operation: VoucherCataloguesRemove
@ -172,11 +172,11 @@ export interface VoucherCataloguesRemove_voucherCataloguesRemove_voucher {
startDate: any;
endDate: any | null;
usageLimit: number | null;
type: VoucherTypeEnum;
discountValueType: DiscountValueTypeEnum;
countries: (VoucherCataloguesRemove_voucherCataloguesRemove_voucher_countries | null)[] | null;
minCheckoutItemsQuantity: number | null;
channelListings: VoucherCataloguesRemove_voucherCataloguesRemove_voucher_channelListings[] | null;
type: VoucherTypeEnum;
used: number;
applyOncePerOrder: boolean;
applyOncePerCustomer: boolean;

3
src/discounts/types/VoucherChannelListingUpdate.ts
View file

@ -3,7 +3,7 @@
// @generated
// This file was automatically generated and should not be edited.
import { VoucherChannelListingInput, DiscountErrorCode, DiscountValueTypeEnum } from "./../../types/globalTypes";
import { VoucherChannelListingInput, DiscountErrorCode, VoucherTypeEnum, DiscountValueTypeEnum } from "./../../types/globalTypes";
// ====================================================
// GraphQL mutation operation: VoucherChannelListingUpdate
@ -51,6 +51,7 @@ export interface VoucherChannelListingUpdate_voucherChannelListingUpdate_voucher
startDate: any;
endDate: any | null;
usageLimit: number | null;
type: VoucherTypeEnum;
discountValueType: DiscountValueTypeEnum;
countries: (VoucherChannelListingUpdate_voucherChannelListingUpdate_voucher_countries | null)[] | null;
minCheckoutItemsQuantity: number | null;

3
src/discounts/types/VoucherCreate.ts
View file

@ -3,7 +3,7 @@
// @generated
// This file was automatically generated and should not be edited.
import { VoucherInput, DiscountErrorCode, DiscountValueTypeEnum } from "./../../types/globalTypes";
import { VoucherInput, DiscountErrorCode, VoucherTypeEnum, DiscountValueTypeEnum } from "./../../types/globalTypes";
// ====================================================
// GraphQL mutation operation: VoucherCreate
@ -51,6 +51,7 @@ export interface VoucherCreate_voucherCreate_voucher {
startDate: any;
endDate: any | null;
usageLimit: number | null;
type: VoucherTypeEnum;
discountValueType: DiscountValueTypeEnum;
countries: (VoucherCreate_voucherCreate_voucher_countries | null)[] | null;
minCheckoutItemsQuantity: number | null;

4
src/discounts/types/VoucherDetails.ts
View file

@ -3,7 +3,7 @@
// @generated
// This file was automatically generated and should not be edited.
import { DiscountValueTypeEnum, VoucherTypeEnum } from "./../../types/globalTypes";
import { VoucherTypeEnum, DiscountValueTypeEnum } from "./../../types/globalTypes";
// ====================================================
// GraphQL query operation: VoucherDetails
@ -165,11 +165,11 @@ export interface VoucherDetails_voucher {
startDate: any;
endDate: any | null;
usageLimit: number | null;
type: VoucherTypeEnum;
discountValueType: DiscountValueTypeEnum;
countries: (VoucherDetails_voucher_countries | null)[] | null;
minCheckoutItemsQuantity: number | null;
channelListings: VoucherDetails_voucher_channelListings[] | null;
type: VoucherTypeEnum;
used: number;
applyOncePerOrder: boolean;
applyOncePerCustomer: boolean;

3
src/discounts/types/VoucherList.ts
View file

@ -3,7 +3,7 @@
// @generated
// This file was automatically generated and should not be edited.
import { VoucherFilterInput, VoucherSortingInput, DiscountValueTypeEnum } from "./../../types/globalTypes";
import { VoucherFilterInput, VoucherSortingInput, VoucherTypeEnum, DiscountValueTypeEnum } from "./../../types/globalTypes";
// ====================================================
// GraphQL query operation: VoucherList
@ -44,6 +44,7 @@ export interface VoucherList_vouchers_edges_node {
startDate: any;
endDate: any | null;
usageLimit: number | null;
type: VoucherTypeEnum;
discountValueType: DiscountValueTypeEnum;
countries: (VoucherList_vouchers_edges_node_countries | null)[] | null;
minCheckoutItemsQuantity: number | null;

3
src/discounts/types/VoucherUpdate.ts
View file

@ -3,7 +3,7 @@
// @generated
// This file was automatically generated and should not be edited.
import { VoucherInput, DiscountErrorCode, DiscountValueTypeEnum } from "./../../types/globalTypes";
import { VoucherInput, DiscountErrorCode, VoucherTypeEnum, DiscountValueTypeEnum } from "./../../types/globalTypes";
// ====================================================
// GraphQL mutation operation: VoucherUpdate
@ -51,6 +51,7 @@ export interface VoucherUpdate_voucherUpdate_voucher {
startDate: any;
endDate: any | null;
usageLimit: number | null;
type: VoucherTypeEnum;
discountValueType: DiscountValueTypeEnum;
countries: (VoucherUpdate_voucherUpdate_voucher_countries | null)[] | null;
minCheckoutItemsQuantity: number | null;

10
src/discounts/views/VoucherCreate/handlers.ts
View file

@ -1,6 +1,6 @@
import { VoucherDetailsPageFormData } from "@saleor/discounts/components/VoucherDetailsPage";
import { getChannelsVariables } from "@saleor/discounts/handlers";
import { RequirementsPicker } from "@saleor/discounts/types";
import { DiscountTypeEnum, RequirementsPicker } from "@saleor/discounts/types";
import {
VoucherChannelListingUpdate,
VoucherChannelListingUpdateVariables
@ -31,9 +31,11 @@ export function createHandler(
applyOncePerOrder: formData.applyOncePerOrder,
code: formData.code,
discountValueType:
formData.discountType.toString() === "SHIPPING"
formData.discountType === DiscountTypeEnum.VALUE_PERCENTAGE
? DiscountValueTypeEnum.PERCENTAGE
: formData.discountType,
: formData.discountType === DiscountTypeEnum.VALUE_FIXED
? DiscountValueTypeEnum.FIXED
: DiscountValueTypeEnum.PERCENTAGE,
endDate: formData.hasEndDate
? joinDateTime(formData.endDate, formData.endTime)
: null,
@ -43,7 +45,7 @@ export function createHandler(
: parseFloat(formData.minCheckoutItemsQuantity),
startDate: joinDateTime(formData.startDate, formData.startTime),
type:
formData.discountType.toString() === "SHIPPING"
formData.discountType === DiscountTypeEnum.SHIPPING
? VoucherTypeEnum.SHIPPING
: formData.type,
usageLimit: formData.hasUsageLimit

14
src/discounts/views/VoucherDetails/handlers.ts
View file

@ -1,7 +1,7 @@
import { ChannelVoucherData } from "@saleor/channels/utils";
import { VoucherDetailsPageFormData } from "@saleor/discounts/components/VoucherDetailsPage";
import { getChannelsVariables } from "@saleor/discounts/handlers";
import { RequirementsPicker } from "@saleor/discounts/types";
import { DiscountTypeEnum, RequirementsPicker } from "@saleor/discounts/types";
import {
VoucherChannelListingUpdate,
VoucherChannelListingUpdateVariables
@ -28,17 +28,19 @@ export function createUpdateHandler(
variables: VoucherChannelListingUpdateVariables;
}) => Promise<MutationFetchResult<VoucherChannelListingUpdate>>
) {
return (formData: VoucherDetailsPageFormData) => {
return async (formData: VoucherDetailsPageFormData) => {
const { id } = voucher;
updateVoucher({
await updateVoucher({
id,
input: {
applyOncePerCustomer: formData.applyOncePerCustomer,
applyOncePerOrder: formData.applyOncePerOrder,
discountValueType:
formData.discountType.toString() === "SHIPPING"
formData.discountType === DiscountTypeEnum.VALUE_PERCENTAGE
? DiscountValueTypeEnum.PERCENTAGE
: formData.discountType,
: formData.discountType === DiscountTypeEnum.VALUE_FIXED
? DiscountValueTypeEnum.FIXED
: DiscountValueTypeEnum.PERCENTAGE,
endDate: formData.hasEndDate
? joinDateTime(formData.endDate, formData.endTime)
: null,
@ -48,7 +50,7 @@ export function createUpdateHandler(
: parseFloat(formData.minCheckoutItemsQuantity),
startDate: joinDateTime(formData.startDate, formData.startTime),
type:
formData.discountType.toString() === "SHIPPING"
formData.discountType === DiscountTypeEnum.SHIPPING
? VoucherTypeEnum.SHIPPING
: formData.type,
usageLimit: formData.hasUsageLimit

2
src/fragments/discounts.ts
View file

@ -91,6 +91,7 @@ export const voucherFragment = gql`
startDate
endDate
usageLimit
type
discountValueType
countries {
code
@ -120,7 +121,6 @@ export const voucherDetailsFragment = gql`
${channelListingProductWithoutPricingFragment}
fragment VoucherDetailsFragment on Voucher {
...VoucherFragment
type
code
usageLimit
used

4
src/fragments/types/VoucherDetailsFragment.ts
View file

@ -3,7 +3,7 @@
// @generated
// This file was automatically generated and should not be edited.
import { DiscountValueTypeEnum, VoucherTypeEnum } from "./../../types/globalTypes";
import { VoucherTypeEnum, DiscountValueTypeEnum } from "./../../types/globalTypes";
// ====================================================
// GraphQL fragment: VoucherDetailsFragment
@ -165,11 +165,11 @@ export interface VoucherDetailsFragment {
startDate: any;
endDate: any | null;
usageLimit: number | null;
type: VoucherTypeEnum;
discountValueType: DiscountValueTypeEnum;
countries: (VoucherDetailsFragment_countries | null)[] | null;
minCheckoutItemsQuantity: number | null;
channelListings: VoucherDetailsFragment_channelListings[] | null;
type: VoucherTypeEnum;
used: number;
applyOncePerOrder: boolean;
applyOncePerCustomer: boolean;

3
src/fragments/types/VoucherFragment.ts
View file

@ -3,7 +3,7 @@
// @generated
// This file was automatically generated and should not be edited.
import { DiscountValueTypeEnum } from "./../../types/globalTypes";
import { VoucherTypeEnum, DiscountValueTypeEnum } from "./../../types/globalTypes";
// ====================================================
// GraphQL fragment: VoucherFragment
@ -44,6 +44,7 @@ export interface VoucherFragment {
startDate: any;
endDate: any | null;
usageLimit: number | null;
type: VoucherTypeEnum;
discountValueType: DiscountValueTypeEnum;
countries: (VoucherFragment_countries | null)[] | null;
minCheckoutItemsQuantity: number | null;

20
src/storybook/__snapshots__/Stories.test.ts.snap
View file

@ -90535,7 +90535,7 @@ exports[`Storyshots Views / Discounts / Voucher create default 1`] = `
class="PrivateSwitchBase-input-id"
name="discountType"
type="radio"
value="FIXED"
value="VALUE_FIXED"
/>
<div
class="PrivateRadioButtonIcon-root-id PrivateRadioButtonIcon-checked-id"
@ -90583,7 +90583,7 @@ exports[`Storyshots Views / Discounts / Voucher create default 1`] = `
class="PrivateSwitchBase-input-id"
name="discountType"
type="radio"
value="PERCENTAGE"
value="VALUE_PERCENTAGE"
/>
<div
class="PrivateRadioButtonIcon-root-id"
@ -91957,7 +91957,7 @@ exports[`Storyshots Views / Discounts / Voucher create form errors 1`] = `
class="PrivateSwitchBase-input-id"
name="discountType"
type="radio"
value="FIXED"
value="VALUE_FIXED"
/>
<div
class="PrivateRadioButtonIcon-root-id PrivateRadioButtonIcon-checked-id"
@ -92005,7 +92005,7 @@ exports[`Storyshots Views / Discounts / Voucher create form errors 1`] = `
class="PrivateSwitchBase-input-id"
name="discountType"
type="radio"
value="PERCENTAGE"
value="VALUE_PERCENTAGE"
/>
<div
class="PrivateRadioButtonIcon-root-id"
@ -93377,7 +93377,7 @@ exports[`Storyshots Views / Discounts / Voucher details default 1`] = `
class="PrivateSwitchBase-input-id"
name="discountType"
type="radio"
value="FIXED"
value="VALUE_FIXED"
/>
<div
class="PrivateRadioButtonIcon-root-id PrivateRadioButtonIcon-checked-id"
@ -93425,7 +93425,7 @@ exports[`Storyshots Views / Discounts / Voucher details default 1`] = `
class="PrivateSwitchBase-input-id"
name="discountType"
type="radio"
value="PERCENTAGE"
value="VALUE_PERCENTAGE"
/>
<div
class="PrivateRadioButtonIcon-root-id"
@ -95577,7 +95577,7 @@ exports[`Storyshots Views / Discounts / Voucher details form errors 1`] = `
class="PrivateSwitchBase-input-id"
name="discountType"
type="radio"
value="FIXED"
value="VALUE_FIXED"
/>
<div
class="PrivateRadioButtonIcon-root-id PrivateRadioButtonIcon-checked-id"
@ -95625,7 +95625,7 @@ exports[`Storyshots Views / Discounts / Voucher details form errors 1`] = `
class="PrivateSwitchBase-input-id"
name="discountType"
type="radio"
value="PERCENTAGE"
value="VALUE_PERCENTAGE"
/>
<div
class="PrivateRadioButtonIcon-root-id"
@ -97799,7 +97799,7 @@ exports[`Storyshots Views / Discounts / Voucher details loading 1`] = `
disabled=""
name="discountType"
type="radio"
value="FIXED"
value="VALUE_FIXED"
/>
<div
class="PrivateRadioButtonIcon-root-id PrivateRadioButtonIcon-checked-id"
@ -97849,7 +97849,7 @@ exports[`Storyshots Views / Discounts / Voucher details loading 1`] = `
disabled=""
name="discountType"
type="radio"
value="PERCENTAGE"
value="VALUE_PERCENTAGE"
/>
<div
class="PrivateRadioButtonIcon-root-id"