taxtank-core 0.29.32 → 0.29.34

package/lib/collections/subscription/service-price.collection.d.ts

@@ -1,5 +1,6 @@
 import { Collection } from '../collection';
 import { ServicePrice } from '../../models';
+import { ServiceProductCollection } from './service-product.collection';
 /**
  * @TODO vik refactor
  */
@@ -12,4 +13,5 @@ export declare class ServicePriceCollection extends Collection<ServicePrice> {
     get annualPackage(): this;
     get annualPackageSum(): number;
     getProperty(isAnnual: boolean, isPackage: boolean): ServicePrice;
+    get products(): ServiceProductCollection;
 }

package/lib/collections/subscription/service-subscription.collection.d.ts

@@ -4,9 +4,10 @@ import { ServiceProduct, ServiceSubscription } from '../../models';
 import { CollectionDictionary } from '../collection-dictionary';
 export declare class ServiceSubscriptionCollection extends Collection<ServiceSubscription> {
     getActive(): this;
+    getInactive(): this;
     getTrials(): this;
     getActiveTrials(): this;
-    getExpiringTrials(): this;
+    getExpiredTrials(): this;
     getPaid(): this;
     getActivePaid(): ServiceSubscription;
     /**

package/lib/collections/subscription/subscription-item.collection.d.ts

@@ -5,5 +5,5 @@ export declare class SubscriptionItemCollection extends Collection<ServiceSubscr
     get propertiesItem(): ServiceSubscriptionItem;
     get propertyQuantity(): number;
     hasProduct(product: ServiceProduct): boolean;
-    getPrices(): ServicePriceCollection;
+    get prices(): ServicePriceCollection;
 }

package/lib/db/Models/user/client-income-types.d.ts

@@ -1,12 +1,11 @@
 import { ClientDetails } from './client-details';
 import { ObservableModel } from '../observable-model';
 export declare class ClientIncomeTypes extends ObservableModel {
-    salary?: boolean;
+    id?: number;
+    clientDetails?: ClientDetails;
+    work?: boolean;
     property?: boolean;
     sole?: boolean;
-    dividends?: boolean;
-    other?: boolean;
-    id?: number;
+    holdings?: boolean;
     deletedAt?: Date;
-    clientDetails?: ClientDetails;
 }

package/lib/db/Models/user/user.d.ts

@@ -38,6 +38,7 @@ export declare class User extends AbstractModel {
     roles?: UserRolesEnum;
     financialYear?: number;
     dateOfBirth?: Date;
+    lastSeen?: Date;
     deletedAt?: Date;
     properties?: Property[];
     propertySubscriptions?: PropertySubscription[];

package/lib/models/service-subscription/service-subscription.d.ts

@@ -6,7 +6,6 @@ export declare class ServiceSubscription extends ServiceSubscriptionBase {
     startDate: Date;
     endDate: Date;
     items: ServiceSubscriptionItem[];
-    lastTrialDays: number;
     get frequency(): 'month' | 'year';
     get isTrial(): boolean;
     get isPaid(): boolean;
@@ -19,12 +18,6 @@ export declare class ServiceSubscription extends ServiceSubscriptionBase {
      * A subscription is considered active if the end date has not yet arrived and its status is "Active" or "Past due"
      */
     get isActive(): boolean;
-    get daysRemain(): number;
-    /**
-     * Check if trial expired
-     */
-    isTrialExpired(): boolean;
-    isTrialExpiring(): boolean;
     isRenewable(): boolean;
     getItems(): SubscriptionItemCollection;
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "taxtank-core",
-  "version": "0.29.32",
+  "version": "0.29.34",
   "private": false,
   "peerDependencies": {
     "@angular/common": "^12.2.3 || ~13.0.0",