@vendure/core 2.0.0-next.8 → 2.0.0

package/dist/entity/index.d.ts

@@ -1,4 +1,3 @@
-export * from './custom-entity-fields';
 export * from './address/address.entity';
 export * from './administrator/administrator.entity';
 export * from './asset/asset.entity';
@@ -7,44 +6,56 @@ export * from './authentication-method/external-authentication-method.entity';
 export * from './authentication-method/native-authentication-method.entity';
 export * from './base/base.entity';
 export * from './channel/channel.entity';
-export * from './collection/collection.entity';
 export * from './collection/collection-asset.entity';
 export * from './collection/collection-translation.entity';
-export * from './country/country.entity';
-export * from './country/country-translation.entity';
-export * from './customer/customer.entity';
+export * from './collection/collection.entity';
+export * from './region/country.entity';
+export * from './custom-entity-fields';
 export * from './customer-group/customer-group.entity';
-export * from './facet/facet.entity';
-export * from './facet/facet-translation.entity';
-export * from './facet-value/facet-value.entity';
+export * from './customer/customer.entity';
 export * from './facet-value/facet-value-translation.entity';
+export * from './facet-value/facet-value.entity';
+export * from './facet/facet-translation.entity';
+export * from './facet/facet.entity';
 export * from './fulfillment/fulfillment.entity';
 export * from './global-settings/global-settings.entity';
 export * from './order/order.entity';
-export * from './order-item/order-item.entity';
 export * from './order-line/order-line.entity';
+export * from './order-line-reference/fulfillment-line.entity';
+export * from './order-line-reference/order-modification-line.entity';
+export * from './order-line-reference/order-line-reference.entity';
+export * from './order-line-reference/refund-line.entity';
 export * from './payment/payment.entity';
 export * from './payment-method/payment-method.entity';
-export * from './product/product.entity';
-export * from './product/product-asset.entity';
-export * from './product/product-translation.entity';
-export * from './product-option/product-option.entity';
-export * from './product-option/product-option-translation.entity';
-export * from './product-option-group/product-option-group.entity';
+export * from './payment/payment.entity';
 export * from './product-option-group/product-option-group-translation.entity';
-export * from './product-variant/product-variant.entity';
+export * from './product-option-group/product-option-group.entity';
+export * from './product-option/product-option-translation.entity';
+export * from './product-option/product-option.entity';
 export * from './product-variant/product-variant-asset.entity';
-export * from './product-variant/product-variant-translation.entity';
 export * from './product-variant/product-variant-price.entity';
+export * from './product-variant/product-variant-translation.entity';
+export * from './product-variant/product-variant.entity';
+export * from './product/product-asset.entity';
+export * from './product/product-translation.entity';
+export * from './product/product.entity';
 export * from './promotion/promotion.entity';
 export * from './refund/refund.entity';
 export * from './role/role.entity';
-export * from './session/session.entity';
 export * from './session/anonymous-session.entity';
 export * from './session/authenticated-session.entity';
-export * from './surcharge/surcharge.entity';
+export * from './session/session.entity';
 export * from './shipping-line/shipping-line.entity';
 export * from './shipping-method/shipping-method.entity';
+export * from './stock-level/stock-level.entity';
+export * from './stock-location/stock-location.entity';
+export * from './stock-movement/allocation.entity';
+export * from './stock-movement/cancellation.entity';
+export * from './stock-movement/release.entity';
+export * from './stock-movement/sale.entity';
+export * from './stock-movement/stock-adjustment.entity';
+export * from './stock-movement/stock-movement.entity';
+export * from './surcharge/surcharge.entity';
 export * from './tag/tag.entity';
 export * from './tax-category/tax-category.entity';
 export * from './tax-rate/tax-rate.entity';

package/dist/entity/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -10,7 +14,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./custom-entity-fields"), exports);
 __exportStar(require("./address/address.entity"), exports);
 __exportStar(require("./administrator/administrator.entity"), exports);
 __exportStar(require("./asset/asset.entity"), exports);
@@ -19,44 +22,56 @@ __exportStar(require("./authentication-method/external-authentication-method.ent
 __exportStar(require("./authentication-method/native-authentication-method.entity"), exports);
 __exportStar(require("./base/base.entity"), exports);
 __exportStar(require("./channel/channel.entity"), exports);
-__exportStar(require("./collection/collection.entity"), exports);
 __exportStar(require("./collection/collection-asset.entity"), exports);
 __exportStar(require("./collection/collection-translation.entity"), exports);
-__exportStar(require("./country/country.entity"), exports);
-__exportStar(require("./country/country-translation.entity"), exports);
-__exportStar(require("./customer/customer.entity"), exports);
+__exportStar(require("./collection/collection.entity"), exports);
+__exportStar(require("./region/country.entity"), exports);
+__exportStar(require("./custom-entity-fields"), exports);
 __exportStar(require("./customer-group/customer-group.entity"), exports);
-__exportStar(require("./facet/facet.entity"), exports);
-__exportStar(require("./facet/facet-translation.entity"), exports);
-__exportStar(require("./facet-value/facet-value.entity"), exports);
+__exportStar(require("./customer/customer.entity"), exports);
 __exportStar(require("./facet-value/facet-value-translation.entity"), exports);
+__exportStar(require("./facet-value/facet-value.entity"), exports);
+__exportStar(require("./facet/facet-translation.entity"), exports);
+__exportStar(require("./facet/facet.entity"), exports);
 __exportStar(require("./fulfillment/fulfillment.entity"), exports);
 __exportStar(require("./global-settings/global-settings.entity"), exports);
 __exportStar(require("./order/order.entity"), exports);
-__exportStar(require("./order-item/order-item.entity"), exports);
 __exportStar(require("./order-line/order-line.entity"), exports);
+__exportStar(require("./order-line-reference/fulfillment-line.entity"), exports);
+__exportStar(require("./order-line-reference/order-modification-line.entity"), exports);
+__exportStar(require("./order-line-reference/order-line-reference.entity"), exports);
+__exportStar(require("./order-line-reference/refund-line.entity"), exports);
 __exportStar(require("./payment/payment.entity"), exports);
 __exportStar(require("./payment-method/payment-method.entity"), exports);
-__exportStar(require("./product/product.entity"), exports);
-__exportStar(require("./product/product-asset.entity"), exports);
-__exportStar(require("./product/product-translation.entity"), exports);
-__exportStar(require("./product-option/product-option.entity"), exports);
-__exportStar(require("./product-option/product-option-translation.entity"), exports);
-__exportStar(require("./product-option-group/product-option-group.entity"), exports);
+__exportStar(require("./payment/payment.entity"), exports);
 __exportStar(require("./product-option-group/product-option-group-translation.entity"), exports);
-__exportStar(require("./product-variant/product-variant.entity"), exports);
+__exportStar(require("./product-option-group/product-option-group.entity"), exports);
+__exportStar(require("./product-option/product-option-translation.entity"), exports);
+__exportStar(require("./product-option/product-option.entity"), exports);
 __exportStar(require("./product-variant/product-variant-asset.entity"), exports);
-__exportStar(require("./product-variant/product-variant-translation.entity"), exports);
 __exportStar(require("./product-variant/product-variant-price.entity"), exports);
+__exportStar(require("./product-variant/product-variant-translation.entity"), exports);
+__exportStar(require("./product-variant/product-variant.entity"), exports);
+__exportStar(require("./product/product-asset.entity"), exports);
+__exportStar(require("./product/product-translation.entity"), exports);
+__exportStar(require("./product/product.entity"), exports);
 __exportStar(require("./promotion/promotion.entity"), exports);
 __exportStar(require("./refund/refund.entity"), exports);
 __exportStar(require("./role/role.entity"), exports);
-__exportStar(require("./session/session.entity"), exports);
 __exportStar(require("./session/anonymous-session.entity"), exports);
 __exportStar(require("./session/authenticated-session.entity"), exports);
-__exportStar(require("./surcharge/surcharge.entity"), exports);
+__exportStar(require("./session/session.entity"), exports);
 __exportStar(require("./shipping-line/shipping-line.entity"), exports);
 __exportStar(require("./shipping-method/shipping-method.entity"), exports);
+__exportStar(require("./stock-level/stock-level.entity"), exports);
+__exportStar(require("./stock-location/stock-location.entity"), exports);
+__exportStar(require("./stock-movement/allocation.entity"), exports);
+__exportStar(require("./stock-movement/cancellation.entity"), exports);
+__exportStar(require("./stock-movement/release.entity"), exports);
+__exportStar(require("./stock-movement/sale.entity"), exports);
+__exportStar(require("./stock-movement/stock-adjustment.entity"), exports);
+__exportStar(require("./stock-movement/stock-movement.entity"), exports);
+__exportStar(require("./surcharge/surcharge.entity"), exports);
 __exportStar(require("./tag/tag.entity"), exports);
 __exportStar(require("./tax-category/tax-category.entity"), exports);
 __exportStar(require("./tax-rate/tax-rate.entity"), exports);

package/dist/entity/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/entity/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAAuC;AACvC,2DAAyC;AACzC,uEAAqD;AACrD,uDAAqC;AACrC,uFAAqE;AACrE,gGAA8E;AAC9E,8FAA4E;AAC5E,qDAAmC;AACnC,2DAAyC;AACzC,iEAA+C;AAC/C,uEAAqD;AACrD,6EAA2D;AAC3D,2DAAyC;AACzC,uEAAqD;AACrD,6DAA2C;AAC3C,yEAAuD;AACvD,uDAAqC;AACrC,mEAAiD;AACjD,mEAAiD;AACjD,+EAA6D;AAC7D,mEAAiD;AACjD,2EAAyD;AACzD,uDAAqC;AACrC,iEAA+C;AAC/C,iEAA+C;AAC/C,2DAAyC;AACzC,yEAAuD;AACvD,2DAAyC;AACzC,iEAA+C;AAC/C,uEAAqD;AACrD,yEAAuD;AACvD,qFAAmE;AACnE,qFAAmE;AACnE,iGAA+E;AAC/E,2EAAyD;AACzD,iFAA+D;AAC/D,uFAAqE;AACrE,iFAA+D;AAC/D,+DAA6C;AAC7C,yDAAuC;AACvC,qDAAmC;AACnC,2DAAyC;AACzC,qEAAmD;AACnD,yEAAuD;AACvD,+DAA6C;AAC7C,uEAAqD;AACrD,2EAAyD;AACzD,mDAAiC;AACjC,qEAAmD;AACnD,6DAA2C;AAC3C,qDAAmC;AACnC,qDAAmC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/entity/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2DAAyC;AACzC,uEAAqD;AACrD,uDAAqC;AACrC,uFAAqE;AACrE,gGAA8E;AAC9E,8FAA4E;AAC5E,qDAAmC;AACnC,2DAAyC;AACzC,uEAAqD;AACrD,6EAA2D;AAC3D,iEAA+C;AAC/C,0DAAwC;AACxC,yDAAuC;AACvC,yEAAuD;AACvD,6DAA2C;AAC3C,+EAA6D;AAC7D,mEAAiD;AACjD,mEAAiD;AACjD,uDAAqC;AACrC,mEAAiD;AACjD,2EAAyD;AACzD,uDAAqC;AACrC,iEAA+C;AAC/C,iFAA+D;AAC/D,wFAAsE;AACtE,qFAAmE;AACnE,4EAA0D;AAC1D,2DAAyC;AACzC,yEAAuD;AACvD,2DAAyC;AACzC,iGAA+E;AAC/E,qFAAmE;AACnE,qFAAmE;AACnE,yEAAuD;AACvD,iFAA+D;AAC/D,iFAA+D;AAC/D,uFAAqE;AACrE,2EAAyD;AACzD,iEAA+C;AAC/C,uEAAqD;AACrD,2DAAyC;AACzC,+DAA6C;AAC7C,yDAAuC;AACvC,qDAAmC;AACnC,qEAAmD;AACnD,yEAAuD;AACvD,2DAAyC;AACzC,uEAAqD;AACrD,2EAAyD;AACzD,mEAAiD;AACjD,yEAAuD;AACvD,qEAAmD;AACnD,uEAAqD;AACrD,kEAAgD;AAChD,+DAA6C;AAC7C,2EAAyD;AACzD,yEAAuD;AACvD,+DAA6C;AAC7C,mDAAiC;AACjC,qEAAmD;AACnD,6DAA2C;AAC3C,qDAAmC;AACnC,qDAAmC"}

package/dist/entity/money.decorator.d.ts

@@ -0,0 +1,27 @@
+import { Type } from '@vendure/common/lib/shared-types';
+interface MoneyColumnOptions {
+    default?: number;
+    /** Whether the field is nullable. Defaults to false */
+    nullable?: boolean;
+}
+interface MoneyColumnConfig {
+    name: string;
+    entity: any;
+    options?: MoneyColumnOptions;
+}
+/**
+ * @description
+ * Use this decorator for any entity field that is storing a monetary value.
+ * This allows the column type to be defined by the configured {@link MoneyStrategy}.
+ *
+ * @docsCategory money
+ * @since 2.0.0
+ */
+export declare function Money(options?: MoneyColumnOptions): (entity: any, propertyName: string) => void;
+/**
+ * @description
+ * Returns any columns on the entity which have been decorated with the {@link EntityId}
+ * decorator.
+ */
+export declare function getMoneyColumnsFor(entityType: Type<any>): MoneyColumnConfig[];
+export {};

package/dist/entity/money.decorator.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMoneyColumnsFor = exports.Money = void 0;
+const moneyColumnRegistry = new Map();
+/**
+ * @description
+ * Use this decorator for any entity field that is storing a monetary value.
+ * This allows the column type to be defined by the configured {@link MoneyStrategy}.
+ *
+ * @docsCategory money
+ * @since 2.0.0
+ */
+function Money(options) {
+    return (entity, propertyName) => {
+        const idColumns = moneyColumnRegistry.get(entity);
+        const entry = { name: propertyName, entity, options };
+        if (idColumns) {
+            idColumns.push(entry);
+        }
+        else {
+            moneyColumnRegistry.set(entity, [entry]);
+        }
+    };
+}
+exports.Money = Money;
+/**
+ * @description
+ * Returns any columns on the entity which have been decorated with the {@link EntityId}
+ * decorator.
+ */
+function getMoneyColumnsFor(entityType) {
+    const match = Array.from(moneyColumnRegistry.entries()).find(([entity, columns]) => entity.constructor === entityType);
+    return match ? match[1] : [];
+}
+exports.getMoneyColumnsFor = getMoneyColumnsFor;
+//# sourceMappingURL=money.decorator.js.map

package/dist/entity/money.decorator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"money.decorator.js","sourceRoot":"","sources":["../../src/entity/money.decorator.ts"],"names":[],"mappings":";;;AAkBA,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAA4B,CAAC;AAEhE;;;;;;;GAOG;AACH,SAAgB,KAAK,CAAC,OAA4B;IAC9C,OAAO,CAAC,MAAW,EAAE,YAAoB,EAAE,EAAE;QACzC,MAAM,SAAS,GAAG,mBAAmB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAClD,MAAM,KAAK,GAAG,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;QACtD,IAAI,SAAS,EAAE;YACX,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SACzB;aAAM;YACH,mBAAmB,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;SAC5C;IACL,CAAC,CAAC;AACN,CAAC;AAVD,sBAUC;AAED;;;;GAIG;AACH,SAAgB,kBAAkB,CAAC,UAAqB;IACpD,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CACxD,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,KAAK,UAAU,CAC3D,CAAC;IACF,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AACjC,CAAC;AALD,gDAKC"}

package/dist/entity/order/order.entity.d.ts

@@ -1,4 +1,4 @@
-import { CurrencyCode, Discount, OrderAddress, OrderTaxSummary } from '@vendure/common/lib/generated-types';
+import { CurrencyCode, Discount, OrderAddress, OrderTaxSummary, OrderType } from '@vendure/common/lib/generated-types';
 import { DeepPartial, ID } from '@vendure/common/lib/shared-types';
 import { ChannelAware } from '../../common/types/common-types';
 import { HasCustomFields } from '../../config/custom-field/custom-field-types';
@@ -7,7 +7,7 @@ import { VendureEntity } from '../base/base.entity';
 import { Channel } from '../channel/channel.entity';
 import { CustomOrderFields } from '../custom-entity-fields';
 import { Customer } from '../customer/customer.entity';
-import { OrderItem } from '../order-item/order-item.entity';
+import { Fulfillment } from '../fulfillment/fulfillment.entity';
 import { OrderLine } from '../order-line/order-line.entity';
 import { OrderModification } from '../order-modification/order-modification.entity';
 import { Payment } from '../payment/payment.entity';
@@ -27,6 +27,10 @@ import { Surcharge } from '../surcharge/surcharge.entity';
  */
 export declare class Order extends VendureEntity implements ChannelAware, HasCustomFields {
     constructor(input?: DeepPartial<Order>);
+    type: OrderType;
+    sellerOrders: Order[];
+    aggregateOrder?: Order;
+    aggregateOrderId?: ID;
     /**
      * @description
      * A unique code for the Order, generated according to the
@@ -51,6 +55,7 @@ export declare class Order extends VendureEntity implements ChannelAware, HasCus
      */
     orderPlacedAt?: Date;
     customer?: Customer;
+    customerId?: ID;
     lines: OrderLine[];
     /**
      * @description
@@ -74,6 +79,7 @@ export declare class Order extends VendureEntity implements ChannelAware, HasCus
     shippingAddress: OrderAddress;
     billingAddress: OrderAddress;
     payments: Payment[];
+    fulfillments: Fulfillment[];
     currencyCode: CurrencyCode;
     customFields: CustomOrderFields;
     taxZoneId?: ID;
@@ -120,6 +126,5 @@ export declare class Order extends VendureEntity implements ChannelAware, HasCus
      * A summary of the taxes being applied to this Order.
      */
     get taxSummary(): OrderTaxSummary[];
-    getOrderItems(): OrderItem[];
     private throwIfLinesNotJoined;
 }

package/dist/entity/order/order.entity.js

@@ -21,6 +21,8 @@ const channel_entity_1 = require("../channel/channel.entity");
 const custom_entity_fields_1 = require("../custom-entity-fields");
 const customer_entity_1 = require("../customer/customer.entity");
 const entity_id_decorator_1 = require("../entity-id.decorator");
+const fulfillment_entity_1 = require("../fulfillment/fulfillment.entity");
+const money_decorator_1 = require("../money.decorator");
 const order_line_entity_1 = require("../order-line/order-line.entity");
 const order_modification_entity_1 = require("../order-modification/order-modification.entity");
 const payment_entity_1 = require("../payment/payment.entity");
@@ -43,9 +45,10 @@ let Order = Order_1 = class Order extends base_entity_1.VendureEntity {
         super(input);
     }
     get discounts() {
+        var _a, _b;
         this.throwIfLinesNotJoined('discounts');
         const groupedAdjustments = new Map();
-        for (const line of this.lines) {
+        for (const line of (_a = this.lines) !== null && _a !== void 0 ? _a : []) {
             for (const discount of line.discounts) {
                 const adjustment = groupedAdjustments.get(discount.adjustmentSource);
                 if (adjustment) {
@@ -57,7 +60,7 @@ let Order = Order_1 = class Order extends base_entity_1.VendureEntity {
                 }
             }
         }
-        for (const shippingLine of this.shippingLines) {
+        for (const shippingLine of (_b = this.shippingLines) !== null && _b !== void 0 ? _b : []) {
             for (const discount of shippingLine.discounts) {
                 const adjustment = groupedAdjustments.get(discount.adjustmentSource);
                 if (adjustment) {
@@ -94,10 +97,11 @@ let Order = Order_1 = class Order extends base_entity_1.VendureEntity {
      * A summary of the taxes being applied to this Order.
      */
     get taxSummary() {
+        var _a, _b;
         this.throwIfLinesNotJoined('taxSummary');
         const taxRateMap = new Map();
         const taxId = (taxLine) => `${taxLine.description}:${taxLine.taxRate}`;
-        const taxableLines = [...this.lines, ...this.shippingLines];
+        const taxableLines = [...((_a = this.lines) !== null && _a !== void 0 ? _a : []), ...((_b = this.shippingLines) !== null && _b !== void 0 ? _b : [])];
         for (const line of taxableLines) {
             const taxRateTotal = (0, shared_utils_1.summate)(line.taxLines, 'taxRate');
             for (const taxLine of line.taxLines) {
@@ -128,22 +132,33 @@ let Order = Order_1 = class Order extends base_entity_1.VendureEntity {
             taxTotal: row.tax,
         }));
     }
-    getOrderItems() {
-        this.throwIfLinesNotJoined('getOrderItems');
-        return this.lines.reduce((items, line) => {
-            return [...items, ...line.items];
-        }, []);
-    }
     throwIfLinesNotJoined(propertyName) {
         if (this.lines == null) {
             const errorMessage = [
                 `The property "${propertyName}" on the Order entity requires the Order.lines relation to be joined.`,
-                `This can be done with the EntityHydratorService: \`await entityHydratorService.hydrate(ctx, order, { relations: ['lines'] })\``,
+                "This can be done with the EntityHydratorService: `await entityHydratorService.hydrate(ctx, order, { relations: ['lines'] })`",
             ];
             throw new errors_1.InternalServerError(errorMessage.join('\n'));
         }
     }
 };
+__decorate([
+    (0, typeorm_1.Column)('varchar', { default: generated_types_1.OrderType.Regular }),
+    __metadata("design:type", String)
+], Order.prototype, "type", void 0);
+__decorate([
+    (0, typeorm_1.OneToMany)(type => Order_1, sellerOrder => sellerOrder.aggregateOrder),
+    __metadata("design:type", Array)
+], Order.prototype, "sellerOrders", void 0);
+__decorate([
+    (0, typeorm_1.Index)(),
+    (0, typeorm_1.ManyToOne)(type => Order_1, aggregateOrder => aggregateOrder.sellerOrders),
+    __metadata("design:type", Order)
+], Order.prototype, "aggregateOrder", void 0);
+__decorate([
+    (0, entity_id_decorator_1.EntityId)({ nullable: true }),
+    __metadata("design:type", Object)
+], Order.prototype, "aggregateOrderId", void 0);
 __decorate([
     (0, typeorm_1.Column)(),
     (0, typeorm_1.Index)({ unique: true }),
@@ -166,6 +181,10 @@ __decorate([
     (0, typeorm_1.ManyToOne)(type => customer_entity_1.Customer),
     __metadata("design:type", customer_entity_1.Customer)
 ], Order.prototype, "customer", void 0);
+__decorate([
+    (0, entity_id_decorator_1.EntityId)({ nullable: true }),
+    __metadata("design:type", Object)
+], Order.prototype, "customerId", void 0);
 __decorate([
     (0, typeorm_1.OneToMany)(type => order_line_entity_1.OrderLine, line => line.order),
     __metadata("design:type", Array)
@@ -195,6 +214,11 @@ __decorate([
     (0, typeorm_1.OneToMany)(type => payment_entity_1.Payment, payment => payment.order),
     __metadata("design:type", Array)
 ], Order.prototype, "payments", void 0);
+__decorate([
+    (0, typeorm_1.ManyToMany)(type => fulfillment_entity_1.Fulfillment),
+    (0, typeorm_1.JoinTable)(),
+    __metadata("design:type", Array)
+], Order.prototype, "fulfillments", void 0);
 __decorate([
     (0, typeorm_1.Column)('varchar'),
     __metadata("design:type", String)
@@ -217,11 +241,11 @@ __decorate([
     __metadata("design:type", Array)
 ], Order.prototype, "modifications", void 0);
 __decorate([
-    (0, typeorm_1.Column)(),
+    (0, money_decorator_1.Money)(),
     __metadata("design:type", Number)
 ], Order.prototype, "subTotal", void 0);
 __decorate([
-    (0, typeorm_1.Column)(),
+    (0, money_decorator_1.Money)(),
     __metadata("design:type", Number)
 ], Order.prototype, "subTotalWithTax", void 0);
 __decorate([
@@ -229,15 +253,15 @@ __decorate([
     __metadata("design:type", Array)
 ], Order.prototype, "shippingLines", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ default: 0 }),
+    (0, money_decorator_1.Money)({ default: 0 }),
     __metadata("design:type", Number)
 ], Order.prototype, "shipping", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ default: 0 }),
+    (0, money_decorator_1.Money)({ default: 0 }),
     __metadata("design:type", Number)
 ], Order.prototype, "shippingWithTax", void 0);
 __decorate([
-    (0, calculated_decorator_1.Calculated)({ relations: ['lines', 'lines.items', 'shippingLines'] }),
+    (0, calculated_decorator_1.Calculated)({ relations: ['lines', 'shippingLines'] }),
     __metadata("design:type", Array),
     __metadata("design:paramtypes", [])
 ], Order.prototype, "discounts", null);
@@ -273,15 +297,14 @@ __decorate([
 ], Order.prototype, "totalWithTax", null);
 __decorate([
     (0, calculated_decorator_1.Calculated)({
-        relations: ['lines', 'lines.items'],
+        relations: ['lines'],
         query: qb => {
             qb.leftJoin(qb1 => {
                 return qb1
                     .from(Order_1, 'order')
-                    .select('COUNT(DISTINCT items.id)', 'qty')
+                    .select('SUM(lines.quantity)', 'qty')
                     .addSelect('order.id', 'oid')
                     .leftJoin('order.lines', 'lines')
-                    .leftJoin('lines.items', 'items')
                     .groupBy('order.id');
             }, 't1', 't1.oid = order.id').addSelect('t1.qty', 'qty');
         },
@@ -291,7 +314,7 @@ __decorate([
     __metadata("design:paramtypes", [])
 ], Order.prototype, "totalQuantity", null);
 __decorate([
-    (0, calculated_decorator_1.Calculated)({ relations: ['lines', 'lines.items'] }),
+    (0, calculated_decorator_1.Calculated)({ relations: ['lines'] }),
     __metadata("design:type", Array),
     __metadata("design:paramtypes", [])
 ], Order.prototype, "taxSummary", null);

package/dist/entity/order/order.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"order.entity.js","sourceRoot":"","sources":["../../../src/entity/order/order.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,yEAO6C;AAE7C,mEAA2D;AAC3D,qCAA6F;AAE7F,4EAA+D;AAC/D,sDAAgE;AAIhE,qDAAoD;AACpD,8DAAoD;AACpD,kEAA4D;AAC5D,iEAAuD;AACvD,gEAAkD;AAElD,uEAA4D;AAC5D,+FAAoF;AACpF,8DAAoD;AACpD,oEAA0D;AAC1D,gFAAqE;AACrE,oEAA0D;AAE1D;;;;;;;;;;GAUG;AAEH,IAAa,KAAK,aAAlB,MAAa,KAAM,SAAQ,2BAAa;IACpC,YAAY,KAA0B;QAClC,KAAK,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC;IA4HD,IAAI,SAAS;QACT,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC;QACxC,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAoB,CAAC;QACvD,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE;YAC3B,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,SAAS,EAAE;gBACnC,MAAM,UAAU,GAAG,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;gBACrE,IAAI,UAAU,EAAE;oBACZ,UAAU,CAAC,MAAM,IAAI,QAAQ,CAAC,MAAM,CAAC;oBACrC,UAAU,CAAC,aAAa,IAAI,QAAQ,CAAC,aAAa,CAAC;iBACtD;qBAAM;oBACH,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,gBAAgB,oBAAO,QAAQ,EAAG,CAAC;iBACtE;aACJ;SACJ;QACD,KAAK,MAAM,YAAY,IAAI,IAAI,CAAC,aAAa,EAAE;YAC3C,KAAK,MAAM,QAAQ,IAAI,YAAY,CAAC,SAAS,EAAE;gBAC3C,MAAM,UAAU,GAAG,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;gBACrE,IAAI,UAAU,EAAE;oBACZ,UAAU,CAAC,MAAM,IAAI,QAAQ,CAAC,MAAM,CAAC;oBACrC,UAAU,CAAC,aAAa,IAAI,QAAQ,CAAC,aAAa,CAAC;iBACtD;qBAAM;oBACH,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,gBAAgB,oBAAO,QAAQ,EAAG,CAAC;iBACtE;aACJ;SACJ;QACD,OAAO,CAAC,GAAG,kBAAkB,CAAC,MAAM,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED;;;OAGG;IAiBH,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,QAAQ,GAAG,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC;IAChD,CAAC;IAED;;;OAGG;IAiBH,IAAI,YAAY;QACZ,OAAO,IAAI,CAAC,eAAe,GAAG,CAAC,IAAI,CAAC,eAAe,IAAI,CAAC,CAAC,CAAC;IAC9D,CAAC;IAqBD,IAAI,aAAa;QACb,IAAI,CAAC,qBAAqB,CAAC,eAAe,CAAC,CAAC;QAC5C,OAAO,IAAA,sBAAO,EAAC,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;IAC3C,CAAC;IAED;;;OAGG;IAEH,IAAI,UAAU;QACV,IAAI,CAAC,qBAAqB,CAAC,YAAY,CAAC,CAAC;QACzC,MAAM,UAAU,GAAG,IAAI,GAAG,EAGvB,CAAC;QACJ,MAAM,KAAK,GAAG,CAAC,OAAgB,EAAU,EAAE,CAAC,GAAG,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QACxF,MAAM,YAAY,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC;QAC5D,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE;YAC7B,MAAM,YAAY,GAAG,IAAA,sBAAO,EAAC,IAAI,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;YACvD,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE;gBACjC,MAAM,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;gBAC1B,MAAM,GAAG,GAAG,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBAC/B,MAAM,qBAAqB,GAAG,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;gBAEvF,MAAM,QAAQ,GAAG,IAAI,YAAY,6BAAS,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC;gBAC3F,MAAM,WAAW,GACb,IAAI,YAAY,6BAAS,CAAC,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC;gBAC5F,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,WAAW,GAAG,QAAQ,CAAC,GAAG,qBAAqB,CAAC,CAAC;gBAC5E,IAAI,GAAG,EAAE;oBACL,GAAG,CAAC,GAAG,IAAI,MAAM,CAAC;oBAClB,GAAG,CAAC,IAAI,IAAI,QAAQ,CAAC;iBACxB;qBAAM;oBACH,UAAU,CAAC,GAAG,CAAC,EAAE,EAAE;wBACf,GAAG,EAAE,MAAM;wBACX,IAAI,EAAE,QAAQ;wBACd,WAAW,EAAE,OAAO,CAAC,WAAW;wBAChC,IAAI,EAAE,OAAO,CAAC,OAAO;qBACxB,CAAC,CAAC;iBACN;aACJ;SACJ;QACD,OAAO,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;YAC7D,OAAO,EAAE,GAAG,CAAC,IAAI;YACjB,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,OAAO,EAAE,GAAG,CAAC,IAAI;YACjB,QAAQ,EAAE,GAAG,CAAC,GAAG;SACpB,CAAC,CAAC,CAAC;IACR,CAAC;IAED,aAAa;QACT,IAAI,CAAC,qBAAqB,CAAC,eAAe,CAAC,CAAC;QAC5C,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;YACrC,OAAO,CAAC,GAAG,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;QACrC,CAAC,EAAE,EAAiB,CAAC,CAAC;IAC1B,CAAC;IAEO,qBAAqB,CAAC,YAAyB;QACnD,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,EAAE;YACpB,MAAM,YAAY,GAAG;gBACjB,iBAAiB,YAAY,uEAAuE;gBACpG,gIAAgI;aACnI,CAAC;YAEF,MAAM,IAAI,4BAAmB,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;SAC1D;IACL,CAAC;CACJ,CAAA;AApRG;IAFC,IAAA,gBAAM,GAAE;IACR,IAAA,eAAK,EAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;;mCACX;AAEM;IAAlB,IAAA,gBAAM,EAAC,SAAS,CAAC;;oCAAmB;AAUrC;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;;qCACV;AAShB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACX,IAAI;4CAAC;AAIrB;IAFC,IAAA,eAAK,GAAE;IACP,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,0BAAQ,CAAC;8BACjB,0BAAQ;uCAAC;AAGpB;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,6BAAS,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC;;oCAC9B;AAUnB;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,4BAAS,EAAE,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC;;yCACnC;AAOxB;IADC,IAAA,gBAAM,EAAC,cAAc,CAAC;;0CACD;AAStB;IAFC,IAAA,oBAAU,EAAC,IAAI,CAAC,EAAE,CAAC,4BAAS,CAAC;IAC7B,IAAA,mBAAS,GAAE;;yCACY;AAED;IAAtB,IAAA,gBAAM,EAAC,aAAa,CAAC;;8CAA+B;AAE9B;IAAtB,IAAA,gBAAM,EAAC,aAAa,CAAC;;6CAA8B;AAGpD;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,wBAAO,EAAE,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;;uCACjC;AAGpB;IADC,IAAA,gBAAM,EAAC,SAAS,CAAC;;2CACS;AAG3B;IADC,IAAA,gBAAM,EAAC,IAAI,CAAC,EAAE,CAAC,wCAAiB,CAAC;8BACpB,wCAAiB;2CAAC;AAGhC;IADC,IAAA,8BAAQ,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wCACd;AAIf;IAFC,IAAA,oBAAU,EAAC,IAAI,CAAC,EAAE,CAAC,wBAAO,CAAC;IAC3B,IAAA,mBAAS,GAAE;;uCACQ;AAGpB;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,6CAAiB,EAAE,YAAY,CAAC,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC;;4CACtC;AAUnC;IADC,IAAA,gBAAM,GAAE;;uCACQ;AAOjB;IADC,IAAA,gBAAM,GAAE;;8CACe;AAOxB;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,mCAAY,EAAE,YAAY,CAAC,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC;;4CACtC;AAO9B;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;;uCACN;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;;8CACC;AAGxB;IADC,IAAA,iCAAU,EAAC,EAAE,SAAS,EAAE,CAAC,OAAO,EAAE,aAAa,EAAE,eAAe,CAAC,EAAE,CAAC;;;sCA2BpE;AAsBD;IAhBC,IAAA,iCAAU,EAAC;QACR,KAAK,EAAE,EAAE,CAAC,EAAE,CACR,EAAE;aACG,QAAQ,CACL,GAAG,CAAC,EAAE;YACF,OAAO,GAAG;iBACL,IAAI,CAAC,OAAK,EAAE,OAAO,CAAC;iBACpB,MAAM,CAAC,iCAAiC,EAAE,OAAO,CAAC;iBAClD,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QACtC,CAAC,EACD,IAAI,EACJ,mBAAmB,CACtB;aACA,SAAS,CAAC,UAAU,EAAE,OAAO,CAAC;QACvC,UAAU,EAAE,OAAO;KACtB,CAAC;;;kCAGD;AAsBD;IAhBC,IAAA,iCAAU,EAAC;QACR,KAAK,EAAE,EAAE,CAAC,EAAE,CACR,EAAE;aACG,QAAQ,CACL,GAAG,CAAC,EAAE;YACF,OAAO,GAAG;iBACL,IAAI,CAAC,OAAK,EAAE,OAAO,CAAC;iBACpB,MAAM,CAAC,+CAA+C,EAAE,KAAK,CAAC;iBAC9D,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QACtC,CAAC,EACD,IAAI,EACJ,mBAAmB,CACtB;aACA,SAAS,CAAC,QAAQ,EAAE,KAAK,CAAC;QACnC,UAAU,EAAE,KAAK;KACpB,CAAC;;;yCAGD;AAqBD;IAnBC,IAAA,iCAAU,EAAC;QACR,SAAS,EAAE,CAAC,OAAO,EAAE,aAAa,CAAC;QACnC,KAAK,EAAE,EAAE,CAAC,EAAE;YACR,EAAE,CAAC,QAAQ,CACP,GAAG,CAAC,EAAE;gBACF,OAAO,GAAG;qBACL,IAAI,CAAC,OAAK,EAAE,OAAO,CAAC;qBACpB,MAAM,CAAC,0BAA0B,EAAE,KAAK,CAAC;qBACzC,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC;qBAC5B,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;qBAChC,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;qBAChC,OAAO,CAAC,UAAU,CAAC,CAAC;YAC7B,CAAC,EACD,IAAI,EACJ,mBAAmB,CACtB,CAAC,SAAS,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QACjC,CAAC;QACD,UAAU,EAAE,KAAK;KACpB,CAAC;;;0CAID;AAOD;IADC,IAAA,iCAAU,EAAC,EAAE,SAAS,EAAE,CAAC,OAAO,EAAE,aAAa,CAAC,EAAE,CAAC;;;uCAuCnD;AA9QQ,KAAK;IADjB,IAAA,gBAAM,GAAE;;GACI,KAAK,CAiSjB;AAjSY,sBAAK"}
+{"version":3,"file":"order.entity.js","sourceRoot":"","sources":["../../../src/entity/order/order.entity.ts"],"names":[],"mappings":"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"}