@vendure/core 1.8.5 → 1.9.1
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/config/configure-graphql-module.js +2 -0
- package/dist/api/config/configure-graphql-module.js.map +1 -1
- package/dist/api/config/generate-active-order-types.d.ts +14 -0
- package/dist/api/config/generate-active-order-types.js +90 -0
- package/dist/api/config/generate-active-order-types.js.map +1 -0
- package/dist/api/middleware/id-interceptor.js +8 -2
- package/dist/api/middleware/id-interceptor.js.map +1 -1
- package/dist/api/resolvers/admin/facet.resolver.d.ts +2 -1
- package/dist/api/resolvers/admin/facet.resolver.js +14 -0
- package/dist/api/resolvers/admin/facet.resolver.js.map +1 -1
- package/dist/api/resolvers/shop/shop-order.resolver.d.ts +22 -18
- package/dist/api/resolvers/shop/shop-order.resolver.js +32 -27
- package/dist/api/resolvers/shop/shop-order.resolver.js.map +1 -1
- package/dist/api/schema/admin-api/facet.api.graphql +8 -0
- package/dist/api/schema/common/common-types.graphql +5 -0
- package/dist/common/constants.d.ts +1 -2
- package/dist/common/types/common-types.d.ts +5 -1
- package/dist/config/config.module.js +3 -1
- package/dist/config/config.module.js.map +1 -1
- package/dist/config/default-config.js +3 -0
- package/dist/config/default-config.js.map +1 -1
- package/dist/config/index.d.ts +2 -0
- package/dist/config/index.js +2 -0
- package/dist/config/index.js.map +1 -1
- package/dist/config/order/active-order-strategy.d.ts +184 -0
- package/dist/config/order/active-order-strategy.js +5 -0
- package/dist/config/order/active-order-strategy.js.map +1 -0
- package/dist/config/order/default-active-order-strategy.d.ts +22 -0
- package/dist/config/order/default-active-order-strategy.js +75 -0
- package/dist/config/order/default-active-order-strategy.js.map +1 -0
- package/dist/config/vendure-config.d.ts +24 -0
- package/dist/data-import/providers/importer/importer.js +3 -0
- package/dist/data-import/providers/importer/importer.js.map +1 -1
- package/dist/entity/authentication-method/external-authentication-method.entity.js +3 -1
- package/dist/entity/authentication-method/external-authentication-method.entity.js.map +1 -1
- package/dist/entity/authentication-method/native-authentication-method.entity.js +3 -1
- package/dist/entity/authentication-method/native-authentication-method.entity.js.map +1 -1
- package/dist/entity/channel/channel.entity.js +5 -3
- package/dist/entity/channel/channel.entity.js.map +1 -1
- package/dist/entity/collection/collection-asset.entity.js +4 -2
- package/dist/entity/collection/collection-asset.entity.js.map +1 -1
- package/dist/entity/country/country-translation.entity.js +4 -2
- package/dist/entity/country/country-translation.entity.js.map +1 -1
- package/dist/entity/country/country.entity.js +3 -1
- package/dist/entity/country/country.entity.js.map +1 -1
- package/dist/entity/customer-group/customer-group.entity.js +3 -1
- package/dist/entity/customer-group/customer-group.entity.js.map +1 -1
- package/dist/entity/product/product-asset.entity.js +4 -2
- package/dist/entity/product/product-asset.entity.js.map +1 -1
- package/dist/entity/product-variant/product-variant-asset.entity.js +4 -2
- package/dist/entity/product-variant/product-variant-asset.entity.js.map +1 -1
- package/dist/entity/role/role.entity.js +3 -1
- package/dist/entity/role/role.entity.js.map +1 -1
- package/dist/entity/tag/tag.entity.js +3 -1
- package/dist/entity/tag/tag.entity.js.map +1 -1
- package/dist/entity/zone/zone.entity.js +3 -1
- package/dist/entity/zone/zone.entity.js.map +1 -1
- package/dist/i18n/messages/en.json +2 -0
- package/dist/service/helpers/active-order/active-order.service.d.ts +18 -2
- package/dist/service/helpers/active-order/active-order.service.js +42 -5
- package/dist/service/helpers/active-order/active-order.service.js.map +1 -1
- package/dist/service/helpers/list-query-builder/parse-filter-params.js +35 -15
- package/dist/service/helpers/list-query-builder/parse-filter-params.js.map +1 -1
- package/dist/service/helpers/order-calculator/order-calculator.js +34 -33
- package/dist/service/helpers/order-calculator/order-calculator.js.map +1 -1
- package/dist/service/helpers/order-state-machine/order-state-machine.d.ts +3 -1
- package/dist/service/helpers/order-state-machine/order-state-machine.js +17 -2
- package/dist/service/helpers/order-state-machine/order-state-machine.js.map +1 -1
- package/dist/service/initializer.service.d.ts +3 -1
- package/dist/service/initializer.service.js +5 -1
- package/dist/service/initializer.service.js.map +1 -1
- package/dist/service/services/facet-value.service.d.ts +14 -2
- package/dist/service/services/facet-value.service.js +26 -2
- package/dist/service/services/facet-value.service.js.map +1 -1
- package/dist/service/services/history.service.d.ts +94 -4
- package/dist/service/services/history.service.js +90 -0
- package/dist/service/services/history.service.js.map +1 -1
- package/dist/service/services/promotion.service.js.map +1 -1
- package/dist/service/services/tax-rate.service.d.ts +13 -3
- package/dist/service/services/tax-rate.service.js +28 -7
- package/dist/service/services/tax-rate.service.js.map +1 -1
- package/package.json +3 -3
|
@@ -331,45 +331,46 @@ let OrderCalculator = class OrderCalculator {
|
|
|
331
331
|
}
|
|
332
332
|
}
|
|
333
333
|
async applyShipping(ctx, order) {
|
|
334
|
-
const shippingLine
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
334
|
+
for (const shippingLine of order.shippingLines) {
|
|
335
|
+
const currentShippingMethod = (shippingLine === null || shippingLine === void 0 ? void 0 : shippingLine.shippingMethodId) &&
|
|
336
|
+
(await this.shippingMethodService.findOne(ctx, shippingLine.shippingMethodId));
|
|
337
|
+
if (!currentShippingMethod) {
|
|
338
|
+
return;
|
|
339
|
+
}
|
|
340
|
+
const currentMethodStillEligible = await currentShippingMethod.test(ctx, order);
|
|
341
|
+
if (currentMethodStillEligible) {
|
|
342
|
+
const result = await currentShippingMethod.apply(ctx, order);
|
|
343
|
+
if (result) {
|
|
344
|
+
shippingLine.listPrice = result.price;
|
|
345
|
+
shippingLine.listPriceIncludesTax = result.priceIncludesTax;
|
|
346
|
+
shippingLine.taxLines = [
|
|
347
|
+
{
|
|
348
|
+
description: 'shipping tax',
|
|
349
|
+
taxRate: result.taxRate,
|
|
350
|
+
},
|
|
351
|
+
];
|
|
352
|
+
}
|
|
353
|
+
continue;
|
|
354
|
+
}
|
|
355
|
+
const results = await this.shippingCalculator.getEligibleShippingMethods(ctx, order, [
|
|
356
|
+
currentShippingMethod.id,
|
|
357
|
+
]);
|
|
358
|
+
if (results && results.length) {
|
|
359
|
+
const cheapest = results[0];
|
|
360
|
+
shippingLine.listPrice = cheapest.result.price;
|
|
361
|
+
shippingLine.listPriceIncludesTax = cheapest.result.priceIncludesTax;
|
|
362
|
+
shippingLine.shippingMethod = cheapest.method;
|
|
363
|
+
shippingLine.shippingMethodId = cheapest.method.id;
|
|
346
364
|
shippingLine.taxLines = [
|
|
347
365
|
{
|
|
348
366
|
description: 'shipping tax',
|
|
349
|
-
taxRate: result.taxRate,
|
|
367
|
+
taxRate: cheapest.result.taxRate,
|
|
350
368
|
},
|
|
351
369
|
];
|
|
352
370
|
}
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
currentShippingMethod.id,
|
|
357
|
-
]);
|
|
358
|
-
if (results && results.length) {
|
|
359
|
-
const cheapest = results[0];
|
|
360
|
-
shippingLine.listPrice = cheapest.result.price;
|
|
361
|
-
shippingLine.listPriceIncludesTax = cheapest.result.priceIncludesTax;
|
|
362
|
-
shippingLine.shippingMethod = cheapest.method;
|
|
363
|
-
shippingLine.shippingMethodId = cheapest.method.id;
|
|
364
|
-
shippingLine.taxLines = [
|
|
365
|
-
{
|
|
366
|
-
description: 'shipping tax',
|
|
367
|
-
taxRate: cheapest.result.taxRate,
|
|
368
|
-
},
|
|
369
|
-
];
|
|
370
|
-
}
|
|
371
|
-
else {
|
|
372
|
-
order.shippingLines = [];
|
|
371
|
+
else {
|
|
372
|
+
order.shippingLines = order.shippingLines.filter(sl => sl !== shippingLine);
|
|
373
|
+
}
|
|
373
374
|
}
|
|
374
375
|
}
|
|
375
376
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order-calculator.js","sourceRoot":"","sources":["../../../../src/service/helpers/order-calculator/order-calculator.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,mEAA+D;AAC/D,yEAAqE;AAGrE,gGAA0F;AAC1F,yDAAmE;AACnE,yDAAuD;AACvD,iDAAoD;AACpD,mEAA+D;AAM/D,oFAA+E;AAC/E,sEAAiE;AACjE,8DAA0D;AAC1D,oFAAgF;AAEhF,uCAAoC;AAEpC;;;;;;;;;;GAUG;AAEH,IAAa,eAAe,GAA5B,MAAa,eAAe;IACxB,YACY,aAA4B,EAC5B,WAAwB,EACxB,cAA8B,EAC9B,qBAA4C,EAC5C,kBAAsC,EACtC,mBAA+C;QAL/C,kBAAa,GAAb,aAAa,CAAe;QAC5B,gBAAW,GAAX,WAAW,CAAa;QACxB,mBAAc,GAAd,cAAc,CAAgB;QAC9B,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,wBAAmB,GAAnB,mBAAmB,CAA4B;IACxD,CAAC;IAEJ;;;;;OAKG;IACH,KAAK,CAAC,qBAAqB,CACvB,GAAmB,EACnB,KAAY,EACZ,UAAuB,EACvB,oBAAiC,EAAE,EACnC,OAA2C;QAE3C,MAAM,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC;QAC1D,kDAAkD;QAClD,kDAAkD;QAClD,KAAK,CAAC,UAAU,GAAG,EAAE,CAAC;QACtB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAClD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,GAAG,EAAE,eAAe,EAAE,GAAG,EAAE,CAChF,eAAe,CAAC,gBAAgB,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CACnE,CAAC;QAEF,IAAI,cAAc,GAAG,KAAK,CAAC;QAC3B,IAAI,CAAC,aAAa,EAAE;YAChB,MAAM,IAAI,4BAAmB,CAAC,0BAA0B,CAAC,CAAC;SAC7D;QACD,IAAI,CAAC,KAAK,CAAC,SAAS,IAAI,CAAC,mBAAW,CAAC,KAAK,CAAC,SAAS,EAAE,aAAa,CAAC,EAAE,CAAC,EAAE;YACrE,KAAK,CAAC,SAAS,GAAG,aAAa,CAAC,EAAE,CAAC;YACnC,cAAc,GAAG,IAAI,CAAC;SACzB;QACD,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAa,CAAC;QAC/C,KAAK,MAAM,gBAAgB,IAAI,iBAAiB,EAAE;YAC9C,MAAM,IAAI,CAAC,qBAAqB,CAC5B,GAAG,EACH,KAAK,EACL,gBAAgB,EAChB,aAAa,EACb,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,aAAa,CAAC,CAC/C,CAAC;YACF,gBAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;SAC7E;QACD,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;QACjC,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE;YACpB,IAAI,cAAc,EAAE;gBAChB,iDAAiD;gBACjD,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC;aACpD;YAED,iCAAiC;YACjC,MAAM,qBAAqB,GAAG,KAAK,CAAC,QAAQ,CAAC;YAC7C,MAAM,yBAAyB,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;YACrF,yBAAyB,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;YAEvE,IAAI,KAAK,CAAC,QAAQ,KAAK,qBAAqB,IAAI,yBAAyB,CAAC,MAAM,EAAE;gBAC9E,8DAA8D;gBAC9D,qEAAqE;gBACrE,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC;aACpD;SACJ;QACD,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,mBAAmB,MAAK,KAAK,EAAE;YACxC,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YACrC,MAAM,IAAI,CAAC,uBAAuB,CAAC,GAAG,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;SAC9D;QACD,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;QACjC,OAAO,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAClF,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,UAAU,CAAC,GAAmB,EAAE,KAAY,EAAE,UAAgB;QACxE,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QAC7D,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,KAAK,EAAE;YAC5B,MAAM,IAAI,CAAC,qBAAqB,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;SAC9E;QACD,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;IACrC,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,qBAAqB,CAC/B,GAAmB,EACnB,KAAY,EACZ,IAAe,EACf,UAAgB,EAChB,UAA0D;QAE1D,MAAM,iBAAiB,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC7D,MAAM,EAAE,0BAA0B,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC;QACrE,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,WAAW,EAAE;YACjC,IAAI,CAAC,QAAQ,GAAG,MAAM,0BAA0B,CAAC,SAAS,CAAC;gBACvD,GAAG;gBACH,iBAAiB;gBACjB,KAAK;gBACL,SAAS,EAAE,IAAI;gBACf,SAAS,EAAE,IAAI;aAClB,CAAC,CAAC;SACN;IACL,CAAC;IAED;;;;OAIG;IACK,mBAAmB,CACvB,GAAmB,EACnB,UAAgB;QAEhB,MAAM,YAAY,GAAG,IAAI,GAAG,EAAwB,CAAC;QAErD,OAAO,KAAK,EAAE,WAAwB,EAAoB,EAAE;YACxD,MAAM,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YAC7C,IAAI,MAAM,EAAE;gBACR,OAAO,MAAM,CAAC;aACjB;YACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,oBAAoB,CAAC,GAAG,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;YAC1F,YAAY,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;YACpC,OAAO,IAAI,CAAC;QAChB,CAAC,CAAC;IACN,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,eAAe,CACzB,GAAmB,EACnB,KAAY,EACZ,UAAuB;QAEvB,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,GAAG,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;QACjF,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,GAAG,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;QAClF,IAAI,iBAAiB,CAAC,MAAM,EAAE;YAC1B,OAAO,iBAAiB,CAAC;SAC5B;aAAM;YACH,OAAO,YAAY,CAAC;SACvB;IACL,CAAC;IAED;;;;;OAKG;IACK,KAAK,CAAC,wBAAwB,CAClC,GAAmB,EACnB,KAAY,EACZ,UAAuB;;QAEvB,iFAAiF;QACjF,2FAA2F;QAC3F,2FAA2F;QAC3F,+CAA+C;QAC/C,2FAA2F;QAC3F,gCAAgC;QAChC,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAa,CAAC;QAE/C,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,KAAK,EAAE;YAC5B,8FAA8F;YAC9F,kCAAkC;YAClC,MAAM,oBAAoB,GAAG,MAAM,0BAAW,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;YAElG,MAAM,yBAAyB,GAAG,CAAC,CAAC,CAAA,MAAA,MAAA,IAAI,CAAC,SAAS,0CAAE,WAAW,0CAAE,IAAI,CACjE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,gCAAc,CAAC,SAAS,CAC3C,CAAA,CAAC;YACF,MAAM,gBAAgB,GAAG,IAAI,CAAC,kCAAkC,CAAC,oBAAoB,EAAE,IAAI,CAAC,CAAC;YAE7F,IAAI,gBAAgB,IAAI,yBAAyB,EAAE;gBAC/C,IAAI,CAAC,gBAAgB,EAAE,CAAC;aAC3B;YACD,IAAI,gBAAgB,EAAE;gBAClB,kFAAkF;gBAClF,iFAAiF;gBACjF,yDAAyD;gBACzD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;aACrD;YAED,KAAK,MAAM,SAAS,IAAI,oBAAoB,EAAE;gBAC1C,IAAI,aAAa,GAAG,KAAK,CAAC;gBAC1B,qFAAqF;gBACrF,oFAAoF;gBACpF,sDAAsD;gBACtD,MAAM,iBAAiB,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;gBAC3D,IAAI,iBAAiB,EAAE;oBACnB,MAAM,KAAK,GAAG,OAAO,iBAAiB,KAAK,QAAQ,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,SAAS,CAAC;oBACpF,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE;wBAC3B,MAAM,UAAU,GAAG,MAAM,SAAS,CAAC,KAAK,CACpC,GAAG,EACH;4BACI,SAAS,EAAE,IAAI;4BACf,SAAS,EAAE,IAAI;yBAClB,EACD,KAAK,CACR,CAAC;wBACF,IAAI,UAAU,EAAE;4BACZ,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;4BAC/B,aAAa,GAAG,IAAI,CAAC;4BACrB,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;yBAC/B;qBACJ;oBACD,IAAI,aAAa,EAAE;wBACf,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;wBACjC,aAAa,GAAG,KAAK,CAAC;qBACzB;oBACD,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;iBACvC;aACJ;YACD,MAAM,yBAAyB,GAAG,CAAC,CAAA,MAAA,MAAA,IAAI,CAAC,SAAS,0CAAE,WAAW,0CAAE,IAAI,CAChE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,gCAAc,CAAC,SAAS,CAC3C,CAAA,CAAC;YACF,IAAI,yBAAyB,IAAI,yBAAyB,EAAE;gBACxD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;aACrD;YAED,IAAI,gBAAgB,EAAE;gBAClB,iEAAiE;gBACjE,mEAAmE;gBACnE,wEAAwE;gBACxE,2BAA2B;gBAC3B,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;aACpC;SACJ;QACD,OAAO,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,CAAC,CAAC;IAClD,CAAC;IAED;;;;;;;;;OASG;IACK,kCAAkC,CAAC,oBAAiC,EAAE,IAAe;QACzF,MAAM,sBAAsB,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;QAE9E,MAAM,gBAAgB,GAAG,IAAI,CAAC,WAAW;aACpC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,gCAAc,CAAC,SAAS,CAAC;aAChD,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC;QAClC,MAAM,sCAAsC,GAAG,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CACxE,sBAAsB,CAAC,QAAQ,CAAC,EAAE,CAAC,CACtC,CAAC;QACF,OAAO,sCAAsC,CAAC;IAClD,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAC9B,GAAmB,EACnB,KAAY,EACZ,UAAuB;QAEvB,MAAM,YAAY,GAAG,IAAI,GAAG,EAAa,CAAC;QAC1C,MAAM,6BAA6B,GAAG,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CACxD,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,KAAK,gCAAc,CAAC,2BAA2B,CAC/E,CAAC;QACF,IAAI,6BAA6B,EAAE;YAC/B,2EAA2E;YAC3E,4EAA4E;YAC5E,gFAAgF;YAChF,eAAe;YACf,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBACvB,IAAI,CAAC,gBAAgB,CAAC,gCAAc,CAAC,2BAA2B,CAAC,CAAC;gBAClE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;YACvD,CAAC,CAAC,CAAC;SACN;QAED,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;QACjC,MAAM,yBAAyB,GAAG,MAAM,0BAAW,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,CAChE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CACnC,CAAC;QACF,IAAI,yBAAyB,CAAC,MAAM,EAAE;YAClC,KAAK,MAAM,SAAS,IAAI,yBAAyB,EAAE;gBAC/C,iEAAiE;gBACjE,oDAAoD;gBACpD,MAAM,iBAAiB,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;gBAC3D,IAAI,iBAAiB,EAAE;oBACnB,MAAM,KAAK,GAAG,OAAO,iBAAiB,KAAK,QAAQ,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,SAAS,CAAC;oBACpF,MAAM,UAAU,GAAG,MAAM,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,EAAE,KAAK,CAAC,CAAC;oBAChE,IAAI,UAAU,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;wBACvC,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;wBACjC,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC;wBACjE,MAAM,YAAY,GAAG,iBAAO,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;wBAC9C,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;4BAC5B,MAAM,aAAa,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;4BACtC,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;4BAC3D,MAAM,gBAAgB,GAAG,iBAAO,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;4BAC7D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE;gCAC3B,MAAM,QAAQ,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;gCACrC,MAAM,gBAAgB,GAAG,IAAI,CAAC,oBAAoB;oCAC9C,CAAC,CAAC,sBAAU,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC;oCAClC,CAAC,CAAC,MAAM,CAAC;gCACb,+EAA+E;gCAC/E,mFAAmF;gCACnF,wFAAwF;gCACxF,oFAAoF;gCACpF,yFAAyF;gCACzF,yFAAyF;gCACzF,sFAAsF;gCACtF,6CAA6C;gCAC7C,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gCACvB,IAAI,CAAC,aAAa,CAAC;oCACf,MAAM,EAAE,QAAQ;oCAChB,gBAAgB,EAAE,UAAU,CAAC,gBAAgB;oCAC7C,WAAW,EAAE,UAAU,CAAC,WAAW;oCACnC,IAAI,EAAE,gCAAc,CAAC,2BAA2B;iCACnD,CAAC,CAAC;4BACP,CAAC,CAAC,CAAC;wBACP,CAAC,CAAC,CAAC;wBACH,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;qBACpC;oBACD,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;iBACvC;aACJ;YACD,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;SACpC;QACD,OAAO,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC;IAC7C,CAAC;IAEO,KAAK,CAAC,uBAAuB,CAAC,GAAmB,EAAE,KAAY,EAAE,UAAuB;QAC5F,MAAM,yBAAyB,GAAG,MAAM,0BAAW,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,CAChE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CACnC,CAAC;QACF,IAAI,yBAAyB,CAAC,MAAM,EAAE;YAClC,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC;YAC7D,KAAK,MAAM,SAAS,IAAI,yBAAyB,EAAE;gBAC/C,iEAAiE;gBACjE,oDAAoD;gBACpD,MAAM,iBAAiB,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;gBAC3D,IAAI,iBAAiB,EAAE;oBACnB,MAAM,KAAK,GAAG,OAAO,iBAAiB,KAAK,QAAQ,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,SAAS,CAAC;oBACpF,KAAK,MAAM,YAAY,IAAI,KAAK,CAAC,aAAa,EAAE;wBAC5C,MAAM,UAAU,GAAG,MAAM,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,EAAE,KAAK,CAAC,CAAC;wBAC9E,IAAI,UAAU,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;4BACvC,YAAY,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;yBAC1C;qBACJ;oBACD,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;iBACvC;aACJ;SACJ;aAAM;YACH,oDAAoD;YACpD,oEAAoE;YACpE,KAAK,MAAM,YAAY,IAAI,KAAK,CAAC,aAAa,EAAE;gBAC5C,YAAY,CAAC,gBAAgB,EAAE,CAAC;aACnC;SACJ;IACL,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,GAAmB,EAAE,KAAY;QACzD,MAAM,YAAY,GAA6B,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QACtE,MAAM,qBAAqB,GACvB,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,gBAAgB;YAC9B,CAAC,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,GAAG,EAAE,YAAY,CAAC,gBAAgB,CAAC,CAAC,CAAC;QACnF,IAAI,CAAC,qBAAqB,EAAE;YACxB,OAAO;SACV;QACD,MAAM,0BAA0B,GAAG,MAAM,qBAAqB,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAChF,IAAI,0BAA0B,EAAE;YAC5B,MAAM,MAAM,GAAG,MAAM,qBAAqB,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YAC7D,IAAI,MAAM,EAAE;gBACR,YAAY,CAAC,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC;gBACtC,YAAY,CAAC,oBAAoB,GAAG,MAAM,CAAC,gBAAgB,CAAC;gBAC5D,YAAY,CAAC,QAAQ,GAAG;oBACpB;wBACI,WAAW,EAAE,cAAc;wBAC3B,OAAO,EAAE,MAAM,CAAC,OAAO;qBAC1B;iBACJ,CAAC;aACL;YACD,OAAO;SACV;QACD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,0BAA0B,CAAC,GAAG,EAAE,KAAK,EAAE;YACjF,qBAAqB,CAAC,EAAE;SAC3B,CAAC,CAAC;QACH,IAAI,OAAO,IAAI,OAAO,CAAC,MAAM,EAAE;YAC3B,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YAC5B,YAAY,CAAC,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC;YAC/C,YAAY,CAAC,oBAAoB,GAAG,QAAQ,CAAC,MAAM,CAAC,gBAAgB,CAAC;YACrE,YAAY,CAAC,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC;YAC9C,YAAY,CAAC,gBAAgB,GAAG,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YACnD,YAAY,CAAC,QAAQ,GAAG;gBACpB;oBACI,WAAW,EAAE,cAAc;oBAC3B,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,OAAO;iBACnC;aACJ,CAAC;SACL;aAAM;YACH,KAAK,CAAC,aAAa,GAAG,EAAE,CAAC;SAC5B;IACL,CAAC;IAED;;;;;;;;;OASG;IACI,oBAAoB,CAAC,KAAY;QACpC,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,IAAI,iBAAiB,GAAG,CAAC,CAAC;QAE1B,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,KAAK,EAAE;YAC5B,UAAU,IAAI,IAAI,CAAC,iBAAiB,CAAC;YACrC,iBAAiB,IAAI,IAAI,CAAC,wBAAwB,CAAC;SACtD;QACD,KAAK,MAAM,SAAS,IAAI,KAAK,CAAC,UAAU,EAAE;YACtC,UAAU,IAAI,SAAS,CAAC,KAAK,CAAC;YAC9B,iBAAiB,IAAI,SAAS,CAAC,YAAY,CAAC;SAC/C;QAED,KAAK,CAAC,QAAQ,GAAG,UAAU,CAAC;QAC5B,KAAK,CAAC,eAAe,GAAG,iBAAiB,CAAC;QAE1C,IAAI,aAAa,GAAG,CAAC,CAAC;QACtB,IAAI,oBAAoB,GAAG,CAAC,CAAC;QAC7B,KAAK,MAAM,YAAY,IAAI,KAAK,CAAC,aAAa,EAAE;YAC5C,aAAa,IAAI,YAAY,CAAC,eAAe,CAAC;YAC9C,oBAAoB,IAAI,YAAY,CAAC,sBAAsB,CAAC;SAC/D;QAED,KAAK,CAAC,QAAQ,GAAG,aAAa,CAAC;QAC/B,KAAK,CAAC,eAAe,GAAG,oBAAoB,CAAC;IACjD,CAAC;IAEO,YAAY,CAAC,KAAY,EAAE,SAAoB;QACnD,IAAI,KAAK,CAAC,UAAU,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,mBAAW,CAAC,CAAC,CAAC,EAAE,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC,EAAE;YAClF,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;SACpC;IACL,CAAC;CACJ,CAAA;AAlcY,eAAe;IAD3B,mBAAU,EAAE;qCAGkB,8BAAa;QACf,0BAAW;QACR,iCAAc;QACP,+CAAqB;QACxB,wCAAkB;QACjB,0DAA0B;GAPlD,eAAe,CAkc3B;AAlcY,0CAAe"}
|
|
1
|
+
{"version":3,"file":"order-calculator.js","sourceRoot":"","sources":["../../../../src/service/helpers/order-calculator/order-calculator.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ import { TransactionalConnection } from '../../../connection/transactional-conne
|
|
|
5
5
|
import { Order } from '../../../entity/order/order.entity';
|
|
6
6
|
import { EventBus } from '../../../event-bus/index';
|
|
7
7
|
import { HistoryService } from '../../services/history.service';
|
|
8
|
+
import { ProductVariantService } from '../../services/product-variant.service';
|
|
8
9
|
import { PromotionService } from '../../services/promotion.service';
|
|
9
10
|
import { StockMovementService } from '../../services/stock-movement.service';
|
|
10
11
|
import { OrderState, OrderTransitionData } from './order-state';
|
|
@@ -15,9 +16,10 @@ export declare class OrderStateMachine {
|
|
|
15
16
|
private historyService;
|
|
16
17
|
private promotionService;
|
|
17
18
|
private eventBus;
|
|
19
|
+
private productVariantService;
|
|
18
20
|
readonly config: StateMachineConfig<OrderState, OrderTransitionData>;
|
|
19
21
|
private readonly initialState;
|
|
20
|
-
constructor(connection: TransactionalConnection, configService: ConfigService, stockMovementService: StockMovementService, historyService: HistoryService, promotionService: PromotionService, eventBus: EventBus);
|
|
22
|
+
constructor(connection: TransactionalConnection, configService: ConfigService, stockMovementService: StockMovementService, historyService: HistoryService, promotionService: PromotionService, eventBus: EventBus, productVariantService: ProductVariantService);
|
|
21
23
|
getInitialState(): OrderState;
|
|
22
24
|
canTransition(currentState: OrderState, newState: OrderState): boolean;
|
|
23
25
|
getNextStates(order: Order): ReadonlyArray<OrderState>;
|
|
@@ -27,18 +27,20 @@ const product_variant_entity_1 = require("../../../entity/product-variant/produc
|
|
|
27
27
|
const order_placed_event_1 = require("../../../event-bus/events/order-placed-event");
|
|
28
28
|
const index_1 = require("../../../event-bus/index");
|
|
29
29
|
const history_service_1 = require("../../services/history.service");
|
|
30
|
+
const product_variant_service_1 = require("../../services/product-variant.service");
|
|
30
31
|
const promotion_service_1 = require("../../services/promotion.service");
|
|
31
32
|
const stock_movement_service_1 = require("../../services/stock-movement.service");
|
|
32
33
|
const order_utils_1 = require("../utils/order-utils");
|
|
33
34
|
const order_state_1 = require("./order-state");
|
|
34
35
|
let OrderStateMachine = class OrderStateMachine {
|
|
35
|
-
constructor(connection, configService, stockMovementService, historyService, promotionService, eventBus) {
|
|
36
|
+
constructor(connection, configService, stockMovementService, historyService, promotionService, eventBus, productVariantService) {
|
|
36
37
|
this.connection = connection;
|
|
37
38
|
this.configService = configService;
|
|
38
39
|
this.stockMovementService = stockMovementService;
|
|
39
40
|
this.historyService = historyService;
|
|
40
41
|
this.promotionService = promotionService;
|
|
41
42
|
this.eventBus = eventBus;
|
|
43
|
+
this.productVariantService = productVariantService;
|
|
42
44
|
this.initialState = 'Created';
|
|
43
45
|
this.config = this.initConfig();
|
|
44
46
|
}
|
|
@@ -121,6 +123,18 @@ let OrderStateMachine = class OrderStateMachine {
|
|
|
121
123
|
if (!data.order.shippingLines || data.order.shippingLines.length === 0) {
|
|
122
124
|
return `message.cannot-transition-to-payment-without-shipping-method`;
|
|
123
125
|
}
|
|
126
|
+
const variantsWithInsufficientSaleableStock = [];
|
|
127
|
+
for (const line of data.order.lines) {
|
|
128
|
+
const availableStock = await this.productVariantService.getSaleableStockLevel(data.ctx, line.productVariant);
|
|
129
|
+
if (line.quantity > availableStock) {
|
|
130
|
+
variantsWithInsufficientSaleableStock.push(line.productVariant);
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
if (variantsWithInsufficientSaleableStock.length) {
|
|
134
|
+
return data.ctx.translate('message.cannot-transition-to-payment-due-to-insufficient-stock', {
|
|
135
|
+
productVariantNames: variantsWithInsufficientSaleableStock.map(v => v.name).join(', '),
|
|
136
|
+
});
|
|
137
|
+
}
|
|
124
138
|
}
|
|
125
139
|
if (toState === 'PaymentAuthorized') {
|
|
126
140
|
const hasAnAuthorizedPayment = !!data.order.payments.find(p => p.state === 'Authorized');
|
|
@@ -239,7 +253,8 @@ OrderStateMachine = __decorate([
|
|
|
239
253
|
stock_movement_service_1.StockMovementService,
|
|
240
254
|
history_service_1.HistoryService,
|
|
241
255
|
promotion_service_1.PromotionService,
|
|
242
|
-
index_1.EventBus
|
|
256
|
+
index_1.EventBus,
|
|
257
|
+
product_variant_service_1.ProductVariantService])
|
|
243
258
|
], OrderStateMachine);
|
|
244
259
|
exports.OrderStateMachine = OrderStateMachine;
|
|
245
260
|
//# sourceMappingURL=order-state-machine.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order-state-machine.js","sourceRoot":"","sources":["../../../../src/service/helpers/order-state-machine/order-state-machine.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yEAAuE;AAEvE,uDAAoD;AAGpD,yDAAqE;AACrE,oGAAgF;AAChF,oHAA+G;AAE/G,wHAAmH;AACnH,iDAAiE;AACjE,mEAA+D;AAC/D,2FAAuF;AACvF,4GAAiG;AACjG,qEAA2D;AAC3D,2EAAiE;AACjE,mGAAwF;AACxF,qFAAgF;AAChF,oDAAoD;AACpD,oEAAgE;AAChE,wEAAoE;AACpE,kFAA6E;AAC7E,sDAQ8B;AAE9B,+CAAuF;AAGvF,IAAa,iBAAiB,GAA9B,MAAa,iBAAiB;IAI1B,YACY,UAAmC,EACnC,aAA4B,EAC5B,oBAA0C,EAC1C,cAA8B,EAC9B,gBAAkC,EAClC,QAAkB;
|
|
1
|
+
{"version":3,"file":"order-state-machine.js","sourceRoot":"","sources":["../../../../src/service/helpers/order-state-machine/order-state-machine.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ import { ChannelService } from './services/channel.service';
|
|
|
5
5
|
import { GlobalSettingsService } from './services/global-settings.service';
|
|
6
6
|
import { RoleService } from './services/role.service';
|
|
7
7
|
import { ShippingMethodService } from './services/shipping-method.service';
|
|
8
|
+
import { TaxRateService } from './services/tax-rate.service';
|
|
8
9
|
import { ZoneService } from './services/zone.service';
|
|
9
10
|
/**
|
|
10
11
|
* Only used internally to run the various service init methods in the correct
|
|
@@ -18,8 +19,9 @@ export declare class InitializerService {
|
|
|
18
19
|
private administratorService;
|
|
19
20
|
private shippingMethodService;
|
|
20
21
|
private globalSettingsService;
|
|
22
|
+
private taxRateService;
|
|
21
23
|
private eventBus;
|
|
22
|
-
constructor(connection: TransactionalConnection, zoneService: ZoneService, channelService: ChannelService, roleService: RoleService, administratorService: AdministratorService, shippingMethodService: ShippingMethodService, globalSettingsService: GlobalSettingsService, eventBus: EventBus);
|
|
24
|
+
constructor(connection: TransactionalConnection, zoneService: ZoneService, channelService: ChannelService, roleService: RoleService, administratorService: AdministratorService, shippingMethodService: ShippingMethodService, globalSettingsService: GlobalSettingsService, taxRateService: TaxRateService, eventBus: EventBus);
|
|
23
25
|
onModuleInit(): Promise<void>;
|
|
24
26
|
/**
|
|
25
27
|
* On the first run of the server & worker, when dbConnectionOptions.synchronize = true, there can be
|
|
@@ -21,13 +21,14 @@ const channel_service_1 = require("./services/channel.service");
|
|
|
21
21
|
const global_settings_service_1 = require("./services/global-settings.service");
|
|
22
22
|
const role_service_1 = require("./services/role.service");
|
|
23
23
|
const shipping_method_service_1 = require("./services/shipping-method.service");
|
|
24
|
+
const tax_rate_service_1 = require("./services/tax-rate.service");
|
|
24
25
|
const zone_service_1 = require("./services/zone.service");
|
|
25
26
|
/**
|
|
26
27
|
* Only used internally to run the various service init methods in the correct
|
|
27
28
|
* sequence on bootstrap.
|
|
28
29
|
*/
|
|
29
30
|
let InitializerService = class InitializerService {
|
|
30
|
-
constructor(connection, zoneService, channelService, roleService, administratorService, shippingMethodService, globalSettingsService, eventBus) {
|
|
31
|
+
constructor(connection, zoneService, channelService, roleService, administratorService, shippingMethodService, globalSettingsService, taxRateService, eventBus) {
|
|
31
32
|
this.connection = connection;
|
|
32
33
|
this.zoneService = zoneService;
|
|
33
34
|
this.channelService = channelService;
|
|
@@ -35,6 +36,7 @@ let InitializerService = class InitializerService {
|
|
|
35
36
|
this.administratorService = administratorService;
|
|
36
37
|
this.shippingMethodService = shippingMethodService;
|
|
37
38
|
this.globalSettingsService = globalSettingsService;
|
|
39
|
+
this.taxRateService = taxRateService;
|
|
38
40
|
this.eventBus = eventBus;
|
|
39
41
|
}
|
|
40
42
|
async onModuleInit() {
|
|
@@ -51,6 +53,7 @@ let InitializerService = class InitializerService {
|
|
|
51
53
|
await this.roleService.initRoles();
|
|
52
54
|
await this.administratorService.initAdministrators();
|
|
53
55
|
await this.shippingMethodService.initShippingMethods();
|
|
56
|
+
await this.taxRateService.initTaxRates();
|
|
54
57
|
this.eventBus.publish(new initializer_event_1.InitializerEvent());
|
|
55
58
|
}
|
|
56
59
|
/**
|
|
@@ -91,6 +94,7 @@ InitializerService = __decorate([
|
|
|
91
94
|
administrator_service_1.AdministratorService,
|
|
92
95
|
shipping_method_service_1.ShippingMethodService,
|
|
93
96
|
global_settings_service_1.GlobalSettingsService,
|
|
97
|
+
tax_rate_service_1.TaxRateService,
|
|
94
98
|
event_bus_1.EventBus])
|
|
95
99
|
], InitializerService);
|
|
96
100
|
exports.InitializerService = InitializerService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initializer.service.js","sourceRoot":"","sources":["../../src/service/initializer.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAE5C,oEAAyD;AACzD,qFAAiF;AACjF,uFAA6E;AAC7E,4CAAwC;AACxC,6EAAyE;AAEzE,4EAAwE;AACxE,gEAA4D;AAC5D,gFAA2E;AAC3E,0DAAsD;AACtD,gFAA2E;AAC3E,0DAAsD;AAEtD;;;GAGG;AAEH,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;IAC3B,YACY,UAAmC,EACnC,WAAwB,EACxB,cAA8B,EAC9B,WAAwB,EACxB,oBAA0C,EAC1C,qBAA4C,EAC5C,qBAA4C,EAC5C,QAAkB;
|
|
1
|
+
{"version":3,"file":"initializer.service.js","sourceRoot":"","sources":["../../src/service/initializer.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAE5C,oEAAyD;AACzD,qFAAiF;AACjF,uFAA6E;AAC7E,4CAAwC;AACxC,6EAAyE;AAEzE,4EAAwE;AACxE,gEAA4D;AAC5D,gFAA2E;AAC3E,0DAAsD;AACtD,gFAA2E;AAC3E,kEAA6D;AAC7D,0DAAsD;AAEtD;;;GAGG;AAEH,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;IAC3B,YACY,UAAmC,EACnC,WAAwB,EACxB,cAA8B,EAC9B,WAAwB,EACxB,oBAA0C,EAC1C,qBAA4C,EAC5C,qBAA4C,EAC5C,cAA8B,EAC9B,QAAkB;QARlB,eAAU,GAAV,UAAU,CAAyB;QACnC,gBAAW,GAAX,WAAW,CAAa;QACxB,mBAAc,GAAd,cAAc,CAAgB;QAC9B,gBAAW,GAAX,WAAW,CAAa;QACxB,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,mBAAc,GAAd,cAAc,CAAgB;QAC9B,aAAQ,GAAR,QAAQ,CAAU;IAC3B,CAAC;IAEJ,KAAK,CAAC,YAAY;QACd,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACrC,iFAAiF;QACjF,6EAA6E;QAC7E,iFAAiF;QACjF,uEAAuE;QACvE,uFAAuF;QACvF,2CAA2C;QAC3C,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC;QACnC,MAAM,IAAI,CAAC,qBAAqB,CAAC,kBAAkB,EAAE,CAAC;QACtD,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,CAAC;QACzC,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC;QACnC,MAAM,IAAI,CAAC,oBAAoB,CAAC,kBAAkB,EAAE,CAAC;QACrD,MAAM,IAAI,CAAC,qBAAqB,CAAC,mBAAmB,EAAE,CAAC;QACvD,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,CAAC;QACzC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,oCAAgB,EAAE,CAAC,CAAC;IAClD,CAAC;IAED;;;;;;;;OAQG;IACK,KAAK,CAAC,uBAAuB;QACjC,MAAM,OAAO,GAAG,EAAE,CAAC;QACnB,MAAM,OAAO,GAAG,GAAG,CAAC;QACpB,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,OAAO,EAAE,OAAO,EAAE,EAAE;YAChD,IAAI;gBACA,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,aAAa,CAAC,oCAAa,CAAC,CAAC,IAAI,EAAE,CAAC;gBACvF,OAAO;aACV;YAAC,OAAO,CAAC,EAAE;gBACR,IAAI,OAAO,GAAG,OAAO,GAAG,CAAC,EAAE;oBACvB,uBAAM,CAAC,IAAI,CAAC,2CAA2C,OAAO,GAAG,CAAC,CAAC;oBACnE,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;iBAC9D;qBAAM;oBACH,uBAAM,CAAC,KAAK,CAAC,oDAAoD,EAAE,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;iBAC1F;aACJ;SACJ;IACL,CAAC;CACJ,CAAA;AAzDY,kBAAkB;IAD9B,mBAAU,EAAE;qCAGe,kDAAuB;QACtB,0BAAW;QACR,gCAAc;QACjB,0BAAW;QACF,4CAAoB;QACnB,+CAAqB;QACrB,+CAAqB;QAC5B,iCAAc;QACpB,oBAAQ;GAVrB,kBAAkB,CAyD9B;AAzDY,gDAAkB"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { CreateFacetValueInput, CreateFacetValueWithFacetInput, DeletionResponse, LanguageCode, UpdateFacetValueInput } from '@vendure/common/lib/generated-types';
|
|
2
|
-
import { ID } from '@vendure/common/lib/shared-types';
|
|
2
|
+
import { ID, PaginatedList } from '@vendure/common/lib/shared-types';
|
|
3
3
|
import { RequestContext } from '../../api/common/request-context';
|
|
4
|
+
import { RelationPaths } from '../../api/index';
|
|
5
|
+
import { ListQueryOptions } from '../../common/index';
|
|
4
6
|
import { Translated } from '../../common/types/locale-types';
|
|
5
7
|
import { ConfigService } from '../../config/config.service';
|
|
6
8
|
import { TransactionalConnection } from '../../connection/transactional-connection';
|
|
@@ -8,6 +10,7 @@ import { FacetValue } from '../../entity/facet-value/facet-value.entity';
|
|
|
8
10
|
import { Facet } from '../../entity/facet/facet.entity';
|
|
9
11
|
import { EventBus } from '../../event-bus';
|
|
10
12
|
import { CustomFieldRelationService } from '../helpers/custom-field-relation/custom-field-relation.service';
|
|
13
|
+
import { ListQueryBuilder } from '../helpers/list-query-builder/list-query-builder';
|
|
11
14
|
import { TranslatableSaver } from '../helpers/translatable-saver/translatable-saver';
|
|
12
15
|
import { TranslatorService } from '../helpers/translator/translator.service';
|
|
13
16
|
import { ChannelService } from './channel.service';
|
|
@@ -25,12 +28,21 @@ export declare class FacetValueService {
|
|
|
25
28
|
private channelService;
|
|
26
29
|
private eventBus;
|
|
27
30
|
private translator;
|
|
28
|
-
|
|
31
|
+
private listQueryBuilder;
|
|
32
|
+
constructor(connection: TransactionalConnection, translatableSaver: TranslatableSaver, configService: ConfigService, customFieldRelationService: CustomFieldRelationService, channelService: ChannelService, eventBus: EventBus, translator: TranslatorService, listQueryBuilder: ListQueryBuilder);
|
|
29
33
|
/**
|
|
30
34
|
* @deprecated Use {@link FacetValueService.findAll findAll(ctx, lang)} instead
|
|
31
35
|
*/
|
|
32
36
|
findAll(lang: LanguageCode): Promise<Array<Translated<FacetValue>>>;
|
|
33
37
|
findAll(ctx: RequestContext, lang: LanguageCode): Promise<Array<Translated<FacetValue>>>;
|
|
38
|
+
/**
|
|
39
|
+
* @description
|
|
40
|
+
* Returns a PaginatedList of FacetValues.
|
|
41
|
+
*
|
|
42
|
+
* TODO: in v2 this should replace the `findAll()` method.
|
|
43
|
+
* A separate method was created just to avoid a breaking change in v1.9.
|
|
44
|
+
*/
|
|
45
|
+
findAllList(ctx: RequestContext, options?: ListQueryOptions<FacetValue>, relations?: RelationPaths<FacetValue>): Promise<PaginatedList<Translated<FacetValue>>>;
|
|
34
46
|
findOne(ctx: RequestContext, id: ID): Promise<Translated<FacetValue> | undefined>;
|
|
35
47
|
findByIds(ctx: RequestContext, ids: ID[]): Promise<Array<Translated<FacetValue>>>;
|
|
36
48
|
/**
|
|
@@ -22,6 +22,7 @@ const facet_value_entity_1 = require("../../entity/facet-value/facet-value.entit
|
|
|
22
22
|
const event_bus_1 = require("../../event-bus");
|
|
23
23
|
const facet_value_event_1 = require("../../event-bus/events/facet-value-event");
|
|
24
24
|
const custom_field_relation_service_1 = require("../helpers/custom-field-relation/custom-field-relation.service");
|
|
25
|
+
const list_query_builder_1 = require("../helpers/list-query-builder/list-query-builder");
|
|
25
26
|
const translatable_saver_1 = require("../helpers/translatable-saver/translatable-saver");
|
|
26
27
|
const translator_service_1 = require("../helpers/translator/translator.service");
|
|
27
28
|
const translate_entity_1 = require("../helpers/utils/translate-entity");
|
|
@@ -33,7 +34,7 @@ const channel_service_1 = require("./channel.service");
|
|
|
33
34
|
* @docsCategory services
|
|
34
35
|
*/
|
|
35
36
|
let FacetValueService = class FacetValueService {
|
|
36
|
-
constructor(connection, translatableSaver, configService, customFieldRelationService, channelService, eventBus, translator) {
|
|
37
|
+
constructor(connection, translatableSaver, configService, customFieldRelationService, channelService, eventBus, translator, listQueryBuilder) {
|
|
37
38
|
this.connection = connection;
|
|
38
39
|
this.translatableSaver = translatableSaver;
|
|
39
40
|
this.configService = configService;
|
|
@@ -41,6 +42,7 @@ let FacetValueService = class FacetValueService {
|
|
|
41
42
|
this.channelService = channelService;
|
|
42
43
|
this.eventBus = eventBus;
|
|
43
44
|
this.translator = translator;
|
|
45
|
+
this.listQueryBuilder = listQueryBuilder;
|
|
44
46
|
}
|
|
45
47
|
findAll(ctxOrLang, lang) {
|
|
46
48
|
const [repository, languageCode] = ctxOrLang instanceof request_context_1.RequestContext
|
|
@@ -54,6 +56,27 @@ let FacetValueService = class FacetValueService {
|
|
|
54
56
|
})
|
|
55
57
|
.then(facetValues => facetValues.map(facetValue => translate_entity_1.translateDeep(facetValue, languageCode, ['facet'])));
|
|
56
58
|
}
|
|
59
|
+
/**
|
|
60
|
+
* @description
|
|
61
|
+
* Returns a PaginatedList of FacetValues.
|
|
62
|
+
*
|
|
63
|
+
* TODO: in v2 this should replace the `findAll()` method.
|
|
64
|
+
* A separate method was created just to avoid a breaking change in v1.9.
|
|
65
|
+
*/
|
|
66
|
+
findAllList(ctx, options, relations) {
|
|
67
|
+
return this.listQueryBuilder
|
|
68
|
+
.build(facet_value_entity_1.FacetValue, options, {
|
|
69
|
+
relations: relations !== null && relations !== void 0 ? relations : ['facet'],
|
|
70
|
+
channelId: ctx.channelId,
|
|
71
|
+
})
|
|
72
|
+
.getManyAndCount()
|
|
73
|
+
.then(([items, totalItems]) => {
|
|
74
|
+
return {
|
|
75
|
+
items: items.map(item => this.translator.translate(item, ctx, ['facet'])),
|
|
76
|
+
totalItems,
|
|
77
|
+
};
|
|
78
|
+
});
|
|
79
|
+
}
|
|
57
80
|
findOne(ctx, id) {
|
|
58
81
|
return this.connection
|
|
59
82
|
.getRepository(ctx, facet_value_entity_1.FacetValue)
|
|
@@ -189,7 +212,8 @@ FacetValueService = __decorate([
|
|
|
189
212
|
custom_field_relation_service_1.CustomFieldRelationService,
|
|
190
213
|
channel_service_1.ChannelService,
|
|
191
214
|
event_bus_1.EventBus,
|
|
192
|
-
translator_service_1.TranslatorService
|
|
215
|
+
translator_service_1.TranslatorService,
|
|
216
|
+
list_query_builder_1.ListQueryBuilder])
|
|
193
217
|
], FacetValueService);
|
|
194
218
|
exports.FacetValueService = FacetValueService;
|
|
195
219
|
//# sourceMappingURL=facet-value.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"facet-value.service.js","sourceRoot":"","sources":["../../../src/service/services/facet-value.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yEAO6C;AAG7C,sEAAkE;
|
|
1
|
+
{"version":3,"file":"facet-value.service.js","sourceRoot":"","sources":["../../../src/service/services/facet-value.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ import { OrderState } from '../helpers/order-state-machine/order-state';
|
|
|
12
12
|
import { PaymentState } from '../helpers/payment-state-machine/payment-state';
|
|
13
13
|
import { RefundState } from '../helpers/refund-state-machine/refund-state';
|
|
14
14
|
import { AdministratorService } from './administrator.service';
|
|
15
|
-
export
|
|
15
|
+
export interface CustomerHistoryEntryData {
|
|
16
16
|
[HistoryEntryType.CUSTOMER_REGISTERED]: {
|
|
17
17
|
strategy: string;
|
|
18
18
|
};
|
|
@@ -52,8 +52,8 @@ export declare type CustomerHistoryEntryData = {
|
|
|
52
52
|
[HistoryEntryType.CUSTOMER_NOTE]: {
|
|
53
53
|
note: string;
|
|
54
54
|
};
|
|
55
|
-
}
|
|
56
|
-
export
|
|
55
|
+
}
|
|
56
|
+
export interface OrderHistoryEntryData {
|
|
57
57
|
[HistoryEntryType.ORDER_STATE_TRANSITION]: {
|
|
58
58
|
from: OrderState;
|
|
59
59
|
to: OrderState;
|
|
@@ -95,7 +95,7 @@ export declare type OrderHistoryEntryData = {
|
|
|
95
95
|
[HistoryEntryType.ORDER_MODIFIED]: {
|
|
96
96
|
modificationId: ID;
|
|
97
97
|
};
|
|
98
|
-
}
|
|
98
|
+
}
|
|
99
99
|
export interface CreateCustomerHistoryEntryArgs<T extends keyof CustomerHistoryEntryData> {
|
|
100
100
|
customerId: ID;
|
|
101
101
|
ctx: RequestContext;
|
|
@@ -127,6 +127,96 @@ export interface UpdateCustomerHistoryEntryArgs<T extends keyof CustomerHistoryE
|
|
|
127
127
|
* related to a particular Customer or Order, recording significant events such as creation, state changes,
|
|
128
128
|
* notes, etc.
|
|
129
129
|
*
|
|
130
|
+
* ## Custom History Entry Types
|
|
131
|
+
*
|
|
132
|
+
* Since Vendure v1.9.0, it is possible to define custom HistoryEntry types.
|
|
133
|
+
*
|
|
134
|
+
* Let's take an example where we have some Customers who are businesses. We want to verify their
|
|
135
|
+
* tax ID in order to allow them wholesale rates. As part of this verification, we'd like to add
|
|
136
|
+
* an entry into the Customer's history with data about the tax ID verification.
|
|
137
|
+
*
|
|
138
|
+
* First of all we'd extend the GraphQL `HistoryEntryType` enum for our new type as part of a plugin
|
|
139
|
+
*
|
|
140
|
+
* @example
|
|
141
|
+
* ```TypeScript
|
|
142
|
+
* import { PluginCommonModule, VendurePlugin } from '\@vendure/core';
|
|
143
|
+
* import { VerificationService } from './verification.service';
|
|
144
|
+
*
|
|
145
|
+
* \@VendurePlugin({
|
|
146
|
+
* imports: [PluginCommonModule],
|
|
147
|
+
* adminApiExtensions: {
|
|
148
|
+
* schema: gql`
|
|
149
|
+
* extend enum HistoryEntryType {
|
|
150
|
+
* CUSTOMER_TAX_ID_VERIFICATION
|
|
151
|
+
* }
|
|
152
|
+
* `,
|
|
153
|
+
* },
|
|
154
|
+
* providers: [VerificationService],
|
|
155
|
+
* })
|
|
156
|
+
* export class TaxIDVerificationPlugin {}
|
|
157
|
+
* ```
|
|
158
|
+
*
|
|
159
|
+
* Next we need to create a TypeScript type definition file where we extend the `CustomerHistoryEntryData` interface. This is done
|
|
160
|
+
* via TypeScript's [declaration merging](https://www.typescriptlang.org/docs/handbook/declaration-merging.html#merging-interfaces)
|
|
161
|
+
* and [ambient modules](https://www.typescriptlang.org/docs/handbook/modules.html#ambient-modules) features.
|
|
162
|
+
*
|
|
163
|
+
* @example
|
|
164
|
+
* ```TypeScript
|
|
165
|
+
* // types.ts
|
|
166
|
+
* import { CustomerHistoryEntryData } from '\@vendure/core';
|
|
167
|
+
*
|
|
168
|
+
* export const CUSTOMER_TAX_ID_VERIFICATION = 'CUSTOMER_TAX_ID_VERIFICATION';
|
|
169
|
+
*
|
|
170
|
+
* declare module '@vendure/core' {
|
|
171
|
+
* interface CustomerHistoryEntryData {
|
|
172
|
+
* [CUSTOMER_TAX_ID_VERIFICATION]: {
|
|
173
|
+
* taxId: string;
|
|
174
|
+
* valid: boolean;
|
|
175
|
+
* name?: string;
|
|
176
|
+
* address?: string;
|
|
177
|
+
* };
|
|
178
|
+
* }
|
|
179
|
+
* }
|
|
180
|
+
* ```
|
|
181
|
+
*
|
|
182
|
+
* Note: it works exactly the same way if we wanted to add a custom type for Order history, except in that case we'd extend the
|
|
183
|
+
* `OrderHistoryEntryData` interface instead.
|
|
184
|
+
*
|
|
185
|
+
* Now that we have our types set up, we can use the HistoryService to add a new HistoryEntry in a type-safe manner:
|
|
186
|
+
*
|
|
187
|
+
* @example
|
|
188
|
+
* ```TypeScript
|
|
189
|
+
* // verification.service.ts
|
|
190
|
+
* import { Injectable } from '\@nestjs/common';
|
|
191
|
+
* import { RequestContext } from '\@vendure/core';
|
|
192
|
+
* import { CUSTOMER_TAX_ID_VERIFICATION } from './types';
|
|
193
|
+
*
|
|
194
|
+
* \@Injectable()
|
|
195
|
+
* export class VerificationService {
|
|
196
|
+
* constructor(private historyService: HistoryService) {}
|
|
197
|
+
*
|
|
198
|
+
* async verifyTaxId(ctx: RequestContext, customerId: ID, taxId: string) {
|
|
199
|
+
* const result = await someTaxIdCheckingService(taxId);
|
|
200
|
+
*
|
|
201
|
+
* await this.historyService.createHistoryEntryForCustomer({
|
|
202
|
+
* customerId,
|
|
203
|
+
* ctx,
|
|
204
|
+
* type: CUSTOMER_TAX_ID_VERIFICATION,
|
|
205
|
+
* data: {
|
|
206
|
+
* taxId,
|
|
207
|
+
* valid: result.isValid,
|
|
208
|
+
* name: result.companyName,
|
|
209
|
+
* address: result.registeredAddress,
|
|
210
|
+
* },
|
|
211
|
+
* });
|
|
212
|
+
* }
|
|
213
|
+
* }
|
|
214
|
+
* ```
|
|
215
|
+
* {{% alert %}}
|
|
216
|
+
* It is also possible to define a UI component to display custom history entry types. See the
|
|
217
|
+
* [Custom History Timeline Components guide]({{< relref "custom-timeline-components" >}}).
|
|
218
|
+
* {{% /alert %}}
|
|
219
|
+
*
|
|
130
220
|
* @docsCategory services
|
|
131
221
|
*/
|
|
132
222
|
export declare class HistoryService {
|