feat(core): Add code field to ShippingMethodQuote

Closes #780
vendure-ecommerce · Mar 23, 2021 · 847b4e2 · 847b4e2
1 parent ea5a9f2
commit 847b4e2
Show file tree

Hide file tree

Showing 14 changed files with 30 additions and 5 deletions.
diff --git a/packages/admin-ui/src/lib/core/src/common/generated-types.ts b/packages/admin-ui/src/lib/core/src/common/generated-types.ts
@@ -3004,6 +3004,7 @@ export type ShippingMethodQuote = {
   id: Scalars['ID'];
   price: Scalars['Int'];
   priceWithTax: Scalars['Int'];
+  code: Scalars['String'];
   name: Scalars['String'];
   description: Scalars['String'];
   /** Any optional metadata returned by the ShippingCalculator in the ShippingCalculationResult */

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
@@ -2764,6 +2764,7 @@ export type ShippingMethodQuote = {
     id: Scalars['ID'];
     price: Scalars['Int'];
     priceWithTax: Scalars['Int'];
+    code: Scalars['String'];
     name: Scalars['String'];
     description: Scalars['String'];
     /** Any optional metadata returned by the ShippingCalculator in the ShippingCalculationResult */

diff --git a/packages/common/src/generated-shop-types.ts b/packages/common/src/generated-shop-types.ts
@@ -799,6 +799,7 @@ export type ShippingMethodQuote = {
     id: Scalars['ID'];
     price: Scalars['Int'];
     priceWithTax: Scalars['Int'];
+    code: Scalars['String'];
     name: Scalars['String'];
     description: Scalars['String'];
     /** Any optional metadata returned by the ShippingCalculator in the ShippingCalculationResult */

diff --git a/packages/common/src/generated-types.ts b/packages/common/src/generated-types.ts
@@ -2966,6 +2966,7 @@ export type ShippingMethodQuote = {
   id: Scalars['ID'];
   price: Scalars['Int'];
   priceWithTax: Scalars['Int'];
+  code: Scalars['String'];
   name: Scalars['String'];
   description: Scalars['String'];
   /** Any optional metadata returned by the ShippingCalculator in the ShippingCalculationResult */

diff --git a/packages/core/e2e/graphql/generated-e2e-admin-types.ts b/packages/core/e2e/graphql/generated-e2e-admin-types.ts
@@ -2764,6 +2764,7 @@ export type ShippingMethodQuote = {
     id: Scalars['ID'];
     price: Scalars['Int'];
     priceWithTax: Scalars['Int'];
+    code: Scalars['String'];
     name: Scalars['String'];
     description: Scalars['String'];
     /** Any optional metadata returned by the ShippingCalculator in the ShippingCalculationResult */

diff --git a/packages/core/e2e/graphql/generated-e2e-shop-types.ts b/packages/core/e2e/graphql/generated-e2e-shop-types.ts
@@ -769,6 +769,7 @@ export type ShippingMethodQuote = {
     id: Scalars['ID'];
     price: Scalars['Int'];
     priceWithTax: Scalars['Int'];
+    code: Scalars['String'];
     name: Scalars['String'];
     description: Scalars['String'];
     /** Any optional metadata returned by the ShippingCalculator in the ShippingCalculationResult */
@@ -2992,7 +2993,9 @@ export type RemoveItemFromOrderMutation = {
 export type GetShippingMethodsQueryVariables = Exact<{ [key: string]: never }>;
 
 export type GetShippingMethodsQuery = {
-    eligibleShippingMethods: Array<Pick<ShippingMethodQuote, 'id' | 'price' | 'name' | 'description'>>;
+    eligibleShippingMethods: Array<
+        Pick<ShippingMethodQuote, 'id' | 'code' | 'price' | 'name' | 'description'>
+    >;
 };
 
 export type SetShippingMethodMutationVariables = Exact<{

diff --git a/packages/core/e2e/graphql/shop-definitions.ts b/packages/core/e2e/graphql/shop-definitions.ts
@@ -392,6 +392,7 @@ export const GET_ELIGIBLE_SHIPPING_METHODS = gql`
     query GetShippingMethods {
         eligibleShippingMethods {
             id
+            code
             price
             name
             description

diff --git a/packages/core/e2e/shop-order.e2e-spec.ts b/packages/core/e2e/shop-order.e2e-spec.ts
@@ -876,8 +876,20 @@ describe('Shop orders', () => {
                 shippingMethods = result.eligibleShippingMethods;
 
                 expect(shippingMethods).toEqual([
-                    { id: 'T_1', price: 500, name: 'Standard Shipping', description: '' },
-                    { id: 'T_2', price: 1000, name: 'Express Shipping', description: '' },
+                    {
+                        id: 'T_1',
+                        price: 500,
+                        code: 'standard-shipping',
+                        name: 'Standard Shipping',
+                        description: '',
+                    },
+                    {
+                        id: 'T_2',
+                        price: 1000,
+                        code: 'express-shipping',
+                        name: 'Express Shipping',
+                        description: '',
+                    },
                 ]);
             });
 

diff --git a/packages/core/src/api/schema/common/common-types.graphql b/packages/core/src/api/schema/common/common-types.graphql
@@ -178,6 +178,7 @@ type ShippingMethodQuote {
     id: ID!
     price: Int!
     priceWithTax: Int!
+    code: String!
     name: String!
     description: String!
     "Any optional metadata returned by the ShippingCalculator in the ShippingCalculationResult"

diff --git a/packages/core/src/service/services/order-testing.service.ts b/packages/core/src/service/services/order-testing.service.ts
@@ -93,6 +93,7 @@ export class OrderTestingService {
                     price: priceIncludesTax ? netPriceOf(price, taxRate) : price,
                     priceWithTax: priceIncludesTax ? price : grossPriceOf(price, taxRate),
                     name: result.method.name,
+                    code: result.method.code,
                     description: result.method.description,
                     metadata: result.result.metadata,
                 };

diff --git a/packages/core/src/service/services/order.service.ts b/packages/core/src/service/services/order.service.ts
@@ -603,6 +603,7 @@ export class OrderService {
                 priceWithTax: priceIncludesTax ? price : grossPriceOf(price, taxRate),
                 description: eligible.method.description,
                 name: eligible.method.name,
+                code: eligible.method.code,
                 metadata,
             };
         });

diff --git a/packages/elasticsearch-plugin/e2e/graphql/generated-e2e-elasticsearch-plugin-types.ts b/packages/elasticsearch-plugin/e2e/graphql/generated-e2e-elasticsearch-plugin-types.ts
@@ -2764,6 +2764,7 @@ export type ShippingMethodQuote = {
     id: Scalars['ID'];
     price: Scalars['Int'];
     priceWithTax: Scalars['Int'];
+    code: Scalars['String'];
     name: Scalars['String'];
     description: Scalars['String'];
     /** Any optional metadata returned by the ShippingCalculator in the ShippingCalculationResult */

diff --git a/schema-admin.json b/schema-admin.json
diff --git a/schema-shop.json b/schema-shop.json
-Original file line number
+Diff line change
@@ Expand Up / @@ -392,6 +392,7 @@ export const GET_ELIGIBLE_SHIPPING_METHODS = gql` @@
         query GetShippingMethods {
             eligibleShippingMethods {
                 id
+                code
                 price
                 name
                 description
@@ Expand Down @@