npm - @vendure/core - Versions diffs - 2.1.7 → 2.1.8 - Mend

@vendure/core 2.1.7 → 2.1.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (30) hide show

package/dist/api/api-internal-modules.d.ts CHANGED Viewed

@@ -26,8 +26,8 @@ import { ShippingMethodEntityResolver } from './resolvers/entity/shipping-method
 import { TaxRateEntityResolver } from './resolvers/entity/tax-rate-entity.resolver';
 import { UserEntityResolver } from './resolvers/entity/user-entity.resolver';
 import { ZoneEntityResolver } from './resolvers/entity/zone-entity.resolver';
-export declare const entityResolvers: (typeof AssetEntityResolver | typeof ChannelEntityResolver | typeof CollectionEntityResolver | typeof CountryEntityResolver | typeof CustomerEntityResolver | typeof CustomerGroupEntityResolver | typeof FacetEntityResolver | typeof FacetValueEntityResolver | typeof FulfillmentEntityResolver | typeof FulfillmentLineEntityResolver | typeof OrderEntityResolver | typeof OrderLineEntityResolver | typeof PaymentEntityResolver | typeof ProductEntityResolver | typeof ProductOptionEntityResolver | typeof ProductOptionGroupEntityResolver | typeof ProductVariantEntityResolver | typeof RefundEntityResolver | typeof RefundLineEntityResolver | typeof RoleEntityResolver | typeof ShippingLineEntityResolver | typeof ShippingMethodEntityResolver | typeof TaxRateEntityResolver | typeof UserEntityResolver | typeof ZoneEntityResolver)[];
-export declare const adminEntityResolvers: (typeof AdministratorEntityResolver | typeof CustomerAdminEntityResolver | typeof FulfillmentAdminEntityResolver | typeof JobEntityResolver | typeof OrderAdminEntityResolver | typeof PaymentAdminEntityResolver | typeof PaymentMethodEntityResolver | typeof ProductAdminEntityResolver | typeof ProductVariantAdminEntityResolver)[];
+export declare const entityResolvers: (typeof AssetEntityResolver | typeof ChannelEntityResolver | typeof CollectionEntityResolver | typeof CountryEntityResolver | typeof CustomerEntityResolver | typeof CustomerGroupEntityResolver | typeof FacetEntityResolver | typeof FacetValueEntityResolver | typeof FulfillmentEntityResolver | typeof FulfillmentLineEntityResolver | typeof OrderEntityResolver | typeof OrderLineEntityResolver | typeof PaymentEntityResolver | typeof ProductEntityResolver | typeof ProductOptionEntityResolver | typeof ProductOptionGroupEntityResolver | typeof ProductVariantEntityResolver | typeof RefundEntityResolver | typeof RefundLineEntityResolver | typeof RoleEntityResolver | typeof ShippingLineEntityResolver | typeof UserEntityResolver | typeof TaxRateEntityResolver | typeof ShippingMethodEntityResolver | typeof ZoneEntityResolver)[];
+export declare const adminEntityResolvers: (typeof AdministratorEntityResolver | typeof CustomerAdminEntityResolver | typeof OrderAdminEntityResolver | typeof PaymentMethodEntityResolver | typeof FulfillmentAdminEntityResolver | typeof PaymentAdminEntityResolver | typeof ProductVariantAdminEntityResolver | typeof ProductAdminEntityResolver | typeof JobEntityResolver)[];
 /**
  * The internal module containing some shared providers used by more than
  * one API module.

package/dist/api/resolvers/admin/order.resolver.d.ts CHANGED Viewed

@@ -26,7 +26,7 @@ export declare class OrderResolver {
     deleteOrderNote(ctx: RequestContext, args: MutationDeleteOrderNoteArgs): Promise<import("@vendure/common/lib/generated-types").DeletionResponse>;
     setOrderCustomFields(ctx: RequestContext, args: MutationSetOrderCustomFieldsArgs): Promise<Order>;
     transitionOrderToState(ctx: RequestContext, args: MutationTransitionOrderToStateArgs): Promise<Order | import("../../../common/error/generated-graphql-shop-errors").OrderStateTransitionError>;
-    transitionFulfillmentToState(ctx: RequestContext, args: MutationTransitionFulfillmentToStateArgs): Promise<import("../../../index").FulfillmentStateTransitionError | Fulfillment>;
+    transitionFulfillmentToState(ctx: RequestContext, args: MutationTransitionFulfillmentToStateArgs): Promise<Fulfillment | import("../../../index").FulfillmentStateTransitionError>;
     transitionPaymentToState(ctx: RequestContext, args: MutationTransitionPaymentToStateArgs): Promise<ErrorResultUnion<TransitionPaymentToStateResult, Payment>>;
     modifyOrder(ctx: RequestContext, args: MutationModifyOrderArgs): Promise<ErrorResultUnion<import("@vendure/common/lib/generated-types").ModifyOrderResult, Order, any>>;
     addManualPaymentToOrder(ctx: RequestContext, args: MutationAddManualPaymentToOrderArgs): Promise<ErrorResultUnion<import("@vendure/common/lib/generated-types").AddManualPaymentToOrderResult, Order, any>>;

package/dist/api/resolvers/entity/order-entity.resolver.d.ts CHANGED Viewed

@@ -1,20 +1,20 @@
 import { OrderHistoryArgs } from '@vendure/common/lib/generated-types';
 import { Order } from '../../../entity/order/order.entity';
-import { TranslatorService } from '../../../service/index';
+import { CustomerService, TranslatorService } from '../../../service/index';
 import { HistoryService } from '../../../service/services/history.service';
 import { OrderService } from '../../../service/services/order.service';
-import { ShippingMethodService } from '../../../service/services/shipping-method.service';
 import { ApiType } from '../../common/get-api-type';
 import { RequestContext } from '../../common/request-context';
 export declare class OrderEntityResolver {
     private orderService;
-    private shippingMethodService;
+    private customerService;
     private historyService;
     private translator;
-    constructor(orderService: OrderService, shippingMethodService: ShippingMethodService, historyService: HistoryService, translator: TranslatorService);
+    constructor(orderService: OrderService, customerService: CustomerService, historyService: HistoryService, translator: TranslatorService);
     payments(ctx: RequestContext, order: Order): Promise<import("../../../index").Payment[]>;
     fulfillments(ctx: RequestContext, order: Order): Promise<import("../../../index").Fulfillment[]>;
     surcharges(ctx: RequestContext, order: Order): Promise<import("../../../index").Surcharge[]>;
+    customer(ctx: RequestContext, order: Order): Promise<import("../../../index").Customer | undefined>;
     lines(ctx: RequestContext, order: Order): Promise<import("../../../index").OrderLine[]>;
     history(ctx: RequestContext, apiType: ApiType, order: Order, args: OrderHistoryArgs): Promise<import("@vendure/common/lib/shared-types").PaginatedList<import("../../../entity/history-entry/order-history-entry.entity").OrderHistoryEntry>>;
     promotions(ctx: RequestContext, order: Order): Promise<import("../../../index").Promotion[]>;

package/dist/api/resolvers/entity/order-entity.resolver.js CHANGED Viewed

@@ -20,14 +20,13 @@ const order_entity_1 = require("../../../entity/order/order.entity");
 const index_1 = require("../../../service/index");
 const history_service_1 = require("../../../service/services/history.service");
 const order_service_1 = require("../../../service/services/order.service");
-const shipping_method_service_1 = require("../../../service/services/shipping-method.service");
 const request_context_1 = require("../../common/request-context");
 const api_decorator_1 = require("../../decorators/api.decorator");
 const request_context_decorator_1 = require("../../decorators/request-context.decorator");
 let OrderEntityResolver = class OrderEntityResolver {
-    constructor(orderService, shippingMethodService, historyService, translator) {
+    constructor(orderService, customerService, historyService, translator) {
         this.orderService = orderService;
-        this.shippingMethodService = shippingMethodService;
+        this.customerService = customerService;
         this.historyService = historyService;
         this.translator = translator;
     }
@@ -49,6 +48,14 @@ let OrderEntityResolver = class OrderEntityResolver {
         }
         return this.orderService.getOrderSurcharges(ctx, order.id);
     }
+    async customer(ctx, order) {
+        if (order.customer) {
+            return order.customer;
+        }
+        if (order.customerId) {
+            return this.customerService.findOne(ctx, order.customerId);
+        }
+    }
     async lines(ctx, order) {
         if (order.lines) {
             return order.lines;
@@ -99,6 +106,14 @@ __decorate([
     __metadata("design:paramtypes", [request_context_1.RequestContext, order_entity_1.Order]),
     __metadata("design:returntype", Promise)
 ], OrderEntityResolver.prototype, "surcharges", null);
+__decorate([
+    (0, graphql_1.ResolveField)(),
+    __param(0, (0, request_context_decorator_1.Ctx)()),
+    __param(1, (0, graphql_1.Parent)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [request_context_1.RequestContext, order_entity_1.Order]),
+    __metadata("design:returntype", Promise)
+], OrderEntityResolver.prototype, "customer", null);
 __decorate([
     (0, graphql_1.ResolveField)(),
     __param(0, (0, request_context_decorator_1.Ctx)()),
@@ -128,7 +143,7 @@ __decorate([
 OrderEntityResolver = __decorate([
     (0, graphql_1.Resolver)('Order'),
     __metadata("design:paramtypes", [order_service_1.OrderService,
-        shipping_method_service_1.ShippingMethodService,
+        index_1.CustomerService,
         history_service_1.HistoryService,
         index_1.TranslatorService])
 ], OrderEntityResolver);

package/dist/api/resolvers/entity/order-entity.resolver.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"order-entity.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/entity/order-entity.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAuE;AACvE,yEAA2G;AAE3G,iDAAiE;AACjE,qEAA2D;~~AAE3D~~,~~kDAA2D~~;~~AAC3D~~,+EAA2E;AAC3E,2EAAuE;~~AACvE,+FAA0F;AAE1F~~,kEAA8D;AAC9D,kEAAqD;AACrD,0FAAiE;AAG1D,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC5B,YACY,YAA0B,EAC1B,~~qBAA4C~~,~~EAC5C~~,cAA8B,EAC9B,UAA6B;QAH7B,iBAAY,GAAZ,YAAY,CAAc;QAC1B,~~0BAAqB~~,~~GAArB~~,~~qBAAqB~~,~~CAAuB~~;~~QAC5C~~,mBAAc,GAAd,cAAc,CAAgB;QAC9B,eAAU,GAAV,UAAU,CAAmB;IACtC,CAAC;IAGE,AAAN,KAAK,CAAC,QAAQ,CAAQ,GAAmB,EAAY,KAAY;QAC7D,IAAI,KAAK,CAAC,QAAQ,EAAE;YAChB,OAAO,KAAK,CAAC,QAAQ,CAAC;SACzB;QACD,OAAO,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;IAC7D,CAAC;IAGK,AAAN,KAAK,CAAC,YAAY,CAAQ,GAAmB,EAAY,KAAY;QACjE,IAAI,KAAK,CAAC,YAAY,EAAE;YACpB,OAAO,KAAK,CAAC,YAAY,CAAC;SAC7B;QACD,OAAO,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAC9D,CAAC;IAGK,AAAN,KAAK,CAAC,UAAU,CAAQ,GAAmB,EAAY,KAAY;QAC/D,IAAI,KAAK,CAAC,UAAU,EAAE;YAClB,OAAO,KAAK,CAAC,UAAU,CAAC;SAC3B;QACD,OAAO,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;IAC/D,CAAC;IAGK,AAAN,KAAK,CAAC,KAAK,CAAQ,GAAmB,EAAY,KAAY;QAC1D,IAAI,KAAK,CAAC,KAAK,EAAE;YACb,OAAO,KAAK,CAAC,KAAK,CAAC;SACtB;QACD,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAA,mBAAW,EAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;QAC9E,OAAO,KAAK,CAAC;IACjB,CAAC;IAGK,AAAN,KAAK,CAAC,OAAO,CACF,GAAmB,EACnB,OAAgB,EACb,KAAY,EACd,IAAsB;QAE9B,MAAM,UAAU,GAAG,OAAO,KAAK,MAAM,CAAC;QACtC,MAAM,OAAO,qBAAiC,IAAI,CAAC,OAAO,CAAE,CAAC;QAC7D,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;YACf,OAAO,CAAC,IAAI,GAAG,EAAE,SAAS,EAAE,2BAAS,CAAC,GAAG,EAAE,CAAC;SAC/C;QACD,OAAO,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;IACtF,CAAC;IAGK,AAAN,KAAK,CAAC,UAAU,CAAQ,GAAmB,EAAY,KAAY;QAC/D,oFAAoF;QACpF,gDAAgD;QAChD,IACI,KAAK,CAAC,UAAU;YAChB,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC;gBAC1B,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,EACxE;YACE,OAAO,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;SACvE;QACD,OAAO,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;IAC/D,CAAC;CACJ,CAAA;~~AA5DS~~;IADL,IAAA,sBAAY,GAAE;IACC,WAAA,IAAA,+BAAG,GAAE,CAAA;IAAuB,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCAAzB,gCAAc,EAAmB,oBAAK;;mDAKhE;AAGK;IADL,IAAA,sBAAY,GAAE;IACK,WAAA,IAAA,+BAAG,GAAE,CAAA;IAAuB,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCAAzB,gCAAc,EAAmB,oBAAK;;uDAKpE;AAGK;IADL,IAAA,sBAAY,GAAE;IACG,WAAA,IAAA,+BAAG,GAAE,CAAA;IAAuB,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCAAzB,gCAAc,EAAmB,oBAAK;;qDAKlE;AAGK;IADL,IAAA,sBAAY,GAAE;IACF,WAAA,IAAA,+BAAG,GAAE,CAAA;IAAuB,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCAAzB,gCAAc,EAAmB,oBAAK;;gDAM7D;AAGK;IADL,IAAA,sBAAY,GAAE;IAEV,WAAA,IAAA,+BAAG,GAAE,CAAA;IACL,WAAA,IAAA,mBAAG,GAAE,CAAA;IACL,WAAA,IAAA,gBAAM,GAAE,CAAA;IACR,WAAA,IAAA,cAAI,GAAE,CAAA;;qCAHK,gCAAc,UAET,oBAAK;;kDASzB;AAGK;IADL,IAAA,sBAAY,GAAE;IACG,WAAA,IAAA,+BAAG,GAAE,CAAA;IAAuB,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCAAzB,gCAAc,EAAmB,oBAAK;;qDAWlE;~~AApEQ~~,mBAAmB;IAD/B,IAAA,kBAAQ,EAAC,OAAO,CAAC;qCAGY,4BAAY;~~QACH,+CAAqB~~;~~QAC5B~~,gCAAc;QAClB,yBAAiB;GALhC,mBAAmB,~~CAqE~~/B;~~AArEY~~,kDAAmB;~~AAwEzB~~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"}
1	+ {"version":3,"file":"order-entity.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/entity/order-entity.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAuE;AACvE,yEAA2G;AAE3G,iDAAiE;AACjE,qEAA2D;AAC3D,kDAA4E;AAC5E,+EAA2E;AAC3E,2EAAuE;AAEvE,kEAA8D;AAC9D,kEAAqD;AACrD,0FAAiE;AAG1D,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC5B,YACY,YAA0B,EAC1B,eAAgC,EAChC,cAA8B,EAC9B,UAA6B;QAH7B,iBAAY,GAAZ,YAAY,CAAc;QAC1B,oBAAe,GAAf,eAAe,CAAiB;QAChC,mBAAc,GAAd,cAAc,CAAgB;QAC9B,eAAU,GAAV,UAAU,CAAmB;IACtC,CAAC;IAGE,AAAN,KAAK,CAAC,QAAQ,CAAQ,GAAmB,EAAY,KAAY;QAC7D,IAAI,KAAK,CAAC,QAAQ,EAAE;YAChB,OAAO,KAAK,CAAC,QAAQ,CAAC;SACzB;QACD,OAAO,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;IAC7D,CAAC;IAGK,AAAN,KAAK,CAAC,YAAY,CAAQ,GAAmB,EAAY,KAAY;QACjE,IAAI,KAAK,CAAC,YAAY,EAAE;YACpB,OAAO,KAAK,CAAC,YAAY,CAAC;SAC7B;QACD,OAAO,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAC9D,CAAC;IAGK,AAAN,KAAK,CAAC,UAAU,CAAQ,GAAmB,EAAY,KAAY;QAC/D,IAAI,KAAK,CAAC,UAAU,EAAE;YAClB,OAAO,KAAK,CAAC,UAAU,CAAC;SAC3B;QACD,OAAO,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;IAC/D,CAAC;IAGK,AAAN,KAAK,CAAC,QAAQ,CAAQ,GAAmB,EAAY,KAAY;QAC7D,IAAI,KAAK,CAAC,QAAQ,EAAE;YAChB,OAAO,KAAK,CAAC,QAAQ,CAAC;SACzB;QACD,IAAI,KAAK,CAAC,UAAU,EAAE;YAClB,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;SAC9D;IACL,CAAC;IAGK,AAAN,KAAK,CAAC,KAAK,CAAQ,GAAmB,EAAY,KAAY;QAC1D,IAAI,KAAK,CAAC,KAAK,EAAE;YACb,OAAO,KAAK,CAAC,KAAK,CAAC;SACtB;QACD,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAA,mBAAW,EAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;QAC9E,OAAO,KAAK,CAAC;IACjB,CAAC;IAGK,AAAN,KAAK,CAAC,OAAO,CACF,GAAmB,EACnB,OAAgB,EACb,KAAY,EACd,IAAsB;QAE9B,MAAM,UAAU,GAAG,OAAO,KAAK,MAAM,CAAC;QACtC,MAAM,OAAO,qBAAiC,IAAI,CAAC,OAAO,CAAE,CAAC;QAC7D,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE;YACf,OAAO,CAAC,IAAI,GAAG,EAAE,SAAS,EAAE,2BAAS,CAAC,GAAG,EAAE,CAAC;SAC/C;QACD,OAAO,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;IACtF,CAAC;IAGK,AAAN,KAAK,CAAC,UAAU,CAAQ,GAAmB,EAAY,KAAY;QAC/D,oFAAoF;QACpF,gDAAgD;QAChD,IACI,KAAK,CAAC,UAAU;YAChB,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC;gBAC1B,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,EACxE;YACE,OAAO,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;SACvE;QACD,OAAO,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;IAC/D,CAAC;CACJ,CAAA;AAtES;IADL,IAAA,sBAAY,GAAE;IACC,WAAA,IAAA,+BAAG,GAAE,CAAA;IAAuB,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCAAzB,gCAAc,EAAmB,oBAAK;;mDAKhE;AAGK;IADL,IAAA,sBAAY,GAAE;IACK,WAAA,IAAA,+BAAG,GAAE,CAAA;IAAuB,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCAAzB,gCAAc,EAAmB,oBAAK;;uDAKpE;AAGK;IADL,IAAA,sBAAY,GAAE;IACG,WAAA,IAAA,+BAAG,GAAE,CAAA;IAAuB,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCAAzB,gCAAc,EAAmB,oBAAK;;qDAKlE;AAGK;IADL,IAAA,sBAAY,GAAE;IACC,WAAA,IAAA,+BAAG,GAAE,CAAA;IAAuB,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCAAzB,gCAAc,EAAmB,oBAAK;;mDAOhE;AAGK;IADL,IAAA,sBAAY,GAAE;IACF,WAAA,IAAA,+BAAG,GAAE,CAAA;IAAuB,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCAAzB,gCAAc,EAAmB,oBAAK;;gDAM7D;AAGK;IADL,IAAA,sBAAY,GAAE;IAEV,WAAA,IAAA,+BAAG,GAAE,CAAA;IACL,WAAA,IAAA,mBAAG,GAAE,CAAA;IACL,WAAA,IAAA,gBAAM,GAAE,CAAA;IACR,WAAA,IAAA,cAAI,GAAE,CAAA;;qCAHK,gCAAc,UAET,oBAAK;;kDASzB;AAGK;IADL,IAAA,sBAAY,GAAE;IACG,WAAA,IAAA,+BAAG,GAAE,CAAA;IAAuB,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCAAzB,gCAAc,EAAmB,oBAAK;;qDAWlE;AA9EQ,mBAAmB;IAD/B,IAAA,kBAAQ,EAAC,OAAO,CAAC;qCAGY,4BAAY;QACT,uBAAe;QAChB,gCAAc;QAClB,yBAAiB;GALhC,mBAAmB,CA+E/B;AA/EY,kDAAmB;AAkFzB,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IACjC,YAAoB,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IAAG,CAAC;IAG5C,AAAN,KAAK,CAAC,QAAQ,CAAQ,GAAmB,EAAY,KAAY;;QAC7D,MAAM,QAAQ,GAAG,MAAA,KAAK,CAAC,QAAQ,mCAAI,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;QAC1F,OAAO,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,eAC7B,OAAA,MAAA,MAAA,GAAG,CAAC,OAAO,0CAAE,IAAI,0CAAE,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,IAAA,mBAAW,EAAC,EAAE,CAAC,EAAE,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC,CAAA,EAAA,CACnF,CAAC;IACN,CAAC;IAGK,AAAN,KAAK,CAAC,aAAa,CAAQ,GAAmB,EAAY,KAAY;QAClE,IAAI,KAAK,CAAC,aAAa,EAAE;YACrB,OAAO,KAAK,CAAC,aAAa,CAAC;SAC9B;QACD,OAAO,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;IAClE,CAAC;IAGK,AAAN,KAAK,CAAC,UAAU,CAAW,KAAY;QACnC,OAAO,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;IACvD,CAAC;IAGK,AAAN,KAAK,CAAC,YAAY,CAAQ,GAAmB,EAAY,KAAY;;QACjE,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACzE,mFAAmF;QACnF,MAAM,cAAc,GAAG,MAAA,MAAA,MAAA,GAAG,CAAC,OAAO,0CAAE,IAAI,0CAAE,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,mCAAI,EAAE,CAAC;QACpF,OAAO,YAAY,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CACrC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAChE,CAAC;IACN,CAAC;IAGK,AAAN,KAAK,CAAC,cAAc,CAAQ,GAAmB,EAAY,KAAY;;QACnE,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC7E,MAAM,cAAc,GAAG,MAAA,MAAA,MAAA,GAAG,CAAC,OAAO,0CAAE,IAAI,0CAAE,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,mCAAI,EAAE,CAAC;QACpF,qFAAqF;QACrF,OAAO,cAAc;YACjB,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,IAAA,mBAAW,EAAC,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;YAC/F,CAAC,CAAC,cAAc;YAChB,CAAC,CAAC,SAAS,CAAC;IACpB,CAAC;CACJ,CAAA;AAxCS;IADL,IAAA,sBAAY,GAAE;IACC,WAAA,IAAA,+BAAG,GAAE,CAAA;IAAuB,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCAAzB,gCAAc,EAAmB,oBAAK;;wDAKhE;AAGK;IADL,IAAA,sBAAY,GAAE;IACM,WAAA,IAAA,+BAAG,GAAE,CAAA;IAAuB,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCAAzB,gCAAc,EAAmB,oBAAK;;6DAKrE;AAGK;IADL,IAAA,sBAAY,GAAE;IACG,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCAAQ,oBAAK;;0DAEtC;AAGK;IADL,IAAA,sBAAY,GAAE;IACK,WAAA,IAAA,+BAAG,GAAE,CAAA;IAAuB,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCAAzB,gCAAc,EAAmB,oBAAK;;4DAOpE;AAGK;IADL,IAAA,sBAAY,GAAE;IACO,WAAA,IAAA,+BAAG,GAAE,CAAA;IAAuB,WAAA,IAAA,gBAAM,GAAE,CAAA;;qCAAzB,gCAAc,EAAmB,oBAAK;;8DAQtE;AA3CQ,wBAAwB;IADpC,IAAA,kBAAQ,EAAC,OAAO,CAAC;qCAEoB,4BAAY;GADrC,wBAAwB,CA4CpC;AA5CY,4DAAwB"}

package/dist/api/schema/common/common-types.graphql CHANGED Viewed

@@ -198,6 +198,13 @@ input CreateCustomerInput {
     emailAddress: String!
 }
+"""
+Input used to create an Address.
+The countryCode must correspond to a `code` property of a Country that has been defined in the
+Vendure server. The `code` property is typically a 2-character ISO code such as "GB", "US", "DE" etc.
+If an invalid code is passed, the mutation will fail.
+"""
 input CreateAddressInput {
     fullName: String
     company: String
@@ -212,6 +219,13 @@ input CreateAddressInput {
     defaultBillingAddress: Boolean
 }
+"""
+Input used to update an Address.
+The countryCode must correspond to a `code` property of a Country that has been defined in the
+Vendure server. The `code` property is typically a 2-character ISO code such as "GB", "US", "DE" etc.
+If an invalid code is passed, the mutation will fail.
+"""
 input UpdateAddressInput {
     id: ID!
     fullName: String

package/dist/api/schema/common/region.type.graphql CHANGED Viewed

@@ -20,6 +20,12 @@ type RegionTranslation {
     name: String!
 }
+"""
+A Country of the world which your shop operates in.
+The `code` field is typically a 2-character ISO code such as "GB", "US", "DE" etc. This code is used in certain inputs such as
+`UpdateAddressInput` and `CreateAddressInput` to specify the country.
+"""
 type Country implements Region & Node {
     id: ID!
     createdAt: DateTime!

package/dist/config/index.d.ts CHANGED Viewed

@@ -51,6 +51,7 @@ export * from './order/default-stock-allocation-strategy';
 export * from './order/default-guest-checkout-strategy';
 export * from './order/guest-checkout-strategy';
 export * from './order/merge-orders-strategy';
+export * from './order/order-by-code-access-strategy';
 export * from './order/order-code-strategy';
 export * from './order/order-item-price-calculation-strategy';
 export * from './order/order-merge-strategy';

package/dist/config/index.js CHANGED Viewed

@@ -67,6 +67,7 @@ __exportStar(require("./order/default-stock-allocation-strategy"), exports);
 __exportStar(require("./order/default-guest-checkout-strategy"), exports);
 __exportStar(require("./order/guest-checkout-strategy"), exports);
 __exportStar(require("./order/merge-orders-strategy"), exports);
+__exportStar(require("./order/order-by-code-access-strategy"), exports);
 __exportStar(require("./order/order-code-strategy"), exports);
 __exportStar(require("./order/order-item-price-calculation-strategy"), exports);
 __exportStar(require("./order/order-merge-strategy"), exports);

package/dist/config/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gFAA8D;AAC9D,gFAA8D;AAC9D,wFAAsE;AACtE,kFAAgE;AAChE,kFAAgE;AAChE,iEAA+C;AAC/C,0EAAwD;AACxD,8EAA4D;AAC5D,wEAAsD;AACtD,mEAAiD;AACjD,sEAAoD;AACpD,8DAA4C;AAC5C,uEAAqD;AACrD,6FAA2E;AAC3E,2EAAyD;AACzD,4EAA0D;AAC1D,uFAAqE;AACrE,qFAAmE;AACnE,mEAAiD;AACjD,oEAAkD;AAClD,kDAAgC;AAChC,mDAAiC;AACjC,mDAAiC;AACjC,oEAAkD;AAClD,mDAAiC;AACjC,sEAAoD;AACpD,kEAAgD;AAChD,iEAA+C;AAC/C,8DAA4C;AAC5C,0DAAwC;AACxC,4DAA0C;AAC1C,6EAA2D;AAC3D,4EAA0D;AAC1D,oEAAkD;AAClD,oEAAkD;AAClD,2EAAyD;AACzD,6EAA2D;AAC3D,iEAA+C;AAC/C,0DAAwC;AACxC,uDAAqC;AACrC,0DAAwC;AACxC,iDAA+B;AAC/B,gEAA8C;AAC9C,0EAAwD;AACxD,wEAAsD;AACtD,kFAAgE;AAChE,wEAAsD;AACtD,gEAA8C;AAC9C,wEAAsD;AACtD,4EAA0D;AAC1D,0EAAwD;AACxD,kEAAgD;AAChD,gEAA8C;AAC9C,8DAA4C;AAC5C,gFAA8D;AAC9D,+DAA6C;AAC7C,gEAA8C;AAC9C,wDAAsC;AACtC,gEAA8C;AAC9C,oEAAkD;AAClD,gEAA8C;AAC9C,+EAA6D;AAC7D,6DAA2C;AAC3C,oEAAkD;AAClD,yEAAuD;AACvD,2EAAyD;AACzD,+EAA6D;AAC7D,mEAAiD;AACjD,4DAA0C;AAC1C,8CAA4B;AAC5B,mFAAiE;AACjE,8EAA4D;AAC5D,yEAAuD;AACvD,gFAA8D;AAC9D,yFAAuE;AACvE,8FAA4E;AAC5E,wEAAsD;AACtD,iFAA+D;AAC/D,sFAAoE;AACpE,iEAA+C;AAC/C,8EAA4D;AAC5D,kEAAgD;AAChD,sEAAoD;AACpD,0DAAwC;AACxC,mDAAiC"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gFAA8D;AAC9D,gFAA8D;AAC9D,wFAAsE;AACtE,kFAAgE;AAChE,kFAAgE;AAChE,iEAA+C;AAC/C,0EAAwD;AACxD,8EAA4D;AAC5D,wEAAsD;AACtD,mEAAiD;AACjD,sEAAoD;AACpD,8DAA4C;AAC5C,uEAAqD;AACrD,6FAA2E;AAC3E,2EAAyD;AACzD,4EAA0D;AAC1D,uFAAqE;AACrE,qFAAmE;AACnE,mEAAiD;AACjD,oEAAkD;AAClD,kDAAgC;AAChC,mDAAiC;AACjC,mDAAiC;AACjC,oEAAkD;AAClD,mDAAiC;AACjC,sEAAoD;AACpD,kEAAgD;AAChD,iEAA+C;AAC/C,8DAA4C;AAC5C,0DAAwC;AACxC,4DAA0C;AAC1C,6EAA2D;AAC3D,4EAA0D;AAC1D,oEAAkD;AAClD,oEAAkD;AAClD,2EAAyD;AACzD,6EAA2D;AAC3D,iEAA+C;AAC/C,0DAAwC;AACxC,uDAAqC;AACrC,0DAAwC;AACxC,iDAA+B;AAC/B,gEAA8C;AAC9C,0EAAwD;AACxD,wEAAsD;AACtD,kFAAgE;AAChE,wEAAsD;AACtD,gEAA8C;AAC9C,wEAAsD;AACtD,4EAA0D;AAC1D,0EAAwD;AACxD,kEAAgD;AAChD,gEAA8C;AAC9C,wEAAsD;AACtD,8DAA4C;AAC5C,gFAA8D;AAC9D,+DAA6C;AAC7C,gEAA8C;AAC9C,wDAAsC;AACtC,gEAA8C;AAC9C,oEAAkD;AAClD,gEAA8C;AAC9C,+EAA6D;AAC7D,6DAA2C;AAC3C,oEAAkD;AAClD,yEAAuD;AACvD,2EAAyD;AACzD,+EAA6D;AAC7D,mEAAiD;AACjD,4DAA0C;AAC1C,8CAA4B;AAC5B,mFAAiE;AACjE,8EAA4D;AAC5D,yEAAuD;AACvD,gFAA8D;AAC9D,yFAAuE;AACvE,8FAA4E;AAC5E,wEAAsD;AACtD,iFAA+D;AAC/D,sFAAoE;AACpE,iEAA+C;AAC/C,8EAA4D;AAC5D,kEAAgD;AAChD,sEAAoD;AACpD,0DAAwC;AACxC,mDAAiC"}

package/dist/config/promotion/index.d.ts CHANGED Viewed

@@ -12,42 +12,22 @@ export * from './conditions/contains-products-condition';
 export * from './conditions/customer-group-condition';
 export * from './conditions/buy-x-get-y-free-condition';
 export * from './utils/facet-value-checker';
-export declare const defaultPromotionActions: (import("./promotion-action").PromotionItemAction<{}, import("./promotion-condition").PromotionCondition<{
-    amountX: {
+export declare const defaultPromotionActions: (import("./promotion-action").PromotionOrderAction<{
+    discount: {
         type: "int";
-        defaultValue: number;
-    };
-    variantIdsX: {
-        type: "ID";
-        list: true;
         ui: {
             component: string;
         };
-        label: {
-            languageCode: import("@vendure/common/lib/generated-types").LanguageCode.en;
-            value: string;
-        }[];
-    };
-    amountY: {
-        type: "int";
-        defaultValue: number;
     };
-    variantIdsY: {
-        type: "ID";
-        list: true;
+}, []> | import("./promotion-action").PromotionOrderAction<{
+    discount: {
+        type: "float";
         ui: {
             component: string;
+            suffix: string;
         };
-        label: {
-            languageCode: import("@vendure/common/lib/generated-types").LanguageCode.en;
-            value: string;
-        }[];
-    };
-}, "buy_x_get_y_free", false | {
-    freeItemsPerLine: {
-        [lineId: string]: number;
     };
-}>[]> | import("./promotion-action").PromotionItemAction<{
+}, []> | import("./promotion-action").PromotionItemAction<{
     discount: {
         type: "float";
         ui: {
@@ -62,21 +42,6 @@ export declare const defaultPromotionActions: (import("./promotion-action").Prom
             component: string;
         };
     };
-}, []> | import("./promotion-action").PromotionShippingAction<{}, []> | import("./promotion-action").PromotionOrderAction<{
-    discount: {
-        type: "int";
-        ui: {
-            component: string;
-        };
-    };
-}, []> | import("./promotion-action").PromotionOrderAction<{
-    discount: {
-        type: "float";
-        ui: {
-            component: string;
-            suffix: string;
-        };
-    };
 }, []> | import("./promotion-action").PromotionItemAction<{
     discount: {
         type: "float";
@@ -96,8 +61,7 @@ export declare const defaultPromotionActions: (import("./promotion-action").Prom
             value: string;
         }[];
     };
-}, []>)[];
-export declare const defaultPromotionConditions: (import("./promotion-condition").PromotionCondition<{
+}, []> | import("./promotion-action").PromotionShippingAction<{}, []> | import("./promotion-action").PromotionItemAction<{}, import("./promotion-condition").PromotionCondition<{
     amountX: {
         type: "int";
         defaultValue: number;
@@ -132,7 +96,32 @@ export declare const defaultPromotionConditions: (import("./promotion-condition"
     freeItemsPerLine: {
         [lineId: string]: number;
     };
-}> | import("./promotion-condition").PromotionCondition<{
+}>[]>)[];
+export declare const defaultPromotionConditions: (import("./promotion-condition").PromotionCondition<{
+    amount: {
+        type: "int";
+        defaultValue: number;
+        ui: {
+            component: string;
+        };
+    };
+    taxInclusive: {
+        type: "boolean";
+        defaultValue: false;
+    };
+}, "minimum_order_amount", boolean> | import("./promotion-condition").PromotionCondition<{
+    minimum: {
+        type: "int";
+        defaultValue: number;
+    };
+    facets: {
+        type: "ID";
+        list: true;
+        ui: {
+            component: string;
+        };
+    };
+}, "at_least_n_with_facets", boolean> | import("./promotion-condition").PromotionCondition<{
     minimum: {
         type: "int";
         defaultValue: number;
@@ -160,27 +149,38 @@ export declare const defaultPromotionConditions: (import("./promotion-condition"
         }[];
     };
 }, "customer_group", boolean> | import("./promotion-condition").PromotionCondition<{
-    minimum: {
+    amountX: {
         type: "int";
         defaultValue: number;
     };
-    facets: {
+    variantIdsX: {
         type: "ID";
         list: true;
         ui: {
             component: string;
         };
+        label: {
+            languageCode: import("@vendure/common/lib/generated-types").LanguageCode.en;
+            value: string;
+        }[];
     };
-}, "at_least_n_with_facets", boolean> | import("./promotion-condition").PromotionCondition<{
-    amount: {
+    amountY: {
         type: "int";
         defaultValue: number;
+    };
+    variantIdsY: {
+        type: "ID";
+        list: true;
         ui: {
             component: string;
         };
+        label: {
+            languageCode: import("@vendure/common/lib/generated-types").LanguageCode.en;
+            value: string;
+        }[];
     };
-    taxInclusive: {
-        type: "boolean";
-        defaultValue: false;
+}, "buy_x_get_y_free", false | {
+    freeItemsPerLine: {
+        [lineId: string]: number;
     };
-}, "minimum_order_amount", boolean>)[];
+}>)[];

package/dist/connection/connection.module.d.ts CHANGED Viewed

@@ -3,5 +3,5 @@ import { DataSourceOptions } from 'typeorm';
 export declare class ConnectionModule {
     static forRoot(): DynamicModule;
     static forPlugin(): DynamicModule;
-    static getTypeOrmLogger(dbConnectionOptions: DataSourceOptions): import("typeorm").Logger | "debug" | "advanced-console" | "simple-console" | "file";
+    static getTypeOrmLogger(dbConnectionOptions: DataSourceOptions): "debug" | "advanced-console" | "simple-console" | "file" | import("typeorm").Logger;
 }

package/dist/entity/register-custom-entity-fields.js CHANGED Viewed

@@ -93,7 +93,7 @@ ctor, translation = false) {
                 }
             }
             const relationFieldsCount = customFields.filter(f => f.type === 'relation').length;
-            const nonLocaleStringFieldsCount = customFields.filter(f => f.type !== 'localeString' && f.type !== 'relation').length;
+            const nonLocaleStringFieldsCount = customFields.filter(f => f.type !== 'localeString' && f.type !== 'localeText' && f.type !== 'relation').length;
             if (0 < relationFieldsCount && nonLocaleStringFieldsCount === 0) {
                 // if (customFields.filter(f => f.type === 'relation').length === customFields.length) {
                 // If there are _only_ relational customFields defined for an Entity, then TypeORM

package/dist/entity/register-custom-entity-fields.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"register-custom-entity-fields.js","sourceRoot":"","sources":["../../src/entity/register-custom-entity-fields.ts"],"names":[],"mappings":"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~~CAC1D~~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"}
1	+ {"version":3,"file":"register-custom-entity-fields.js","sourceRoot":"","sources":["../../src/entity/register-custom-entity-fields.ts"],"names":[],"mappings":"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"}

package/dist/service/helpers/entity-hydrator/entity-hydrator.service.js CHANGED Viewed

@@ -226,6 +226,9 @@ let EntityHydrator = class EntityHydrator {
                     }
                 }
             }
+            else if (target === null) {
+                result.push(target);
+            }
             else {
                 if (parts.length === 0) {
                     result.push(target);

package/dist/service/helpers/entity-hydrator/entity-hydrator.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"entity-hydrator.service.js","sourceRoot":"","sources":["../../../../src/service/helpers/entity-hydrator/entity-hydrator.service.ts"],"names":[],"mappings":"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~~AAzQY~~,cAAc;IAD1B,IAAA,mBAAU,GAAE;qCAGe,kDAAuB;QACX,iDAAsB;QAClC,sCAAiB;GAJhC,cAAc,~~CAyQ1B~~;~~AAzQY~~,wCAAc"}
1	+ {"version":3,"file":"entity-hydrator.service.js","sourceRoot":"","sources":["../../../../src/service/helpers/entity-hydrator/entity-hydrator.service.ts"],"names":[],"mappings":"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"}

package/dist/service/helpers/order-modifier/order-modifier.d.ts CHANGED Viewed

@@ -52,8 +52,16 @@ export declare class OrderModifier {
      * @description
      * Ensure that the ProductVariant has sufficient saleable stock to add the given
      * quantity to an Order.
+     *
+     * - `existingOrderLineQuantity` is used when adding an item to the order, since if an OrderLine
+     * already exists then we will be adding the new quantity to the existing quantity.
+     * - `quantityInOtherOrderLines` is used when we have more than 1 OrderLine containing the same
+     * ProductVariant. This occurs when there are custom fields defined on the OrderLine and the lines
+     * have differing values for one or more custom fields. In this case, we need to take _all_ of these
+     * OrderLines into account when constraining the quantity. See https://github.com/vendure-ecommerce/vendure/issues/2702
+     * for more on this.
      */
-    constrainQuantityToSaleable(ctx: RequestContext, variant: ProductVariant, quantity: number, existingQuantity?: number): Promise<number>;
+    constrainQuantityToSaleable(ctx: RequestContext, variant: ProductVariant, quantity: number, existingOrderLineQuantity?: number, quantityInOtherOrderLines?: number): Promise<number>;
     /**
      * @description
      * Given a ProductVariant ID and optional custom fields, this method will return an existing OrderLine that
@@ -77,7 +85,7 @@ export declare class OrderModifier {
      * `quantity` argument if insufficient stock was available.
      */
     updateOrderLineQuantity(ctx: RequestContext, orderLine: OrderLine, quantity: number, order: Order): Promise<OrderLine>;
-    cancelOrderByOrderLines(ctx: RequestContext, input: CancelOrderInput, lineInputs: OrderLineInput[]): Promise<boolean | CancelActiveOrderError | EmptyOrderLineSelectionError | MultipleOrderError | QuantityTooGreatError>;
+    cancelOrderByOrderLines(ctx: RequestContext, input: CancelOrderInput, lineInputs: OrderLineInput[]): Promise<boolean | EmptyOrderLineSelectionError | MultipleOrderError | CancelActiveOrderError | QuantityTooGreatError>;
     modifyOrder(ctx: RequestContext, input: ModifyOrderInput, order: Order): Promise<JustErrorResults<ModifyOrderResult> | {
         order: Order;
         modification: OrderModification;

package/dist/service/helpers/order-modifier/order-modifier.js CHANGED Viewed

@@ -79,12 +79,20 @@ let OrderModifier = class OrderModifier {
      * @description
      * Ensure that the ProductVariant has sufficient saleable stock to add the given
      * quantity to an Order.
+     *
+     * - `existingOrderLineQuantity` is used when adding an item to the order, since if an OrderLine
+     * already exists then we will be adding the new quantity to the existing quantity.
+     * - `quantityInOtherOrderLines` is used when we have more than 1 OrderLine containing the same
+     * ProductVariant. This occurs when there are custom fields defined on the OrderLine and the lines
+     * have differing values for one or more custom fields. In this case, we need to take _all_ of these
+     * OrderLines into account when constraining the quantity. See https://github.com/vendure-ecommerce/vendure/issues/2702
+     * for more on this.
      */
-    async constrainQuantityToSaleable(ctx, variant, quantity, existingQuantity = 0) {
-        let correctedQuantity = quantity + existingQuantity;
+    async constrainQuantityToSaleable(ctx, variant, quantity, existingOrderLineQuantity = 0, quantityInOtherOrderLines = 0) {
+        let correctedQuantity = quantity + existingOrderLineQuantity;
         const saleableStockLevel = await this.productVariantService.getSaleableStockLevel(ctx, variant);
-        if (saleableStockLevel < correctedQuantity) {
-            correctedQuantity = Math.max(saleableStockLevel - existingQuantity, 0);
+        if (saleableStockLevel < correctedQuantity + quantityInOtherOrderLines) {
+            correctedQuantity = Math.max(saleableStockLevel - existingOrderLineQuantity - quantityInOtherOrderLines, 0);
         }
         return correctedQuantity;
     }