@vendure/core 2.2.0-next.8 → 2.2.0
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.
- package/dist/api/api-internal-modules.d.ts +2 -2
- package/dist/api/config/generate-resolvers.d.ts +4 -4
- package/dist/api/resolvers/admin/order.resolver.d.ts +1 -1
- package/dist/config/entity/entity-duplicators/index.d.ts +4 -4
- package/dist/config/order/default-order-process.js +2 -3
- package/dist/config/order/default-order-process.js.map +1 -1
- package/dist/config/promotion/index.d.ts +53 -53
- package/dist/connection/connection.module.d.ts +1 -1
- package/dist/entity/channel/channel.entity.d.ts +7 -0
- package/dist/entity/channel/channel.entity.js +28 -3
- package/dist/entity/channel/channel.entity.js.map +1 -1
- package/dist/entity/customer/customer.entity.js +1 -1
- package/dist/entity/customer/customer.entity.js.map +1 -1
- package/dist/entity/customer-group/customer-group.entity.d.ts +2 -0
- package/dist/entity/customer-group/customer-group.entity.js +5 -0
- package/dist/entity/customer-group/customer-group.entity.js.map +1 -1
- package/dist/entity/facet/facet.entity.js +1 -1
- package/dist/entity/facet/facet.entity.js.map +1 -1
- package/dist/entity/order-line/order-line.entity.d.ts +7 -1
- package/dist/entity/order-line/order-line.entity.js +24 -6
- package/dist/entity/order-line/order-line.entity.js.map +1 -1
- package/dist/entity/order-line-reference/order-line-reference.entity.js +1 -1
- package/dist/entity/order-line-reference/order-line-reference.entity.js.map +1 -1
- package/dist/entity/payment-method/payment-method.entity.js +1 -1
- package/dist/entity/payment-method/payment-method.entity.js.map +1 -1
- package/dist/entity/product/product.entity.js +1 -1
- package/dist/entity/product/product.entity.js.map +1 -1
- package/dist/entity/product-variant/product-variant.entity.d.ts +2 -0
- package/dist/entity/product-variant/product-variant.entity.js +5 -0
- package/dist/entity/product-variant/product-variant.entity.js.map +1 -1
- package/dist/entity/promotion/promotion.entity.js +1 -1
- package/dist/entity/promotion/promotion.entity.js.map +1 -1
- package/dist/entity/refund/refund.entity.js +1 -1
- package/dist/entity/refund/refund.entity.js.map +1 -1
- package/dist/entity/role/role.entity.js +1 -1
- package/dist/entity/role/role.entity.js.map +1 -1
- package/dist/entity/seller/seller.entity.d.ts +2 -0
- package/dist/entity/seller/seller.entity.js +5 -0
- package/dist/entity/seller/seller.entity.js.map +1 -1
- package/dist/entity/session/authenticated-session.entity.js +1 -1
- package/dist/entity/session/authenticated-session.entity.js.map +1 -1
- package/dist/entity/shipping-line/shipping-line.entity.d.ts +2 -0
- package/dist/entity/shipping-line/shipping-line.entity.js +5 -0
- package/dist/entity/shipping-line/shipping-line.entity.js.map +1 -1
- package/dist/entity/shipping-method/shipping-method.entity.js +1 -1
- package/dist/entity/shipping-method/shipping-method.entity.js.map +1 -1
- package/dist/entity/stock-location/stock-location.entity.d.ts +2 -0
- package/dist/entity/stock-location/stock-location.entity.js +6 -1
- package/dist/entity/stock-location/stock-location.entity.js.map +1 -1
- package/dist/entity/stock-movement/allocation.entity.js +1 -1
- package/dist/entity/stock-movement/allocation.entity.js.map +1 -1
- package/dist/entity/stock-movement/cancellation.entity.js +1 -1
- package/dist/entity/stock-movement/cancellation.entity.js.map +1 -1
- package/dist/entity/stock-movement/sale.entity.js +1 -1
- package/dist/entity/stock-movement/sale.entity.js.map +1 -1
- package/dist/entity/stock-movement/stock-movement.entity.js +1 -1
- package/dist/entity/stock-movement/stock-movement.entity.js.map +1 -1
- package/dist/entity/tax-category/tax-category.entity.d.ts +2 -0
- package/dist/entity/tax-category/tax-category.entity.js +5 -0
- package/dist/entity/tax-category/tax-category.entity.js.map +1 -1
- package/dist/entity/tax-rate/tax-rate.entity.js +3 -3
- package/dist/entity/tax-rate/tax-rate.entity.js.map +1 -1
- package/dist/entity/user/user.entity.d.ts +2 -0
- package/dist/entity/user/user.entity.js +5 -0
- package/dist/entity/user/user.entity.js.map +1 -1
- package/dist/entity/zone/zone.entity.d.ts +5 -0
- package/dist/entity/zone/zone.entity.js +14 -0
- package/dist/entity/zone/zone.entity.js.map +1 -1
- package/dist/job-queue/job-queue.js +1 -1
- package/dist/job-queue/job-queue.js.map +1 -1
- package/dist/migrate.js +15 -15
- package/dist/service/helpers/order-modifier/order-modifier.d.ts +1 -1
- package/dist/service/helpers/order-splitter/order-splitter.js +7 -1
- package/dist/service/helpers/order-splitter/order-splitter.js.map +1 -1
- package/package.json +3 -3
|
@@ -17,6 +17,7 @@ const native_authentication_method_entity_1 = require("../authentication-method/
|
|
|
17
17
|
const base_entity_1 = require("../base/base.entity");
|
|
18
18
|
const custom_entity_fields_1 = require("../custom-entity-fields");
|
|
19
19
|
const role_entity_1 = require("../role/role.entity");
|
|
20
|
+
const authenticated_session_entity_1 = require("../session/authenticated-session.entity");
|
|
20
21
|
/**
|
|
21
22
|
* @description
|
|
22
23
|
* A User represents any authenticated user of the Vendure API. This includes both
|
|
@@ -69,6 +70,10 @@ __decorate([
|
|
|
69
70
|
(0, typeorm_1.Column)(type => custom_entity_fields_1.CustomUserFields),
|
|
70
71
|
__metadata("design:type", custom_entity_fields_1.CustomUserFields)
|
|
71
72
|
], User.prototype, "customFields", void 0);
|
|
73
|
+
__decorate([
|
|
74
|
+
(0, typeorm_1.OneToMany)(type => authenticated_session_entity_1.AuthenticatedSession, session => session.user),
|
|
75
|
+
__metadata("design:type", Array)
|
|
76
|
+
], User.prototype, "sessions", void 0);
|
|
72
77
|
exports.User = User = __decorate([
|
|
73
78
|
(0, typeorm_1.Entity)(),
|
|
74
79
|
__metadata("design:paramtypes", [Object])
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.entity.js","sourceRoot":"","sources":["../../../src/entity/user/user.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,qCAA2E;AAE3E,sDAAgE;AAGhE,wGAA6F;AAC7F,sHAA0G;AAC1G,qDAAoD;AACpD,kEAA2D;AAC3D,qDAA2C;
|
|
1
|
+
{"version":3,"file":"user.entity.js","sourceRoot":"","sources":["../../../src/entity/user/user.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,qCAA2E;AAE3E,sDAAgE;AAGhE,wGAA6F;AAC7F,sHAA0G;AAC1G,qDAAoD;AACpD,kEAA2D;AAC3D,qDAA2C;AAC3C,0FAA+E;AAE/E;;;;;;GAMG;AAEI,IAAM,IAAI,GAAV,MAAM,IAAK,SAAQ,2BAAa;IACnC,YAAY,KAAyB;QACjC,KAAK,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC;IA8BD,6BAA6B,CAAC,MAAgB;QAC1C,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC9B,MAAM,IAAI,4BAAmB,CAAC,8CAA8C,CAAC,CAAC;QAClF,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CACzC,CAAC,CAAC,EAAmC,EAAE,CAAC,CAAC,YAAY,gEAA0B,CAClF,CAAC;QACF,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,MAAM,CAAC,EAAE,CAAC;YAC7C,MAAM,IAAI,4BAAmB,CAAC,+CAA+C,CAAC,CAAC;QACnF,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ,CAAA;AA7CY,oBAAI;AAMb;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uCAChB;AAGvB;IADC,IAAA,gBAAM,GAAE;;wCACU;AAGnB;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,mDAAoB,EAAE,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC;;mDACjB;AAG9C;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;;sCACT;AAIlB;IAFC,IAAA,oBAAU,EAAC,IAAI,CAAC,EAAE,CAAC,kBAAI,CAAC;IACxB,IAAA,mBAAS,GAAE;;mCACE;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uCAChB;AAGvB;IADC,IAAA,gBAAM,EAAC,IAAI,CAAC,EAAE,CAAC,uCAAgB,CAAC;8BACnB,uCAAgB;0CAAC;AAG/B;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,mDAAoB,EAAE,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;;sCAChC;eA5BxB,IAAI;IADhB,IAAA,gBAAM,GAAE;;GACI,IAAI,CA6ChB"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import { DeepPartial } from '@vendure/common/lib/shared-types';
|
|
2
2
|
import { HasCustomFields } from '../../config/custom-field/custom-field-types';
|
|
3
3
|
import { VendureEntity } from '../base/base.entity';
|
|
4
|
+
import { Channel } from '../channel/channel.entity';
|
|
4
5
|
import { CustomZoneFields } from '../custom-entity-fields';
|
|
5
6
|
import { Region } from '../region/region.entity';
|
|
7
|
+
import { TaxRate } from '../tax-rate/tax-rate.entity';
|
|
6
8
|
/**
|
|
7
9
|
* @description
|
|
8
10
|
* A Zone is a grouping of one or more {@link Country} entities. It is used for
|
|
@@ -15,4 +17,7 @@ export declare class Zone extends VendureEntity implements HasCustomFields {
|
|
|
15
17
|
name: string;
|
|
16
18
|
members: Region[];
|
|
17
19
|
customFields: CustomZoneFields;
|
|
20
|
+
defaultShippingZoneChannels: Channel[];
|
|
21
|
+
defaultTaxZoneChannels: Channel[];
|
|
22
|
+
taxRates: TaxRate[];
|
|
18
23
|
}
|
|
@@ -12,8 +12,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.Zone = void 0;
|
|
13
13
|
const typeorm_1 = require("typeorm");
|
|
14
14
|
const base_entity_1 = require("../base/base.entity");
|
|
15
|
+
const channel_entity_1 = require("../channel/channel.entity");
|
|
15
16
|
const custom_entity_fields_1 = require("../custom-entity-fields");
|
|
16
17
|
const region_entity_1 = require("../region/region.entity");
|
|
18
|
+
const tax_rate_entity_1 = require("../tax-rate/tax-rate.entity");
|
|
17
19
|
/**
|
|
18
20
|
* @description
|
|
19
21
|
* A Zone is a grouping of one or more {@link Country} entities. It is used for
|
|
@@ -40,6 +42,18 @@ __decorate([
|
|
|
40
42
|
(0, typeorm_1.Column)(type => custom_entity_fields_1.CustomZoneFields),
|
|
41
43
|
__metadata("design:type", custom_entity_fields_1.CustomZoneFields)
|
|
42
44
|
], Zone.prototype, "customFields", void 0);
|
|
45
|
+
__decorate([
|
|
46
|
+
(0, typeorm_1.OneToMany)(type => channel_entity_1.Channel, country => country.defaultShippingZone),
|
|
47
|
+
__metadata("design:type", Array)
|
|
48
|
+
], Zone.prototype, "defaultShippingZoneChannels", void 0);
|
|
49
|
+
__decorate([
|
|
50
|
+
(0, typeorm_1.OneToMany)(type => channel_entity_1.Channel, country => country.defaultTaxZone),
|
|
51
|
+
__metadata("design:type", Array)
|
|
52
|
+
], Zone.prototype, "defaultTaxZoneChannels", void 0);
|
|
53
|
+
__decorate([
|
|
54
|
+
(0, typeorm_1.OneToMany)(type => tax_rate_entity_1.TaxRate, taxRate => taxRate.zone),
|
|
55
|
+
__metadata("design:type", Array)
|
|
56
|
+
], Zone.prototype, "taxRates", void 0);
|
|
43
57
|
exports.Zone = Zone = __decorate([
|
|
44
58
|
(0, typeorm_1.Entity)(),
|
|
45
59
|
__metadata("design:paramtypes", [Object])
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zone.entity.js","sourceRoot":"","sources":["../../../src/entity/zone/zone.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"zone.entity.js","sourceRoot":"","sources":["../../../src/entity/zone/zone.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,qCAA2E;AAG3E,qDAAoD;AACpD,8DAAoD;AACpD,kEAA2D;AAE3D,2DAAiD;AACjD,iEAAsD;AAEtD;;;;;;GAMG;AAEI,IAAM,IAAI,GAAV,MAAM,IAAK,SAAQ,2BAAa;IACnC,YAAY,KAAyB;QACjC,KAAK,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC;CAmBJ,CAAA;AAtBY,oBAAI;AAKH;IAAT,IAAA,gBAAM,GAAE;;kCAAc;AAIvB;IAFC,IAAA,oBAAU,EAAC,IAAI,CAAC,EAAE,CAAC,sBAAM,CAAC;IAC1B,IAAA,mBAAS,GAAE;;qCACM;AAGlB;IADC,IAAA,gBAAM,EAAC,IAAI,CAAC,EAAE,CAAC,uCAAgB,CAAC;8BACnB,uCAAgB;0CAAC;AAG/B;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,wBAAO,EAAE,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,mBAAmB,CAAC;;yDAC5B;AAGvC;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,wBAAO,EAAE,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,cAAc,CAAC;;oDAC5B;AAGlC;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,yBAAO,EAAE,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;;sCAChC;eArBX,IAAI;IADhB,IAAA,gBAAM,GAAE;;GACI,IAAI,CAsBhB"}
|
|
@@ -86,7 +86,7 @@ class JobQueue {
|
|
|
86
86
|
});
|
|
87
87
|
const isBuffered = await this.jobBufferService.add(job);
|
|
88
88
|
if (!isBuffered) {
|
|
89
|
-
const addedJob = await this.jobQueueStrategy.add(job);
|
|
89
|
+
const addedJob = await this.jobQueueStrategy.add(job, options);
|
|
90
90
|
return new subscribable_job_1.SubscribableJob(addedJob, this.jobQueueStrategy);
|
|
91
91
|
}
|
|
92
92
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"job-queue.js","sourceRoot":"","sources":["../../src/job-queue/job-queue.ts"],"names":[],"mappings":";;;AAOA,+BAA4B;AAE5B,yDAAqD;AAGrD;;;;;;;;;;;GAWG;AACH,MAAa,QAAQ;IAGjB,IAAI,IAAI;QACJ,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;IAC7B,CAAC;IAED,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IAED,YACY,OAAiC,EACjC,gBAAkC,EAClC,gBAAkC;QAFlC,YAAO,GAAP,OAAO,CAA0B;QACjC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAbtC,YAAO,GAAG,KAAK,CAAC;IAcrB,CAAC;IAEJ,gBAAgB;IAChB,KAAK,CAAC,KAAK;QACP,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,OAAO;QACX,CAAC;QACD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,MAAM,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACrF,CAAC;IAED,gBAAgB;IAChB,KAAK,CAAC,IAAI;QACN,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAChB,OAAO;QACX,CAAC;QACD,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACrB,OAAO,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/E,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAgCG;IACH,KAAK,CAAC,GAAG,CAAC,IAAU,EAAE,OAA0B;;QAC5C,MAAM,GAAG,GAAG,IAAI,SAAG,CAAM;YACrB,IAAI;YACJ,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;YAC5B,OAAO,EAAE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,mCAAI,CAAC;SACjC,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACxD,IAAI,CAAC,UAAU,EAAE,CAAC;YACd,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"job-queue.js","sourceRoot":"","sources":["../../src/job-queue/job-queue.ts"],"names":[],"mappings":";;;AAOA,+BAA4B;AAE5B,yDAAqD;AAGrD;;;;;;;;;;;GAWG;AACH,MAAa,QAAQ;IAGjB,IAAI,IAAI;QACJ,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;IAC7B,CAAC;IAED,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IAED,YACY,OAAiC,EACjC,gBAAkC,EAClC,gBAAkC;QAFlC,YAAO,GAAP,OAAO,CAA0B;QACjC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAbtC,YAAO,GAAG,KAAK,CAAC;IAcrB,CAAC;IAEJ,gBAAgB;IAChB,KAAK,CAAC,KAAK;QACP,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,OAAO;QACX,CAAC;QACD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,MAAM,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACrF,CAAC;IAED,gBAAgB;IAChB,KAAK,CAAC,IAAI;QACN,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAChB,OAAO;QACX,CAAC;QACD,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACrB,OAAO,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/E,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAgCG;IACH,KAAK,CAAC,GAAG,CAAC,IAAU,EAAE,OAA0B;;QAC5C,MAAM,GAAG,GAAG,IAAI,SAAG,CAAM;YACrB,IAAI;YACJ,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;YAC5B,OAAO,EAAE,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,mCAAI,CAAC;SACjC,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACxD,IAAI,CAAC,UAAU,EAAE,CAAC;YACd,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YAC/D,OAAO,IAAI,kCAAe,CAAC,QAAQ,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;QAChE,CAAC;aAAM,CAAC;YACJ,MAAM,WAAW,GAAG,IAAI,SAAG,iCACpB,GAAG,KACN,IAAI,EAAE,GAAG,CAAC,IAAI,EACd,EAAE,EAAE,UAAU,IAChB,CAAC;YACH,OAAO,IAAI,kCAAe,CAAC,WAAW,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;QACnE,CAAC;IACL,CAAC;CACJ;AAxFD,4BAwFC"}
|
package/dist/migrate.js
CHANGED
|
@@ -190,21 +190,21 @@ async function disableForeignKeysForSqLite(connection, work) {
|
|
|
190
190
|
* Gets contents of the migration file.
|
|
191
191
|
*/
|
|
192
192
|
function getTemplate(name, timestamp, upSqls, downSqls) {
|
|
193
|
-
return `import {MigrationInterface, QueryRunner} from "typeorm";
|
|
194
|
-
|
|
195
|
-
export class ${(0, StringUtils_1.camelCase)(name, true)}${timestamp} implements MigrationInterface {
|
|
196
|
-
|
|
197
|
-
public async up(queryRunner: QueryRunner): Promise<any> {
|
|
198
|
-
${upSqls.join(`
|
|
199
|
-
`)}
|
|
200
|
-
}
|
|
201
|
-
|
|
202
|
-
public async down(queryRunner: QueryRunner): Promise<any> {
|
|
203
|
-
${downSqls.join(`
|
|
204
|
-
`)}
|
|
205
|
-
}
|
|
206
|
-
|
|
207
|
-
}
|
|
193
|
+
return `import {MigrationInterface, QueryRunner} from "typeorm";
|
|
194
|
+
|
|
195
|
+
export class ${(0, StringUtils_1.camelCase)(name, true)}${timestamp} implements MigrationInterface {
|
|
196
|
+
|
|
197
|
+
public async up(queryRunner: QueryRunner): Promise<any> {
|
|
198
|
+
${upSqls.join(`
|
|
199
|
+
`)}
|
|
200
|
+
}
|
|
201
|
+
|
|
202
|
+
public async down(queryRunner: QueryRunner): Promise<any> {
|
|
203
|
+
${downSqls.join(`
|
|
204
|
+
`)}
|
|
205
|
+
}
|
|
206
|
+
|
|
207
|
+
}
|
|
208
208
|
`;
|
|
209
209
|
}
|
|
210
210
|
function log(message) {
|
|
@@ -86,7 +86,7 @@ export declare class OrderModifier {
|
|
|
86
86
|
* `quantity` argument if insufficient stock was available.
|
|
87
87
|
*/
|
|
88
88
|
updateOrderLineQuantity(ctx: RequestContext, orderLine: OrderLine, quantity: number, order: Order): Promise<OrderLine>;
|
|
89
|
-
cancelOrderByOrderLines(ctx: RequestContext, input: CancelOrderInput, lineInputs: OrderLineInput[]): Promise<boolean |
|
|
89
|
+
cancelOrderByOrderLines(ctx: RequestContext, input: CancelOrderInput, lineInputs: OrderLineInput[]): Promise<boolean | CancelActiveOrderError | EmptyOrderLineSelectionError | MultipleOrderError | QuantityTooGreatError>;
|
|
90
90
|
modifyOrder(ctx: RequestContext, input: ModifyOrderInput, order: Order): Promise<JustErrorResults<ModifyOrderResult> | {
|
|
91
91
|
order: Order;
|
|
92
92
|
modification: OrderModification;
|
|
@@ -46,7 +46,13 @@ let OrderSplitter = class OrderSplitter {
|
|
|
46
46
|
}
|
|
47
47
|
const shippingLines = [];
|
|
48
48
|
for (const shippingLine of partialOrder.shippingLines) {
|
|
49
|
-
|
|
49
|
+
const newShippingLine = await this.duplicateShippingLine(ctx, shippingLine);
|
|
50
|
+
lines.map((line) => {
|
|
51
|
+
if (shippingLine.id === line.shippingLineId) {
|
|
52
|
+
line.shippingLineId = newShippingLine.id;
|
|
53
|
+
}
|
|
54
|
+
});
|
|
55
|
+
shippingLines.push(newShippingLine);
|
|
50
56
|
}
|
|
51
57
|
const sellerOrder = await this.connection.getRepository(ctx, order_entity_1.Order).save(new order_entity_1.Order({
|
|
52
58
|
type: generated_types_1.OrderType.Seller,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order-splitter.js","sourceRoot":"","sources":["../../../../src/service/helpers/order-splitter/order-splitter.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yEAAgE;AAChE,mDAAgD;AAGhD,mEAA+D;AAC/D,2FAAuF;AACvF,2EAAiE;AACjE,qEAA2D;AAC3D,oFAAyE;AACzE,6FAAkF;AAClF,oEAAgE;AAChE,gEAA4D;AAGrD,IAAM,aAAa,GAAnB,MAAM,aAAa;IACtB,YACY,UAAmC,EACnC,aAA4B,EAC5B,cAA8B,EAC9B,YAA0B;QAH1B,eAAU,GAAV,UAAU,CAAyB;QACnC,kBAAa,GAAb,aAAa,CAAe;QAC5B,mBAAc,GAAd,cAAc,CAAgB;QAC9B,iBAAY,GAAZ,YAAY,CAAc;IACnC,CAAC;IAEJ,KAAK,CAAC,kBAAkB,CAAC,GAAmB,EAAE,KAAY;;QACtD,MAAM,EAAE,mBAAmB,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC;QAChE,MAAM,aAAa,GAAG,MAAM,CAAA,MAAA,mBAAmB,CAAC,UAAU,oEAAG,GAAG,EAAE,KAAK,CAAC,CAAA,CAAC;QACzE,IAAI,CAAC,aAAa,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/C,qBAAqB;YACrB,OAAO,EAAE,CAAC;QACd,CAAC;QACD,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;QAExE,KAAK,CAAC,IAAI,GAAG,2BAAS,CAAC,SAAS,CAAC;QACjC,MAAM,YAAY,GAAY,EAAE,CAAC;QACjC,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;YACvC,MAAM,KAAK,GAAgB,EAAE,CAAC;YAC9B,KAAK,MAAM,IAAI,IAAI,YAAY,CAAC,KAAK,EAAE,CAAC;gBACpC,KAAK,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;YACzD,CAAC;YACD,MAAM,aAAa,GAAmB,EAAE,CAAC;YACzC,KAAK,MAAM,YAAY,IAAI,YAAY,CAAC,aAAa,EAAE,CAAC;gBACpD,
|
|
1
|
+
{"version":3,"file":"order-splitter.js","sourceRoot":"","sources":["../../../../src/service/helpers/order-splitter/order-splitter.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vendure/core",
|
|
3
|
-
"version": "2.2.0
|
|
3
|
+
"version": "2.2.0",
|
|
4
4
|
"description": "A modern, headless ecommerce framework",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
"@nestjs/testing": "10.3.3",
|
|
52
52
|
"@nestjs/typeorm": "10.0.2",
|
|
53
53
|
"@types/fs-extra": "^9.0.1",
|
|
54
|
-
"@vendure/common": "2.2.0
|
|
54
|
+
"@vendure/common": "^2.2.0",
|
|
55
55
|
"bcrypt": "^5.1.1",
|
|
56
56
|
"body-parser": "^1.20.2",
|
|
57
57
|
"cookie-session": "^2.1.0",
|
|
@@ -103,5 +103,5 @@
|
|
|
103
103
|
"sqlite3": "^5.1.7",
|
|
104
104
|
"typescript": "5.3.3"
|
|
105
105
|
},
|
|
106
|
-
"gitHead": "
|
|
106
|
+
"gitHead": "09f25d39bf8510cc0c13c19396589492565eaf34"
|
|
107
107
|
}
|