taxtank-core 0.29.18 → 0.29.20

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

@@ -1,5 +1,15 @@
 import { Collection } from '../collection';
 import { ServicePrice } from '../../models';
+/**
+ * @TODO vik refactor
+ */
 export declare class ServicePriceCollection extends Collection<ServicePrice> {
     getActive(): this;
+    get monthly(): this;
+    get monthlyPackage(): this;
+    get monthlyPackageSum(): number;
+    get annual(): this;
+    get annualPackage(): this;
+    get annualPackageSum(): number;
+    getProperty(isAnnual: boolean, isPackage: boolean): ServicePrice;
 }

package/lib/db/Enums/subscription/service-price-type.enum.d.ts

@@ -1,4 +1,7 @@
 export declare enum ServicePriceTypeEnum {
-    ONE_TIME = 1,
-    RECURRING = 2
+    DEPRECATED = 0,
+    MONTHLY = 1,
+    MONTHLY_PACKAGE = 2,
+    YEARLY = 3,
+    YEARLY_PACKAGE = 4
 }

package/lib/db/Models/subscription/service-price.d.ts

@@ -6,6 +6,7 @@ export declare class ServicePrice extends AbstractModel {
     id?: number;
     stripeId?: string;
     amount?: number;
+    isRecurring?: boolean;
     type?: ServicePriceTypeEnum;
     recurringInterval?: ServicePriceRecurringIntervalEnum;
     recurringIntervalCount?: number;

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

@@ -1,5 +1,6 @@
 import { ServiceProduct as BaseServiceProduct } from '../../db/Models/subscription/service-product';
 export declare class ServiceProduct extends BaseServiceProduct {
+    static quantity: number;
     isProperties(): boolean;
     isWorkTank(): boolean;
     isSoleTank(): boolean;

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

@@ -1,6 +1,7 @@
 import { ServiceSubscription as ServiceSubscriptionBase } from '../../db/Models/subscription/service-subscription';
 import { ServiceSubscriptionItem } from './service-subscription-item';
 import { ServiceProduct } from './service-product';
+import { SubscriptionItemCollection } from '../../collections';
 export declare class ServiceSubscription extends ServiceSubscriptionBase {
     startDate: Date;
     endDate: Date;
@@ -24,6 +25,7 @@ export declare class ServiceSubscription extends ServiceSubscriptionBase {
     isTrialExpired(): boolean;
     isTrialExpiring(): boolean;
     isRenewable(): boolean;
+    getItems(): SubscriptionItemCollection;
     /**
      * @TODO move to collection
      */
@@ -46,6 +48,7 @@ export declare class ServiceSubscription extends ServiceSubscriptionBase {
      */
     hasItem(itemToCheck: ServiceSubscriptionItem): boolean;
     hasProduct(product: ServiceProduct): boolean;
+    isPackage(): boolean;
     /**
      * Recommended number of properties to buy,
      * based on the property service product and the number of properties the user has

package/lib/services/http/subscription/service-subscription/subscription.service.d.ts

@@ -2,7 +2,6 @@ import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
 import { ServiceSubscription } from '../../../../models/service-subscription/service-subscription';
 import { EventDispatcherService, SseService } from '../../../event';
-import { ServiceSubscriptionItem } from '../../../../models/service-subscription/service-subscription-item';
 import { ToastService } from '../../../toast';
 import { RestMethod, RestService } from '../../rest';
 import { ServiceSubscription as ServiceSubscriptionBase } from '../../../../db/Models';
@@ -38,11 +37,11 @@ export declare class SubscriptionService extends RestService<ServiceSubscription
     /**
      * Get difference between current subscription and selected new subscription
      */
-    getProrationCost(items: ServiceSubscriptionItem[]): Observable<number>;
+    getProrationCost(subscription: ServiceSubscription): Observable<number>;
     /**
      * Change subscription plan
      */
-    changeSubscription(items: ServiceSubscriptionItem[]): Observable<object>;
+    changeSubscription(subscription: ServiceSubscription): Observable<object>;
     private listenSubscriptions;
     static ɵfac: i0.ɵɵFactoryDeclaration<SubscriptionService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<SubscriptionService>;

package/package.json

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