@osovitny/anatoly 3.19.31 → 3.19.33

package/lib/billing/components/index.d.ts

@@ -1,2 +1,2 @@
 import { BuyAccessButtonComponent, SubscribePlanButtonComponent, OrderSummaryComponent, PaymentMethodsComponent, PaymentOptionsComponent, BraintreeDialog, PaypalButtonComponent, PaypalSubscribeButtonComponent, PayPalComponent, StripeDialog } from "./exports";
-export declare const COMPONENTS: (typeof BuyAccessButtonComponent | typeof SubscribePlanButtonComponent | typeof OrderSummaryComponent | typeof PaymentMethodsComponent | typeof PaymentOptionsComponent | typeof BraintreeDialog | typeof PaypalButtonComponent | typeof PaypalSubscribeButtonComponent | typeof PayPalComponent | typeof StripeDialog)[];
+export declare const COMPONENTS: (typeof StripeDialog | typeof PaypalSubscribeButtonComponent | typeof PaypalButtonComponent | typeof BraintreeDialog | typeof BuyAccessButtonComponent | typeof SubscribePlanButtonComponent | typeof OrderSummaryComponent | typeof PaymentMethodsComponent | typeof PaymentOptionsComponent | typeof PayPalComponent)[];

package/lib/billing/components/order-summary/order-summary.component.d.ts

@@ -1,6 +1,6 @@
 import { ComponentBase } from "../../../ui/components/base/components/component";
 import { PaymentsService } from "../../services/payments.service";
-import { DiscountCodesApiService } from "../../../data/services/billing/discountcodes-api.service";
+import { PromoCodesApiService } from "../../../data/services/billing/promocodes-api.service";
 import { NotificationService } from "../../../core/notifications/services/notification-service";
 import * as i0 from "@angular/core";
 export declare class OrderSummaryComponent extends ComponentBase {
@@ -10,7 +10,7 @@ export declare class OrderSummaryComponent extends ComponentBase {
     showPromoCode: boolean;
     promoCode: any;
     discount: any;
-    constructor(ps: PaymentsService, api: DiscountCodesApiService, ns: NotificationService);
+    constructor(ps: PaymentsService, api: PromoCodesApiService, ns: NotificationService);
     ngOnInit(): void;
     private setDefaults;
     private setValues;

package/lib/billing/components/pm/braintree/braintree.component.d.ts

@@ -1,9 +1,11 @@
 import { DialogBase } from '../../../../ui/components/base/dialog';
 import { PaymentsService } from '../../../services/payments.service';
 import { NotificationService } from '../../../../core/notifications/services/notification-service';
+import { BillingService } from '../../../services/billing.service';
 import * as i0 from "@angular/core";
 export declare class BraintreeDialog extends DialogBase {
-    ps: PaymentsService;
+    private bs;
+    private ps;
     private ns;
     braintreeInstance: any;
     deviceData: any;
@@ -11,7 +13,7 @@ export declare class BraintreeDialog extends DialogBase {
     title: any;
     description: any;
     image: any;
-    constructor(ps: PaymentsService, ns: NotificationService);
+    constructor(bs: BillingService, ps: PaymentsService, ns: NotificationService);
     ngOnInit(): void;
     private setValues;
     initializeEmbedForm(): void;

package/lib/billing/components/pm/paypal/paypal-button.component.d.ts

@@ -1,13 +1,15 @@
 import { ComponentBase } from '../../../../ui/components/base/components/component';
 import { PaymentsService } from '../../../services/payments.service';
 import { IPayPalConfig } from '../../../models/paypal-models';
+import { BillingService } from '../../../services/billing.service';
 import * as i0 from "@angular/core";
 export declare class PaypalButtonComponent extends ComponentBase {
-    ps: PaymentsService;
+    private bs;
+    private ps;
     payPalConfig?: IPayPalConfig;
     paidForTitle: string;
     paidFor: any;
-    constructor(ps: PaymentsService);
+    constructor(bs: BillingService, ps: PaymentsService);
     ngOnInit(): void;
     private setDefaults;
     private setValues;

package/lib/billing/components/pm/paypal/paypal-subscribe-button.component.d.ts

@@ -1,10 +1,8 @@
-import { NgZone } from '@angular/core';
 import { ComponentBase } from '../../../../ui/components/base/components/component';
 import { IPayPalConfig } from '../../../models/paypal-models';
 import { BillingService } from '../../../services/billing.service';
 import * as i0 from "@angular/core";
 export declare class PaypalSubscribeButtonComponent extends ComponentBase {
-    private zone;
     private bs;
     private _payPalPlanId;
     payPalConfig?: IPayPalConfig;
@@ -13,13 +11,15 @@ export declare class PaypalSubscribeButtonComponent extends ComponentBase {
     quantity: any;
     planId: any;
     addons: any;
-    price: any;
-    totalPrice: any;
-    constructor(zone: NgZone, bs: BillingService);
+    subtotal: any;
+    promoCode: any;
+    total: any;
+    currency: string;
+    constructor(bs: BillingService);
     ngOnInit(): void;
     private setDefaults;
     private setValues;
     private initPayPal;
     static ɵfac: i0.ɵɵFactoryDeclaration<PaypalSubscribeButtonComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<PaypalSubscribeButtonComponent, "anatoly-billing-paypal-subscribe-button", never, { "payPalPlanId": { "alias": "payPalPlanId"; "required": false; }; "quantity": { "alias": "quantity"; "required": false; }; "planId": { "alias": "planId"; "required": false; }; "addons": { "alias": "addons"; "required": false; }; "price": { "alias": "price"; "required": false; }; "totalPrice": { "alias": "totalPrice"; "required": false; }; }, {}, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<PaypalSubscribeButtonComponent, "anatoly-billing-paypal-subscribe-button", never, { "payPalPlanId": { "alias": "payPalPlanId"; "required": false; }; "quantity": { "alias": "quantity"; "required": false; }; "planId": { "alias": "planId"; "required": false; }; "addons": { "alias": "addons"; "required": false; }; "subtotal": { "alias": "subtotal"; "required": false; }; "promoCode": { "alias": "promoCode"; "required": false; }; "total": { "alias": "total"; "required": false; }; "currency": { "alias": "currency"; "required": false; }; }, {}, never, never, false, never>;
 }

package/lib/billing/components/pm/stripe/stripe.component.d.ts

@@ -1,8 +1,10 @@
 import { DialogBase } from '../../../../ui/components/base/dialog';
 import { PaymentsService } from '../../../services/payments.service';
+import { BillingService } from '../../../services/billing.service';
 import * as i0 from "@angular/core";
 export declare class StripeDialog extends DialogBase {
-    ps: PaymentsService;
+    private bs;
+    private ps;
     stripe: any;
     stripeCheckout: any;
     sessionId: any;
@@ -10,7 +12,7 @@ export declare class StripeDialog extends DialogBase {
     title: any;
     description: any;
     image: any;
-    constructor(ps: PaymentsService);
+    constructor(bs: BillingService, ps: PaymentsService);
     ngOnInit(): void;
     private setValues;
     initializeEmbedForm(): Promise<void>;

package/lib/billing/services/billing.service.d.ts

@@ -1,17 +1,33 @@
 import { NgZone } from '@angular/core';
 import { SubscriptionsApiService } from '../../data/services/billing/subscriptions-api.service';
 import { AppContextService } from '../../core/services/appcontext.service';
-import { SubscriptionProvider } from '../../core/enums';
+import { PaymentStage, SubscriptionProvider } from '../../core/enums';
+import { PaymentsApiService } from '../../data/services/billing/payments-api.service';
+import { NotificationService } from '../../core/notifications/services/notification-service';
 import * as i0 from "@angular/core";
 export declare class BillingService {
     private zone;
     private appContext;
-    private api;
-    private _subscriptionChange;
-    readonly _subscriptionChange$: import("rxjs").Observable<any>;
-    constructor(zone: NgZone, appContext: AppContextService, api: SubscriptionsApiService);
-    fireSubscriptionChange(paymentInProgress: any, paymentFailed: any): void;
-    addSubscription(sp: SubscriptionProvider, newSubscriptionId: any, planId: any, addons: any, price: any, totalPrice: any): void;
+    private apiPayments;
+    private apiSubscriptions;
+    private ns;
+    private _paymentAdded;
+    readonly paymentAdded$: import("rxjs").Observable<any>;
+    private _paymentProgress;
+    readonly paymentProgress$: import("rxjs").Observable<any>;
+    private _subscriptionAdded;
+    readonly subscriptionAdded$: import("rxjs").Observable<any>;
+    constructor(zone: NgZone, appContext: AppContextService, apiPayments: PaymentsApiService, apiSubscriptions: SubscriptionsApiService, ns: NotificationService);
+    firePaymentAdded(isPaymentValid: any, paymentId: any): void;
+    firePaymentProgress(paymentStage: any, paymentInProgress: any, isPaymentFailed: any): void;
+    fireSubscriptionAdded(paymentInProgress: any, paymentFailed: any): void;
+    createStripeSession(amount: any, currency: any, title: any, description: any, image: any): import("rxjs").Observable<any>;
+    createBraintreeToken(): import("rxjs").Observable<any>;
+    addPayment(paymentMethod: any, paidFor: any, subtotal: any, promoCode: any, total: any, currency: any, pmId: any, pmStatus: any, pmDetails: any): void;
+    paymentSuccessful(stage: PaymentStage): void;
+    paymentFailed(stage: PaymentStage): void;
+    setPaymentProgress(stage: PaymentStage, paymentInProgress: any, isPaymentFailed: any): void;
+    addSubscription(sp: SubscriptionProvider, newSubscriptionId: any, planId: any, addons: any, subtotal: any, promoCode: any, total: any, currency: any): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<BillingService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<BillingService>;
 }

package/lib/billing/services/payments.service.d.ts

@@ -1,49 +1,29 @@
-import { NgZone } from '@angular/core';
-import { PaymentStage } from '../../core/enums/billing';
-import { PaymentsApiService } from '../../data/services/billing/payments-api.service';
-import { NotificationService } from '../../core/notifications/services/notification-service';
-import { GoogleAnalyticsService } from '../../core/services/google-analytics.service';
 import * as i0 from "@angular/core";
 export declare class PaymentsService {
-    private zone;
-    private api;
-    private ns;
-    private ga;
-    paymentStage: any;
-    paymentInProgress: boolean;
-    isPaymentFailed: boolean;
     selectedPaymentType: any;
     selectedPaymentMethod: any;
     subtotal: number;
-    discountCode: any;
-    discountPercentage: any;
-    discountAmount: any;
+    promoCode: any;
+    promoPercentage: any;
+    promoAmount: any;
     currency: string;
-    private _discountCodeApplied;
-    private _paymentAdded;
+    private _promoCodeApplied;
+    readonly promoCodeApplied$: import("rxjs").Observable<any>;
     private _showStripeDialog;
-    private _showBraintreeDialog;
-    readonly discountCodeApplied$: import("rxjs").Observable<any>;
-    readonly paymentAdded$: import("rxjs").Observable<any>;
     readonly showStripeDialog$: import("rxjs").Observable<any>;
+    private _showBraintreeDialog;
     readonly showBraintreeDialog$: import("rxjs").Observable<any>;
-    constructor(zone: NgZone, api: PaymentsApiService, ns: NotificationService, ga: GoogleAnalyticsService);
     private setDefaults;
     private setValues;
-    private fireDiscountCodeApplied;
-    private firePaymentAdded;
+    private firePromoCodeApplied;
     init(): void;
     resetState(): void;
     getTotal(): number;
-    applyDiscountCode(data: any): void;
-    getDiscountCodeAsString(): string;
+    applyPromoCode(data: any): void;
+    getPromoCodeAsString(): string;
     openStripePaymentDialog(): void;
     openBraintreePaymentDialog(): void;
     closeBraintreePaymentDialog(): void;
-    createStripeSession(title: any, description: any, image: any): import("rxjs").Observable<any>;
-    createBraintreeToken(): import("rxjs").Observable<any>;
-    pay(paidFor: any, pmId: any, pmStatus: any, pmDetails: any): void;
-    paymentFailed(stage: PaymentStage): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<PaymentsService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<PaymentsService>;
 }

package/lib/data/exports.d.ts

@@ -3,7 +3,7 @@ export * from './base/grid/grid-read.service';
 export * from './base/grid/grid-edit.service';
 export * from './services/billing/currencies-api.service';
 export * from './services/billing/currencies-storage.service';
-export * from './services/billing/discountcodes-api.service';
+export * from './services/billing/promocodes-api.service';
 export * from './services/billing/payments-api.service';
 export * from './services/billing/subscriptions-api.service';
 export * from './services/billing/transactions-api.service';

package/lib/data/services/billing/payments-api.service.d.ts

@@ -7,7 +7,7 @@ export declare class PaymentsApiService extends ApiServiceBase {
     constructor(http: HttpClient);
     createStripeSession(amount: any, currency: any, name: any, description: any, image: any): Observable<any>;
     createBraintreeToken(): Observable<any>;
-    pay(paymentMethod: any, paidFor: any, subtotal: any, promoCode: any, total: any, currency: any, pmId: any, pmStatus: any, pmDetails: any, success?: Function, error?: Function): import("rxjs").Subscription;
+    addPayment(paymentMethod: any, paidFor: any, subtotal: any, promoCode: any, total: any, currency: any, pmId: any, pmStatus: any, pmDetails: any, success?: Function, error?: Function): import("rxjs").Subscription;
     static ɵfac: i0.ɵɵFactoryDeclaration<PaymentsApiService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<PaymentsApiService>;
 }

package/lib/data/services/billing/promocodes-api.service.d.ts

@@ -0,0 +1,11 @@
+import { HttpClient } from '@angular/common/http';
+import { Observable } from 'rxjs';
+import { ApiServiceBase } from '../../base/api.service';
+import * as i0 from "@angular/core";
+export declare class PromoCodesApiService extends ApiServiceBase {
+    protected http: HttpClient;
+    constructor(http: HttpClient);
+    getPromoCode(code: any): Observable<any>;
+    static ɵfac: i0.ɵɵFactoryDeclaration<PromoCodesApiService, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<PromoCodesApiService>;
+}

package/lib/data/services/billing/subscriptions-api.service.d.ts

@@ -6,7 +6,7 @@ export declare class SubscriptionsApiService extends ApiServiceBase {
     protected http: HttpClient;
     constructor(http: HttpClient);
     getSubscriptions(data: any): Observable<any[]>;
-    addSubscription(subscriptionProvider: any, newSubscriptionId: any, planId: any, addons: any, price: any, totalPrice: any, success?: Function, error?: Function): void;
+    addSubscription(subscriptionProvider: any, newSubscriptionId: any, planId: any, addons: any, subtotal: any, promoCode: any, total: any, currency: any, success?: Function, error?: Function): void;
     cancelSubscription(subscriptionProvider: any, subscriptionId: any, success?: Function, error?: Function): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<SubscriptionsApiService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<SubscriptionsApiService>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@osovitny/anatoly",
-  "version": "3.19.31",
+  "version": "3.19.33",
   "peerDependencies": {
     "@angular/common": "19.2.11",
     "@angular/core": "19.2.11",

package/lib/data/services/billing/discountcodes-api.service.d.ts

@@ -1,11 +0,0 @@
-import { HttpClient } from '@angular/common/http';
-import { Observable } from 'rxjs';
-import { ApiServiceBase } from '../../base/api.service';
-import * as i0 from "@angular/core";
-export declare class DiscountCodesApiService extends ApiServiceBase {
-    protected http: HttpClient;
-    constructor(http: HttpClient);
-    getDiscountCode(code: any): Observable<any>;
-    static ɵfac: i0.ɵɵFactoryDeclaration<DiscountCodesApiService, never>;
-    static ɵprov: i0.ɵɵInjectableDeclaration<DiscountCodesApiService>;
-}