@bondsports/types 2.4.7 → 2.4.8-a-1

package/dist/types/cart/dto/cart-item.dto.d.ts

@@ -13,8 +13,9 @@ export declare class CartTaxDto extends OrganizationBaseEntityDto {
     cartId: number;
     productId: number;
     price: number;
-    percentage?: number;
-    isTaxInclusive?: boolean;
+    name: string;
+    rate?: number;
+    isInclusive?: boolean;
 }
 export declare class CartDiscountDto extends OrganizationBaseEntityDto {
     cartId: number;
@@ -57,7 +58,8 @@ export declare class CartItemDto extends SimpleCartItemDto {
     status: CartStatusEnum;
     errors?: string[];
     ordinal?: number;
-    taxItem?: CartTaxDto;
+    taxId?: number;
+    taxItems?: CartTaxDto[];
     discounts?: CartDiscountDto[];
     discountSubtotal?: number;
     children?: CartItemDto[];

package/dist/types/cart/dto/cart-item.dto.js.map

@@ -1 +1 @@
-{"version":3,"file":"cart-item.dto.js","sourceRoot":"","sources":["../../../../src/types/cart/dto/cart-item.dto.ts"],"names":[],"mappings":";;;AAEA,8EAAoF;AAWpF,MAAa,UAAW,SAAQ,4CAAyB;CAUxD;AAVD,gCAUC;AAED,MAAa,eAAgB,SAAQ,4CAAyB;CA0B7D;AA1BD,0CA0BC;AAED,MAAa,iBAAiB;CAM7B;AAND,8CAMC;AAED,MAAa,mBAAmB;CAI/B;AAJD,kDAIC;AAED,MAAa,iBAAkB,SAAQ,4CAAyB;CAI/D;AAJD,8CAIC;AAED,MAAa,WAAY,SAAQ,iBAAiB;CA0CjD;AA1CD,kCA0CC;AAED,MAAa,eAAe;CAO3B;AAPD,0CAOC;AAED,MAAa,iBAAkB,SAAQ,eAAe;CAGrD;AAHD,8CAGC;AAED,MAAa,cAAe,SAAQ,eAAe;CAUlD;AAVD,wCAUC"}
+{"version":3,"file":"cart-item.dto.js","sourceRoot":"","sources":["../../../../src/types/cart/dto/cart-item.dto.ts"],"names":[],"mappings":";;;AAEA,8EAAoF;AAWpF,MAAa,UAAW,SAAQ,4CAAyB;CAYxD;AAZD,gCAYC;AAED,MAAa,eAAgB,SAAQ,4CAAyB;CA0B7D;AA1BD,0CA0BC;AAED,MAAa,iBAAiB;CAM7B;AAND,8CAMC;AAED,MAAa,mBAAmB;CAI/B;AAJD,kDAIC;AAED,MAAa,iBAAkB,SAAQ,4CAAyB;CAI/D;AAJD,8CAIC;AAED,MAAa,WAAY,SAAQ,iBAAiB;CA4CjD;AA5CD,kCA4CC;AAED,MAAa,eAAe;CAO3B;AAPD,0CAOC;AAED,MAAa,iBAAkB,SAAQ,eAAe;CAGrD;AAHD,8CAGC;AAED,MAAa,cAAe,SAAQ,eAAe;CAUlD;AAVD,wCAUC"}

package/dist/types/cart/entities/cart-item.entity.d.ts

@@ -9,6 +9,7 @@ import { Reason } from '../../organization/entities/Reason';
 import { Discount } from '../../payment/entities/Discount';
 import { DiscountOnEnum } from '../../payment/types/enums/discount.enums';
 import { Product } from '../../product-pricing/entities/product.entity';
+import { Tax } from '../../taxes/entities/Tax';
 import { PurchaseResourceDto } from '../../purchase/dto/purchase.dto';
 import { ProductTypesEnum, ResourceNameTypeEnum } from '../../services/enums.service';
 import { User } from '../../user/entities/User';
@@ -36,16 +37,17 @@ export declare class CartItem extends OrganizationConnectionBaseEntity {
     parentOrdinal?: number;
     unique?: string;
     percentage?: number;
-    isTaxInclusive?: boolean;
     entitlementGroupId?: number;
     entitlementGroup?: EntitlementGroup;
     parentId?: number;
     parent?: CartItem;
     children?: CartItem[];
     discounts?: CartItem[];
-    taxItem?: CartItem;
+    taxItems?: CartItem[];
     discountId?: number;
     discount?: Discount;
+    taxId?: number;
+    tax?: Tax;
     resources?: PurchaseResourceDto[];
     parentResourceId?: string;
     parentResourceType?: ResourceNameTypeEnum;

package/dist/types/cart/entities/cart-item.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"cart-item.entity.js","sourceRoot":"","sources":["../../../../src/types/cart/entities/cart-item.entity.ts"],"names":[],"mappings":";;;AAQA,oGAAiG;AAcjG,MAAa,QAAS,SAAQ,mEAAgC;CAmG7D;AAnGD,4BAmGC"}
+{"version":3,"file":"cart-item.entity.js","sourceRoot":"","sources":["../../../../src/types/cart/entities/cart-item.entity.ts"],"names":[],"mappings":";;;AAQA,oGAAiG;AAejG,MAAa,QAAS,SAAQ,mEAAgC;CAqG7D;AArGD,4BAqGC"}

package/dist/types/cart/types/consts/cart.consts.d.ts

@@ -1,4 +1,2 @@
 import { CartDiscountDto } from '../../dto/cart-item.dto';
-import { CartItem } from '../../entities/cart-item.entity';
-export declare const uniqueCartTaxTemplate: (cartItem: CartItem) => string;
 export declare const uniqueCartDiscountTemplate: (discountItem: CartDiscountDto) => string;

package/dist/types/cart/types/consts/cart.consts.js

@@ -1,12 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.uniqueCartDiscountTemplate = exports.uniqueCartTaxTemplate = void 0;
-const uniqueCartTaxTemplate = (cartItem) => {
-    return `${cartItem.percentage}_${cartItem.isTaxInclusive}`;
-};
-exports.uniqueCartTaxTemplate = uniqueCartTaxTemplate;
+exports.uniqueCartDiscountTemplate = void 0;
 const uniqueCartDiscountTemplate = (discountItem) => {
-    const discountPercentage = `${discountItem.percentage}` ?? '';
+    const discountPercentage = `${discountItem.percentage}`;
     return `${discountItem.discountId}_${discountItem.discount?.type}_${discountPercentage}_${discountItem.actionId}`;
 };
 exports.uniqueCartDiscountTemplate = uniqueCartDiscountTemplate;

package/dist/types/cart/types/consts/cart.consts.js.map

@@ -1 +1 @@
-{"version":3,"file":"cart.consts.js","sourceRoot":"","sources":["../../../../../src/types/cart/types/consts/cart.consts.ts"],"names":[],"mappings":";;;AAGO,MAAM,qBAAqB,GAAG,CAAC,QAAkB,EAAU,EAAE;IACnE,OAAO,GAAG,QAAQ,CAAC,UAAU,IAAI,QAAQ,CAAC,cAAc,EAAE,CAAC;AAC5D,CAAC,CAAC;AAFW,QAAA,qBAAqB,yBAEhC;AAEK,MAAM,0BAA0B,GAAG,CAAC,YAA6B,EAAU,EAAE;IACnF,MAAM,kBAAkB,GAAW,GAAG,YAAY,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC;IAEtE,OAAO,GAAG,YAAY,CAAC,UAAU,IAAI,YAAY,CAAC,QAAQ,EAAE,IAAI,IAAI,kBAAkB,IAAI,YAAY,CAAC,QAAQ,EAAE,CAAC;AACnH,CAAC,CAAC;AAJW,QAAA,0BAA0B,8BAIrC"}
+{"version":3,"file":"cart.consts.js","sourceRoot":"","sources":["../../../../../src/types/cart/types/consts/cart.consts.ts"],"names":[],"mappings":";;;AAEO,MAAM,0BAA0B,GAAG,CAAC,YAA6B,EAAU,EAAE;IACnF,MAAM,kBAAkB,GAAW,GAAG,YAAY,CAAC,UAAU,EAAE,CAAC;IAEhE,OAAO,GAAG,YAAY,CAAC,UAAU,IAAI,YAAY,CAAC,QAAQ,EAAE,IAAI,IAAI,kBAAkB,IAAI,YAAY,CAAC,QAAQ,EAAE,CAAC;AACnH,CAAC,CAAC;AAJW,QAAA,0BAA0B,8BAIrC"}

package/dist/types/customers/dto/full-customer.dto.d.ts

@@ -40,5 +40,6 @@ export declare class UserExtendedDto extends SimpleUserDto {
 export declare class CustomerExtendedDto extends BaseCustomerWithRelationsDto {
     user: UserExtendedDto;
     organizationId: number;
+    isEmployee?: boolean;
 }
 export {};

package/dist/types/customers/dto/full-customer.dto.js.map

@@ -1 +1 @@
-{"version":3,"file":"full-customer.dto.js","sourceRoot":"","sources":["../../../../src/types/customers/dto/full-customer.dto.ts"],"names":[],"mappings":";;;AAQA,sDAAwD;AAGxD,mEAAiF;AAEjF,MAAM,4BAA6B,SAAQ,yCAAiB;CAsC3D;AAED;GACG;AACH,MAAa,eAAgB,SAAQ,4BAA4B;CAEhE;AAFD,0CAEC;AAED,MAAa,eAAgB,SAAQ,wBAAa;CAEjD;AAFD,0CAEC;AAED,MAAa,mBAAoB,SAAQ,4BAA4B;CAIpE;AAJD,kDAIC"}
+{"version":3,"file":"full-customer.dto.js","sourceRoot":"","sources":["../../../../src/types/customers/dto/full-customer.dto.ts"],"names":[],"mappings":";;;AAQA,sDAAwD;AAGxD,mEAAiF;AAEjF,MAAM,4BAA6B,SAAQ,yCAAiB;CAsC3D;AAED;GACG;AACH,MAAa,eAAgB,SAAQ,4BAA4B;CAEhE;AAFD,0CAEC;AAED,MAAa,eAAgB,SAAQ,wBAAa;CAEjD;AAFD,0CAEC;AAED,MAAa,mBAAoB,SAAQ,4BAA4B;CAMpE;AAND,kDAMC"}

package/dist/types/customers-merge/dto/customers-merge.dto.d.ts

@@ -32,23 +32,10 @@ export declare class CustomerMergeValidationResultDto {
     sourceCustomers?: Customer[];
     targetCustomer?: Customer;
 }
-export declare class CustomerMergeRecordsResultDto {
-    transferredReservations: number;
-    transferredInvoices: number;
-    transferredLineItems: number;
-    transferredPayments: number;
-    transferredNotes: number;
-    transferredEmergencyContacts: number;
-    transferredPunchPasses: number;
-    transferredMemberships: number;
-    transferredStoredCredit: number;
-    errors: CustomerMergeValidationErrorDto[];
-}
 export declare class CustomerMergeResponseDto {
     success: boolean;
     targetId: number;
     sourcesIds: number[];
-    transferredRecords?: CustomerMergeRecordsResultDto;
     updatedCustomer?: SimpleCustomerDto;
     errors?: CustomerMergeValidationErrorDto[];
     warnings?: CustomerMergeValidationErrorDto[];

package/dist/types/customers-merge/dto/customers-merge.dto.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MergeFamiliesResponseDto = exports.MergeFamiliesRequestDto = exports.CustomerMergeResponseDto = exports.CustomerMergeRecordsResultDto = exports.CustomerMergeValidationResultDto = exports.CustomerMergeValidationErrorDto = exports.MergeCustomersRequestDto = exports.CustomerFieldsToMergeDto = exports.MergeableFieldsDto = void 0;
+exports.MergeFamiliesResponseDto = exports.MergeFamiliesRequestDto = exports.CustomerMergeResponseDto = exports.CustomerMergeValidationResultDto = exports.CustomerMergeValidationErrorDto = exports.MergeCustomersRequestDto = exports.CustomerFieldsToMergeDto = exports.MergeableFieldsDto = void 0;
 const general_dto_1 = require("../../dto/general.dto");
 //#region Request DTOs
 class MergeableFieldsDto {
@@ -21,11 +21,6 @@ class CustomerMergeValidationResultDto {
 }
 exports.CustomerMergeValidationResultDto = CustomerMergeValidationResultDto;
 //#endregion
-//#region Transfer Results DTOs
-class CustomerMergeRecordsResultDto {
-}
-exports.CustomerMergeRecordsResultDto = CustomerMergeRecordsResultDto;
-//#endregion
 //#region Response DTOs
 class CustomerMergeResponseDto {
 }

package/dist/types/customers-merge/dto/customers-merge.dto.js.map

@@ -1 +1 @@
-{"version":3,"file":"customers-merge.dto.js","sourceRoot":"","sources":["../../../../src/types/customers-merge/dto/customers-merge.dto.ts"],"names":[],"mappings":";;;AAEA,uDAA+C;AAI/C,sBAAsB;AACtB,MAAa,kBAAkB;CAgB9B;AAhBD,gDAgBC;AAED,MAAa,wBAAwB;CAQpC;AARD,4DAQC;AAED,MAAa,wBAAyB,SAAQ,oBAAM;CAEnD;AAFD,4DAEC;AAED,YAAY;AAEZ,gCAAgC;AAChC,MAAa,+BAA+B;CAI3C;AAJD,0EAIC;AAED,MAAa,gCAAgC;CAU5C;AAVD,4EAUC;AAED,YAAY;AAEZ,+BAA+B;AAC/B,MAAa,6BAA6B;CAoBzC;AApBD,sEAoBC;AAED,YAAY;AAEZ,uBAAuB;AACvB,MAAa,wBAAwB;CAcpC;AAdD,4DAcC;AAED,YAAY;AAEZ,2BAA2B;AAC3B,MAAa,uBAAuB;CAInC;AAJD,0DAIC;AAED,MAAa,wBAAwB;CAQpC;AARD,4DAQC;AAED,YAAY"}
+{"version":3,"file":"customers-merge.dto.js","sourceRoot":"","sources":["../../../../src/types/customers-merge/dto/customers-merge.dto.ts"],"names":[],"mappings":";;;AAEA,uDAA+C;AAI/C,sBAAsB;AACtB,MAAa,kBAAkB;CAgB9B;AAhBD,gDAgBC;AAED,MAAa,wBAAwB;CAQpC;AARD,4DAQC;AAED,MAAa,wBAAyB,SAAQ,oBAAM;CAEnD;AAFD,4DAEC;AAED,YAAY;AAEZ,gCAAgC;AAChC,MAAa,+BAA+B;CAI3C;AAJD,0EAIC;AAED,MAAa,gCAAgC;CAU5C;AAVD,4EAUC;AAED,YAAY;AAEZ,uBAAuB;AACvB,MAAa,wBAAwB;CAYpC;AAZD,4DAYC;AAED,YAAY;AAEZ,2BAA2B;AAC3B,MAAa,uBAAuB;CAInC;AAJD,0DAIC;AAED,MAAa,wBAAwB;CAQpC;AARD,4DAQC;AAED,YAAY"}

package/dist/types/customers-merge/enums/customer-merge-error-codes.enum.d.ts

@@ -7,12 +7,12 @@ export declare enum CustomerMergeErrorCodes {
     EMPTY_INPUT = "MERGE_EMPTY_INPUT",
     CIRCULAR_REFERENCES_INPUT = "MERGE_CIRCULAR_REFERENCES",
     INVALID_CUSTOMER_TYPES = "MERGE_INVALID_CUSTOMER_TYPES",
+    GENERAL_ERROR = "MERGE_GENERAL_ERROR",
     GET_CUSTOMERS_GENERAL_ERROR = "MERGE_GET_CUSTOMERS_ERROR",
     SOURCE_CUSTOMERS_MISSING = "MERGE_SOURCE_MISSING",
     LINKED_USER_MULTI_ORG = "MERGE_USER_MULTI_ORG",
     TWO_FAMILIES_FOUND = "MERGE_TWO_FAMILIES_FOUND",
     MULTIPLE_CUSTOMERS_IN_FAMILIES = "MERGE_MULTIPLE_FAMILIES",
-    EMPLOYEES_PRESENT = "MERGE_EMPLOYEES_PRESENT",
     DUPLICATE_MEMBERSHIPS = "MERGE_DUPLICATE_MEMBERSHIPS",
     DUPLICATE_PROGRAMS = "MERGE_DUPLICATE_PROGRAMS",
     CONFLICTING_REFERABLE_PARTICIPATION = "MERGE_CONFLICTING_REFERABLE_PARTICIPATION"

package/dist/types/customers-merge/enums/customer-merge-error-codes.enum.js

@@ -12,6 +12,8 @@ var CustomerMergeErrorCodes;
     CustomerMergeErrorCodes["EMPTY_INPUT"] = "MERGE_EMPTY_INPUT";
     CustomerMergeErrorCodes["CIRCULAR_REFERENCES_INPUT"] = "MERGE_CIRCULAR_REFERENCES";
     CustomerMergeErrorCodes["INVALID_CUSTOMER_TYPES"] = "MERGE_INVALID_CUSTOMER_TYPES";
+    // General merge operation errors
+    CustomerMergeErrorCodes["GENERAL_ERROR"] = "MERGE_GENERAL_ERROR";
     // Customer retrieval errors
     CustomerMergeErrorCodes["GET_CUSTOMERS_GENERAL_ERROR"] = "MERGE_GET_CUSTOMERS_ERROR";
     CustomerMergeErrorCodes["SOURCE_CUSTOMERS_MISSING"] = "MERGE_SOURCE_MISSING";
@@ -20,8 +22,6 @@ var CustomerMergeErrorCodes;
     // Family validation errors
     CustomerMergeErrorCodes["TWO_FAMILIES_FOUND"] = "MERGE_TWO_FAMILIES_FOUND";
     CustomerMergeErrorCodes["MULTIPLE_CUSTOMERS_IN_FAMILIES"] = "MERGE_MULTIPLE_FAMILIES";
-    // Employee validation errors
-    CustomerMergeErrorCodes["EMPLOYEES_PRESENT"] = "MERGE_EMPLOYEES_PRESENT";
     // Membership validation errors
     CustomerMergeErrorCodes["DUPLICATE_MEMBERSHIPS"] = "MERGE_DUPLICATE_MEMBERSHIPS";
     // Program validation errors

package/dist/types/customers-merge/enums/customer-merge-error-codes.enum.js.map

@@ -1 +1 @@
-{"version":3,"file":"customer-merge-error-codes.enum.js","sourceRoot":"","sources":["../../../../src/types/customers-merge/enums/customer-merge-error-codes.enum.ts"],"names":[],"mappings":";;;AAAA;;;;GAIG;AACH,IAAY,uBA4BX;AA5BD,WAAY,uBAAuB;IAClC,0BAA0B;IAC1B,4DAAiC,CAAA;IACjC,kFAAuD,CAAA;IACvD,kFAAuD,CAAA;IAEvD,4BAA4B;IAC5B,oFAAyD,CAAA;IACzD,4EAAiD,CAAA;IAEjD,uCAAuC;IACvC,yEAA8C,CAAA;IAE9C,2BAA2B;IAC3B,0EAA+C,CAAA;IAC/C,qFAA0D,CAAA;IAE1D,6BAA6B;IAC7B,wEAA6C,CAAA;IAE7C,+BAA+B;IAC/B,gFAAqD,CAAA;IAErD,4BAA4B;IAC5B,0EAA+C,CAAA;IAE/C,mCAAmC;IACnC,4GAAiF,CAAA;AAClF,CAAC,EA5BW,uBAAuB,GAAvB,+BAAuB,KAAvB,+BAAuB,QA4BlC"}
+{"version":3,"file":"customer-merge-error-codes.enum.js","sourceRoot":"","sources":["../../../../src/types/customers-merge/enums/customer-merge-error-codes.enum.ts"],"names":[],"mappings":";;;AAAA;;;;GAIG;AACH,IAAY,uBA4BX;AA5BD,WAAY,uBAAuB;IAClC,0BAA0B;IAC1B,4DAAiC,CAAA;IACjC,kFAAuD,CAAA;IACvD,kFAAuD,CAAA;IAEvD,iCAAiC;IACjC,gEAAqC,CAAA;IAErC,4BAA4B;IAC5B,oFAAyD,CAAA;IACzD,4EAAiD,CAAA;IAEjD,uCAAuC;IACvC,yEAA8C,CAAA;IAE9C,2BAA2B;IAC3B,0EAA+C,CAAA;IAC/C,qFAA0D,CAAA;IAE1D,+BAA+B;IAC/B,gFAAqD,CAAA;IAErD,4BAA4B;IAC5B,0EAA+C,CAAA;IAE/C,mCAAmC;IACnC,4GAAiF,CAAA;AAClF,CAAC,EA5BW,uBAAuB,GAAvB,+BAAuB,KAAvB,+BAAuB,QA4BlC"}

package/dist/types/customers-merge/types/interfaces.d.ts

@@ -1,3 +1,4 @@
+import { ObjectLiteral, UpdateQueryBuilder } from 'typeorm';
 import { Customer } from '../../entity/Customer';
 import { CustomerFieldsToMergeDto } from '../dto/customers-merge.dto';
 import { CustomerMergeErrorCodes } from '../enums/customer-merge-error-codes.enum';
@@ -52,4 +53,15 @@ export interface IFamilyCustomersIds {
     sourceCustomerId: number;
     targetCustomerId: number;
 }
+/**
+ * Optional parameters for reassigning entities during merge operations.
+ */
+export interface IReassignEntitiesByIdsOptions<EntityType> {
+    /** Optional organization ID for filtering */
+    organizationId?: number;
+    /** Additional WHERE conditions (object or query builder function) */
+    extraConditions?: ObjectLiteral | ((qb: UpdateQueryBuilder<EntityType>) => string);
+    /** Whether to soft delete the reassigned entities */
+    softDelete?: boolean;
+}
 export {};

package/dist/types/employees/types/consts/index.d.ts

@@ -1,3 +1,5 @@
 import { CreateEmployeeOptions } from '../../dto/employee.dto';
+import { EmployeeStatus } from '../enums';
 export declare const DEFAULT_CREATE_EMPLOYEE_OPTIONS: CreateEmployeeOptions;
+export declare const EMPLOYEE_STATUS_PRIORITY: Record<EmployeeStatus, number>;
 export * from './index';

package/dist/types/employees/types/consts/index.js

@@ -14,12 +14,18 @@ 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 });
-exports.DEFAULT_CREATE_EMPLOYEE_OPTIONS = void 0;
+exports.EMPLOYEE_STATUS_PRIORITY = exports.DEFAULT_CREATE_EMPLOYEE_OPTIONS = void 0;
+const enums_1 = require("../enums");
 exports.DEFAULT_CREATE_EMPLOYEE_OPTIONS = {
     saveCustomer: true,
     sendCustomerNotification: false,
     allowExistingCustomer: false,
     requireNewUser: true,
 };
+exports.EMPLOYEE_STATUS_PRIORITY = {
+    [enums_1.EmployeeStatus.ACTIVE]: 3,
+    [enums_1.EmployeeStatus.INACTIVE]: 2,
+    [enums_1.EmployeeStatus.PENDING]: 1,
+};
 __exportStar(require("./index"), exports);
 //# sourceMappingURL=index.js.map

package/dist/types/employees/types/consts/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/types/employees/types/consts/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAEa,QAAA,+BAA+B,GAA0B;IACrE,YAAY,EAAE,IAAI;IAClB,wBAAwB,EAAE,KAAK;IAC/B,qBAAqB,EAAE,KAAK;IAC5B,cAAc,EAAE,IAAI;CACpB,CAAC;AACF,0CAAwB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/types/employees/types/consts/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AACA,oCAA0C;AAE7B,QAAA,+BAA+B,GAA0B;IACrE,YAAY,EAAE,IAAI;IAClB,wBAAwB,EAAE,KAAK;IAC/B,qBAAqB,EAAE,KAAK;IAC5B,cAAc,EAAE,IAAI;CACpB,CAAC;AAEW,QAAA,wBAAwB,GAAmC;IACvE,CAAC,sBAAc,CAAC,MAAM,CAAC,EAAE,CAAC;IAC1B,CAAC,sBAAc,CAAC,QAAQ,CAAC,EAAE,CAAC;IAC5B,CAAC,sBAAc,CAAC,OAAO,CAAC,EAAE,CAAC;CAC3B,CAAC;AACF,0CAAwB"}

package/dist/types/entity/UserAuthorizations.d.ts

@@ -1,3 +1,4 @@
+import { CustomerMerge } from '../customers-merge/entities/CustomerMerge';
 import { UserAuthorizationsTypeEnum } from '../services/enums.service';
 import { User } from '../user/entities/User';
 import { BondBaseEntity } from './BondBaseEntity';
@@ -6,4 +7,7 @@ export declare class UserAuthorizations extends BondBaseEntity {
     userId: number | null;
     entityType: UserAuthorizationsTypeEnum;
     user: User;
+    deletedAt?: Date;
+    mergeId?: number;
+    merge?: CustomerMerge;
 }

package/dist/types/entity/UserAuthorizations.js.map

@@ -1 +1 @@
-{"version":3,"file":"UserAuthorizations.js","sourceRoot":"","sources":["../../../src/types/entity/UserAuthorizations.ts"],"names":[],"mappings":";;;AAKA,qDAAkD;AAElD,MAAa,kBAAmB,SAAQ,+BAAc;CAQrD;AARD,gDAQC"}
+{"version":3,"file":"UserAuthorizations.js","sourceRoot":"","sources":["../../../src/types/entity/UserAuthorizations.ts"],"names":[],"mappings":";;;AAMA,qDAAkD;AAElD,MAAa,kBAAmB,SAAQ,+BAAc;CAcrD;AAdD,gDAcC"}

package/dist/types/organization/entities/OrganizationUsers.d.ts

@@ -1,3 +1,4 @@
+import { CustomerMerge } from '../../customers-merge/entities/CustomerMerge';
 import { EmployeeStatus } from '../../employees/types/enums';
 import { BondBaseEntity } from '../../entity/BondBaseEntity';
 import { User } from '../../user/entities/User';
@@ -10,4 +11,6 @@ export declare class OrganizationUsers extends BondBaseEntity {
     employmentStartDate?: Date;
     employmentEndDate?: Date;
     deletedAt?: Date;
+    mergeId?: number;
+    merge?: CustomerMerge;
 }

package/dist/types/organization/entities/OrganizationUsers.js.map

@@ -1 +1 @@
-{"version":3,"file":"OrganizationUsers.js","sourceRoot":"","sources":["../../../../src/types/organization/entities/OrganizationUsers.ts"],"names":[],"mappings":";;;AAGA,gEAA6D;AAG7D,MAAa,iBAAkB,SAAQ,+BAAc;CAiBpD;AAjBD,8CAiBC"}
+{"version":3,"file":"OrganizationUsers.js","sourceRoot":"","sources":["../../../../src/types/organization/entities/OrganizationUsers.ts"],"names":[],"mappings":";;;AAIA,gEAA6D;AAG7D,MAAa,iBAAkB,SAAQ,+BAAc;CAqBpD;AArBD,8CAqBC"}

package/dist/types/payment/types/interfaces/discount.interfaces.d.ts

@@ -5,6 +5,7 @@ import { IProductRelatedProgram } from '../../../programs/types/interfaces/progr
 import { MembershipTypeEnum } from '../../../services/enums.service';
 import { CreateNoteDto } from '../../dto/payment.dto';
 import { DiscountOnEnum } from '../enums/discount.enums';
+import { Tax } from '../../../taxes/entities/Tax';
 export interface IRoundingSplit {
     splitAmount: number;
     splitsNumber: number;
@@ -66,10 +67,13 @@ export declare class IUserItem {
     product?: Product;
     totalQuantity?: number;
     totalPriceWithoutTax?: number;
+    subtotal?: number;
     totalPrice?: number;
     isTaxInclusive?: boolean;
     percentage?: number;
+    tax?: Tax;
     taxItem?: IUserItem;
+    taxItems?: IUserItem[];
 }
 export interface IFindDiscountsOptions {
     includeGLCodes?: boolean;

package/dist/types/payment/types/interfaces/discount.interfaces.js.map

@@ -1 +1 @@
-{"version":3,"file":"discount.interfaces.js","sourceRoot":"","sources":["../../../../../src/types/payment/types/interfaces/discount.interfaces.ts"],"names":[],"mappings":";;;AAGA,+EAA+E;AAE/E,mEAAqE;AAoErE,MAAa,SAAS;CAoBrB;AApBD,8BAoBC"}
+{"version":3,"file":"discount.interfaces.js","sourceRoot":"","sources":["../../../../../src/types/payment/types/interfaces/discount.interfaces.ts"],"names":[],"mappings":";;;AAGA,+EAA+E;AAE/E,mEAAqE;AAqErE,MAAa,SAAS;CA0BrB;AA1BD,8BA0BC"}

package/dist/types/product-pricing/types/interfaces/product-pricing.interfaces.d.ts

@@ -5,6 +5,7 @@ import { Price } from '../../../pricing/entities/Price';
 import { ProgramTypesEnum } from '../../../programs/types/enums/program.enums';
 import { ResourceDto } from '../../../resources/dto/resource.dto';
 import { ActivityEnum, OrderByEnum } from '../../../services/enums.service';
+import { ICalculatedTax } from '../../../services/interfaces.service';
 import { IPagination } from '../../../util/models/interfaces/general.interfaces';
 import { Product } from '../../entities/product.entity';
 import { OrderByProductEnum, ProductExpandEnum } from '../enums/product.enums';
@@ -76,6 +77,7 @@ export interface IFindPriceOfProduct {
     userId: number;
     quantity?: number;
     resources?: ResourceDto[];
+    taxes?: ICalculatedTax[];
     unique?: string;
 }
 export interface IGetResourcesProductsOptions {

package/dist/types/roles/entities/UserRole.d.ts

@@ -1,3 +1,4 @@
+import { CustomerMerge } from '../../customers-merge/entities/CustomerMerge';
 import { OrganizationConnectionBaseEntity } from '../../entity/OrganizationConnectionBaseEntity';
 import { User } from '../../user/entities/User';
 import { Role } from './Role';
@@ -8,4 +9,6 @@ export declare class UserRole extends OrganizationConnectionBaseEntity {
     facilityId: number;
     role: Role;
     user: User;
+    mergeId?: number;
+    merge?: CustomerMerge;
 }

package/dist/types/roles/entities/UserRole.js.map

@@ -1 +1 @@
-{"version":3,"file":"UserRole.js","sourceRoot":"","sources":["../../../../src/types/roles/entities/UserRole.ts"],"names":[],"mappings":";;;AAEA,oGAAiG;AAKjG,MAAa,QAAS,SAAQ,mEAAgC;CAY7D;AAZD,4BAYC"}
+{"version":3,"file":"UserRole.js","sourceRoot":"","sources":["../../../../src/types/roles/entities/UserRole.ts"],"names":[],"mappings":";;;AAGA,oGAAiG;AAKjG,MAAa,QAAS,SAAQ,mEAAgC;CAgB7D;AAhBD,4BAgBC"}

package/dist/types/services/interfaces.service.d.ts

@@ -16,6 +16,7 @@ import { ProgramSeason } from '../programs-seasons/entities/ProgramSeason';
 import { LevelOfPlayEnum, ProgramTypesEnum } from '../programs/types/enums/program.enums';
 import { PurchasePaymentDto } from '../purchase/dto/purchase.dto';
 import { Answer } from '../questionnaires/entities/Answer';
+import { Tax } from '../taxes/entities/Tax';
 import { SimpleUserDto } from '../user/dto/user.dto';
 import { AddonTimePeriodEnum, CurrencyEnum, GenderEnum, MembershipStatusEnum, PackageProductsRelationTypeEnum, PaginationTypeEnum, ProductSubTypesEnum, ProductTypesEnum, PurchasedResourceStatusEnum, RegistrationValidationStatusEnum, RegistrationWindowStatusEnum, ResourceNameTypeEnum } from './enums.service';
 export interface IQuestionAnswerObject {
@@ -118,6 +119,9 @@ export interface IPaginationMeta {
     totalPages?: number;
     type?: PaginationTypeEnum;
 }
+export interface ICalculatedTax extends Tax {
+    amount?: number;
+}
 export interface IPricesOfProductsResults {
     discountId?: number;
     groupId?: number;
@@ -133,6 +137,7 @@ export interface IPricesOfProductsResults {
     priceWithoutTax: number;
     quantity?: number;
     tax: number;
+    taxes?: ICalculatedTax[];
     unique?: string;
     unitPrice: number;
 }

package/dist/types/services/interfaces.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"interfaces.service.js","sourceRoot":"","sources":["../../../src/types/services/interfaces.service.ts"],"names":[],"mappings":";;;AAIA,6CAAyC;AAUzC,8EAA2E;AAM3E,mDAayB;AA+EzB;GACG;AACH,MAAa,qBAAsB,SAAQ,6BAAa;IAAxD;;QACC,gBAAW,GAAyB,oCAAoB,CAAC,cAAc,CAAC;IAEzE,CAAC;CAAA;AAHD,sDAGC;AAED;GACG;AACH,MAAa,oBAAqB,SAAQ,cAAK;IAA/C;;QACC,gBAAW,GAAyB,oCAAoB,CAAC,KAAK,CAAC;IAEhE,CAAC;CAAA;AAHD,oDAGC"}
+{"version":3,"file":"interfaces.service.js","sourceRoot":"","sources":["../../../src/types/services/interfaces.service.ts"],"names":[],"mappings":";;;AAIA,6CAAyC;AAUzC,8EAA2E;AAO3E,mDAayB;AA+EzB;GACG;AACH,MAAa,qBAAsB,SAAQ,6BAAa;IAAxD;;QACC,gBAAW,GAAyB,oCAAoB,CAAC,cAAc,CAAC;IAEzE,CAAC;CAAA;AAHD,sDAGC;AAED;GACG;AACH,MAAa,oBAAqB,SAAQ,cAAK;IAA/C;;QACC,gBAAW,GAAyB,oCAAoB,CAAC,KAAK,CAAC;IAEhE,CAAC;CAAA;AAHD,oDAGC"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@bondsports/types",
-	"version": "2.4.7",
+	"version": "2.4.8-a-1",
 	"description": "backend types module for Bond-Sports",
 	"main": "./dist/index.js",
 	"scripts": {
@@ -33,12 +33,12 @@
 	],
 	"homepage": "https://github.com/Bond-Sports/bondUtils/tree/main/packages/types#readme",
 	"dependencies": {
+		"@bondsports/date-time": "^2.4.48",
+		"@bondsports/notifications-sdk": "latest",
 		"moment": "^2.29.1",
 		"rimraf": "^3.0.2",
 		"stripe": "9.1.0",
-		"typeorm": "^0.2.32",
-		"@bondsports/date-time": "^2.4.48",
-		"@bondsports/notifications-sdk": "latest"
+		"typeorm": "^0.2.32"
 	},
 	"devDependencies": {
 		"@bondsports/eslint-config": "^1.0.2",
@@ -50,5 +50,5 @@
 		"ts-node": "^10.8.0",
 		"typescript": "^4.4.3"
 	},
-	"gitHead": "178ca9dc5ea5e94b44d765b6663e7a4ad0d19d98"
+	"gitHead": "d3316694767c8c6bf1ee8fe02b6c1e1aa65dc95c"
 }