From 6a8d2ac13c07c7274d16e8cebde3af3f7fa0243d Mon Sep 17 00:00:00 2001 From: Melissa Luu Date: Wed, 2 Nov 2022 13:08:55 -0400 Subject: [PATCH] Remove MoneyFragment because graphql-js-client adds multiple MoneyFragment definitons when it is included in multiple GQL fragments --- src/graphql/AppliedGiftCardFragment.graphql | 15 ++-- src/graphql/CheckoutFragment.graphql | 68 ++++++++++++------- .../DiscountApplicationFragment.graphql | 3 +- src/graphql/MoneyFragment.graphql | 4 -- src/graphql/VariantFragment.graphql | 21 +++--- 5 files changed, 70 insertions(+), 41 deletions(-) delete mode 100644 src/graphql/MoneyFragment.graphql diff --git a/src/graphql/AppliedGiftCardFragment.graphql b/src/graphql/AppliedGiftCardFragment.graphql index 9478b9d4d..557e7537d 100644 --- a/src/graphql/AppliedGiftCardFragment.graphql +++ b/src/graphql/AppliedGiftCardFragment.graphql @@ -1,18 +1,23 @@ fragment AppliedGiftCardFragment on AppliedGiftCard { amountUsed { - ...MoneyFragment + amount + currencyCode } amountUsedV2: amountUsed { - ...MoneyFragment + amount + currencyCode } balance { - ...MoneyFragment + amount + currencyCode } balanceV2: balance { - ...MoneyFragment + amount + currencyCode } presentmentAmountUsed { - ...MoneyFragment + amount + currencyCode } id lastCharacters diff --git a/src/graphql/CheckoutFragment.graphql b/src/graphql/CheckoutFragment.graphql index d81099fd1..79b908a1a 100644 --- a/src/graphql/CheckoutFragment.graphql +++ b/src/graphql/CheckoutFragment.graphql @@ -24,10 +24,12 @@ fragment CheckoutFragment on Checkout { requiresShipping note paymentDue { - ...MoneyFragment + amount + currencyCode } paymentDueV2: paymentDue { - ...MoneyFragment + amount + currencyCode } webUrl orderStatusUrl @@ -35,25 +37,32 @@ fragment CheckoutFragment on Checkout { taxesIncluded currencyCode totalTax { - ...MoneyFragment + amount + currencyCode } totalTaxV2: totalTax { - ...MoneyFragment + amount + currencyCode } lineItemsSubtotalPrice { - ...MoneyFragment + amount + currencyCode } subtotalPrice { - ...MoneyFragment + amount + currencyCode } subtotalPriceV2: subtotalPrice { - ...MoneyFragment + amount + currencyCode } totalPrice { - ...MoneyFragment + amount + currencyCode } totalPriceV2: totalPrice { - ...MoneyFragment + amount + currencyCode } completedAt createdAt @@ -79,10 +88,12 @@ fragment CheckoutFragment on Checkout { shippingLine { handle price { - ...MoneyFragment + amount + currencyCode } priceV2: price { - ...MoneyFragment + amount + currencyCode } title } @@ -95,35 +106,45 @@ fragment CheckoutFragment on Checkout { processedAt orderNumber subtotalPrice { - ...MoneyFragment + amount + currencyCode } subtotalPriceV2: subtotalPrice { - ...MoneyFragment + amount + currencyCode } totalShippingPrice { - ...MoneyFragment + amount + currencyCode } totalShippingPriceV2: totalShippingPrice { - ...MoneyFragment + amount + currencyCode } totalTax { - ...MoneyFragment + amount + currencyCode } totalTaxV2: totalTax { - ...MoneyFragment + amount + currencyCode } totalPrice { - ...MoneyFragment + amount + currencyCode } totalPriceV2: totalPrice { - ...MoneyFragment + amount + currencyCode } currencyCode totalRefunded { - ...MoneyFragment + amount + currencyCode } - totalRefundedV2: totalRefunded { - ...MoneyFragment + totalRefundedV2: totalRefunded{ + amount + currencyCode } customerUrl shippingAddress { @@ -170,7 +191,8 @@ fragment CheckoutFragment on Checkout { } discountAllocations { allocatedAmount { - ...MoneyFragment + amount + currencyCode } discountApplication { ...DiscountApplicationFragment diff --git a/src/graphql/DiscountApplicationFragment.graphql b/src/graphql/DiscountApplicationFragment.graphql index 15cbd3cc0..654c1f2f3 100644 --- a/src/graphql/DiscountApplicationFragment.graphql +++ b/src/graphql/DiscountApplicationFragment.graphql @@ -4,7 +4,8 @@ fragment DiscountApplicationFragment on DiscountApplication { targetType value { ... on MoneyV2 { - ...MoneyFragment + amount + currencyCode } ... on PricingPercentageValue { percentage diff --git a/src/graphql/MoneyFragment.graphql b/src/graphql/MoneyFragment.graphql deleted file mode 100644 index 4cff51f1c..000000000 --- a/src/graphql/MoneyFragment.graphql +++ /dev/null @@ -1,4 +0,0 @@ -fragment MoneyFragment on MoneyV2 { - amount - currencyCode -} \ No newline at end of file diff --git a/src/graphql/VariantFragment.graphql b/src/graphql/VariantFragment.graphql index 0d71c9b12..2225058a3 100644 --- a/src/graphql/VariantFragment.graphql +++ b/src/graphql/VariantFragment.graphql @@ -3,20 +3,24 @@ fragment VariantFragment on ProductVariant { id title price { - ...MoneyFragment + amount + currencyCode } priceV2: price { - ...MoneyFragment + amount + currencyCode } weight available: availableForSale sku compareAtPrice { - ...MoneyFragment - } - compareAtPriceV2: compareAtPrice { - ...MoneyFragment + amount + currencyCode } + compareAtPriceV2: compareAtPrice { + amount + currencyCode +} image { id src: url @@ -29,8 +33,9 @@ fragment VariantFragment on ProductVariant { value } unitPrice { - ...MoneyFragment - } + amount + currencyCode +} unitPriceMeasurement { measuredType quantityUnit