feat(core): Include with/without tax amounts on discounts

Relates to #749 BREAKING CHANGE: A minor breaking change has been made to the GraphQL API: The `Order.discounts` and `OrderLine.discounts` fields now return `amount` and `amountWithTax`. Previously they only had `amount`, which was actually the tax-inclusive value. So if you want to show discount amounts with tax, use `amountWithTax` and otherwise use `amount`.
vendure-ecommerce · Mar 23, 2021 · 2de6bf5 · 2de6bf5
1 parent 10899f3
commit 2de6bf5
Show file tree

Hide file tree

Showing 15 changed files with 4,940 additions and 4,450 deletions.
diff --git a/packages/asset-server-plugin/e2e/graphql/generated-e2e-asset-server-plugin-types.ts b/packages/asset-server-plugin/e2e/graphql/generated-e2e-asset-server-plugin-types.ts
@@ -1393,7 +1393,7 @@ export type Order = Node & {
      * @deprecated Use `discounts` instead
      */
     adjustments: Array<Adjustment>;
-    discounts: Array<Adjustment>;
+    discounts: Array<Discount>;
     /** An array of all coupon codes applied to the Order */
     couponCodes: Array<Scalars['String']>;
     /** Promotions applied to the order. Only gets populated after the payment process has completed. */
@@ -3691,7 +3691,15 @@ export type ShippingLine = {
     priceWithTax: Scalars['Int'];
     discountedPrice: Scalars['Int'];
     discountedPriceWithTax: Scalars['Int'];
-    discounts: Array<Adjustment>;
+    discounts: Array<Discount>;
+};
+
+export type Discount = {
+    adjustmentSource: Scalars['String'];
+    type: AdjustmentType;
+    description: Scalars['String'];
+    amount: Scalars['Int'];
+    amountWithTax: Scalars['Int'];
 };
 
 export type OrderItem = Node & {
@@ -3790,7 +3798,7 @@ export type OrderLine = Node & {
     lineTax: Scalars['Int'];
     /** @deprecated Use `discounts` instead */
     adjustments: Array<Adjustment>;
-    discounts: Array<Adjustment>;
+    discounts: Array<Discount>;
     taxLines: Array<TaxLine>;
     order: Order;
     customFields?: Maybe<Scalars['JSON']>;

diff --git a/packages/common/src/generated-shop-types.ts b/packages/common/src/generated-shop-types.ts
diff --git a/packages/common/src/generated-types.ts b/packages/common/src/generated-types.ts
@@ -1564,7 +1564,7 @@ export type Order = Node & {
    * @deprecated Use `discounts` instead
    */
   adjustments: Array<Adjustment>;
-  discounts: Array<Adjustment>;
+  discounts: Array<Discount>;
   /** An array of all coupon codes applied to the Order */
   couponCodes: Array<Scalars['String']>;
   /** Promotions applied to the order. Only gets populated after the payment process has completed. */
@@ -3911,7 +3911,16 @@ export type ShippingLine = {
   priceWithTax: Scalars['Int'];
   discountedPrice: Scalars['Int'];
   discountedPriceWithTax: Scalars['Int'];
-  discounts: Array<Adjustment>;
+  discounts: Array<Discount>;
+};
+
+export type Discount = {
+  __typename?: 'Discount';
+  adjustmentSource: Scalars['String'];
+  type: AdjustmentType;
+  description: Scalars['String'];
+  amount: Scalars['Int'];
+  amountWithTax: Scalars['Int'];
 };
 
 export type OrderItem = Node & {
@@ -4012,7 +4021,7 @@ export type OrderLine = Node & {
   lineTax: Scalars['Int'];
   /** @deprecated Use `discounts` instead */
   adjustments: Array<Adjustment>;
-  discounts: Array<Adjustment>;
+  discounts: Array<Discount>;
   taxLines: Array<TaxLine>;
   order: Order;
   customFields?: Maybe<Scalars['JSON']>;

diff --git a/packages/core/e2e/graphql/generated-e2e-admin-types.ts b/packages/core/e2e/graphql/generated-e2e-admin-types.ts
@@ -1393,7 +1393,7 @@ export type Order = Node & {
      * @deprecated Use `discounts` instead
      */
     adjustments: Array<Adjustment>;
-    discounts: Array<Adjustment>;
+    discounts: Array<Discount>;
     /** An array of all coupon codes applied to the Order */
     couponCodes: Array<Scalars['String']>;
     /** Promotions applied to the order. Only gets populated after the payment process has completed. */
@@ -3691,7 +3691,15 @@ export type ShippingLine = {
     priceWithTax: Scalars['Int'];
     discountedPrice: Scalars['Int'];
     discountedPriceWithTax: Scalars['Int'];
-    discounts: Array<Adjustment>;
+    discounts: Array<Discount>;
+};
+
+export type Discount = {
+    adjustmentSource: Scalars['String'];
+    type: AdjustmentType;
+    description: Scalars['String'];
+    amount: Scalars['Int'];
+    amountWithTax: Scalars['Int'];
 };
 
 export type OrderItem = Node & {
@@ -3790,7 +3798,7 @@ export type OrderLine = Node & {
     lineTax: Scalars['Int'];
     /** @deprecated Use `discounts` instead */
     adjustments: Array<Adjustment>;
-    discounts: Array<Adjustment>;
+    discounts: Array<Discount>;
     taxLines: Array<TaxLine>;
     order: Order;
     customFields?: Maybe<Scalars['JSON']>;