@infrab4a/connect-angular 4.3.7-beta.8 → 4.3.7-beta.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2020/persistence/cookie-data-persistence.mjs +9 -6
- package/esm2020/persistence/data-persistence.mjs +1 -1
- package/esm2020/services/checkout-subscription.service.mjs +18 -21
- package/esm2020/services/checkout.service.mjs +13 -16
- package/fesm2015/infrab4a-connect-angular.mjs +32 -41
- package/fesm2015/infrab4a-connect-angular.mjs.map +1 -1
- package/fesm2020/infrab4a-connect-angular.mjs +34 -37
- package/fesm2020/infrab4a-connect-angular.mjs.map +1 -1
- package/package.json +1 -1
- package/persistence/cookie-data-persistence.d.ts +4 -3
- package/persistence/data-persistence.d.ts +4 -3
- package/services/checkout-subscription.service.d.ts +5 -4
- package/services/checkout.service.d.ts +4 -3
|
@@ -1,15 +1,18 @@
|
|
|
1
1
|
import { Injectable } from '@angular/core';
|
|
2
2
|
import cookie from 'js-cookie';
|
|
3
|
+
import { from } from 'rxjs';
|
|
4
|
+
import { map } from 'rxjs/operators';
|
|
3
5
|
import * as i0 from "@angular/core";
|
|
4
6
|
export class CookieDataPersistence {
|
|
5
|
-
|
|
6
|
-
return cookie.get(key);
|
|
7
|
+
get(key) {
|
|
8
|
+
return from(cookie.get(key));
|
|
7
9
|
}
|
|
8
|
-
|
|
10
|
+
remove(key) {
|
|
9
11
|
cookie.remove(key);
|
|
12
|
+
return;
|
|
10
13
|
}
|
|
11
|
-
|
|
12
|
-
|
|
14
|
+
set(key, value) {
|
|
15
|
+
return from(cookie.set(key, value)).pipe(map(() => { }));
|
|
13
16
|
}
|
|
14
17
|
}
|
|
15
18
|
CookieDataPersistence.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CookieDataPersistence, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
|
|
@@ -17,4 +20,4 @@ CookieDataPersistence.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0"
|
|
|
17
20
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CookieDataPersistence, decorators: [{
|
|
18
21
|
type: Injectable
|
|
19
22
|
}] });
|
|
20
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
23
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29va2llLWRhdGEtcGVyc2lzdGVuY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9wcm9qZWN0cy9jb25uZWN0LWFuZ3VsYXIvc3JjL3BlcnNpc3RlbmNlL2Nvb2tpZS1kYXRhLXBlcnNpc3RlbmNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUE7QUFDMUMsT0FBTyxNQUFNLE1BQU0sV0FBVyxDQUFBO0FBQzlCLE9BQU8sRUFBYyxJQUFJLEVBQUUsTUFBTSxNQUFNLENBQUE7QUFDdkMsT0FBTyxFQUFFLEdBQUcsRUFBRSxNQUFNLGdCQUFnQixDQUFBOztBQUlwQyxNQUFNLE9BQU8scUJBQXFCO0lBQ2hDLEdBQUcsQ0FBQyxHQUFXO1FBQ2IsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFBO0lBQzlCLENBQUM7SUFFRCxNQUFNLENBQUMsR0FBVztRQUNoQixNQUFNLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFBO1FBRWxCLE9BQU07SUFDUixDQUFDO0lBRUQsR0FBRyxDQUFDLEdBQVcsRUFBRSxLQUFhO1FBQzVCLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFLEtBQUssQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsR0FBRSxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ3pELENBQUM7O2tIQWJVLHFCQUFxQjtzSEFBckIscUJBQXFCOzJGQUFyQixxQkFBcUI7a0JBRGpDLFVBQVUiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSdcbmltcG9ydCBjb29raWUgZnJvbSAnanMtY29va2llJ1xuaW1wb3J0IHsgT2JzZXJ2YWJsZSwgZnJvbSB9IGZyb20gJ3J4anMnXG5pbXBvcnQgeyBtYXAgfSBmcm9tICdyeGpzL29wZXJhdG9ycydcbmltcG9ydCB7IERhdGFQZXJzaXN0ZW5jZSB9IGZyb20gJy4vZGF0YS1wZXJzaXN0ZW5jZSdcblxuQEluamVjdGFibGUoKVxuZXhwb3J0IGNsYXNzIENvb2tpZURhdGFQZXJzaXN0ZW5jZSBpbXBsZW1lbnRzIERhdGFQZXJzaXN0ZW5jZSB7XG4gIGdldChrZXk6IHN0cmluZyk6IE9ic2VydmFibGU8c3RyaW5nPiB7XG4gICAgcmV0dXJuIGZyb20oY29va2llLmdldChrZXkpKVxuICB9XG5cbiAgcmVtb3ZlKGtleTogc3RyaW5nKTogT2JzZXJ2YWJsZTx2b2lkPiB7XG4gICAgY29va2llLnJlbW92ZShrZXkpXG5cbiAgICByZXR1cm5cbiAgfVxuXG4gIHNldChrZXk6IHN0cmluZywgdmFsdWU6IHN0cmluZyk6IE9ic2VydmFibGU8dm9pZD4ge1xuICAgIHJldHVybiBmcm9tKGNvb2tpZS5zZXQoa2V5LCB2YWx1ZSkpLnBpcGUobWFwKCgpID0+IHt9KSlcbiAgfVxufVxuIl19
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export {};
|
|
2
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YS1wZXJzaXN0ZW5jZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL2Nvbm5lY3QtYW5ndWxhci9zcmMvcGVyc2lzdGVuY2UvZGF0YS1wZXJzaXN0ZW5jZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgT2JzZXJ2YWJsZSB9IGZyb20gJ3J4anMnXG5cbmV4cG9ydCBpbnRlcmZhY2UgRGF0YVBlcnNpc3RlbmNlIHtcbiAgZ2V0KGtleTogc3RyaW5nKTogT2JzZXJ2YWJsZTxzdHJpbmc+XG4gIHJlbW92ZShrZXk6IHN0cmluZyk6IE9ic2VydmFibGU8dm9pZD5cbiAgc2V0KGtleTogc3RyaW5nLCB2YWx1ZTogc3RyaW5nKTogT2JzZXJ2YWJsZTx2b2lkPlxufVxuIl19
|
|
@@ -1,34 +1,23 @@
|
|
|
1
1
|
import { Inject, Injectable } from '@angular/core';
|
|
2
2
|
import { CheckoutSubscription, CheckoutTypes, isNil, pick, } from '@infrab4a/connect';
|
|
3
|
-
import cookie from 'js-cookie';
|
|
4
|
-
import { from, of } from 'rxjs';
|
|
5
3
|
import { concatMap } from 'rxjs/operators';
|
|
4
|
+
import { PERSISTENCE_PROVIDER } from '../consts';
|
|
6
5
|
import { CouponService } from './coupon.service';
|
|
7
6
|
import * as i0 from "@angular/core";
|
|
8
7
|
import * as i1 from "./coupon.service";
|
|
9
8
|
export class CheckoutSubscriptionService {
|
|
10
|
-
constructor(checkoutSubscriptionRepository,
|
|
9
|
+
constructor(checkoutSubscriptionRepository, dataPersistence, couponService) {
|
|
11
10
|
this.checkoutSubscriptionRepository = checkoutSubscriptionRepository;
|
|
12
|
-
this.
|
|
11
|
+
this.dataPersistence = dataPersistence;
|
|
13
12
|
this.couponService = couponService;
|
|
14
13
|
}
|
|
15
14
|
getCheckoutSubscription(checkoutData) {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
return from(this.createCheckoutSubscription(checkoutData));
|
|
20
|
-
}
|
|
21
|
-
async createCheckoutSubscription(checkoutData) {
|
|
22
|
-
const checkout = await this.checkoutSubscriptionRepository.create({
|
|
23
|
-
createdAt: new Date(),
|
|
24
|
-
...CheckoutSubscription.toInstance(pick(checkoutData, ['user', 'shop'])).toPlain(),
|
|
25
|
-
});
|
|
26
|
-
cookie.set('checkoutSubscriptionId', checkout.id);
|
|
27
|
-
return checkout;
|
|
15
|
+
return this.dataPersistence
|
|
16
|
+
.get('checkoutSubscriptionId')
|
|
17
|
+
.pipe(concatMap((id) => !isNil(id) ? this.checkoutSubscriptionRepository.get({ id }) : this.createCheckoutSubscription(checkoutData)));
|
|
28
18
|
}
|
|
29
19
|
clearCheckoutSubscriptionFromSession() {
|
|
30
|
-
|
|
31
|
-
return of();
|
|
20
|
+
return this.dataPersistence.remove('checkoutSubscriptionId');
|
|
32
21
|
}
|
|
33
22
|
checkCoupon(nickname, userEmail) {
|
|
34
23
|
return this.getCheckoutSubscription().pipe(concatMap((checkout) => this.couponService
|
|
@@ -38,8 +27,16 @@ export class CheckoutSubscriptionService {
|
|
|
38
27
|
calcDiscountSubscription(coupon) {
|
|
39
28
|
return this.getCheckoutSubscription().pipe(concatMap((checkout) => this.couponService.calcDiscountSubscription(coupon, checkout).pipe()));
|
|
40
29
|
}
|
|
30
|
+
async createCheckoutSubscription(checkoutData) {
|
|
31
|
+
const checkout = await this.checkoutSubscriptionRepository.create({
|
|
32
|
+
createdAt: new Date(),
|
|
33
|
+
...CheckoutSubscription.toInstance(pick(checkoutData, ['user', 'shop'])).toPlain(),
|
|
34
|
+
});
|
|
35
|
+
await this.dataPersistence.set('checkoutSubscriptionId', checkout.id).toPromise();
|
|
36
|
+
return checkout;
|
|
37
|
+
}
|
|
41
38
|
}
|
|
42
|
-
CheckoutSubscriptionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CheckoutSubscriptionService, deps: [{ token: 'CheckoutSubscriptionRepository' }, { token:
|
|
39
|
+
CheckoutSubscriptionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CheckoutSubscriptionService, deps: [{ token: 'CheckoutSubscriptionRepository' }, { token: PERSISTENCE_PROVIDER }, { token: i1.CouponService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
43
40
|
CheckoutSubscriptionService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CheckoutSubscriptionService });
|
|
44
41
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CheckoutSubscriptionService, decorators: [{
|
|
45
42
|
type: Injectable
|
|
@@ -48,6 +45,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImpor
|
|
|
48
45
|
args: ['CheckoutSubscriptionRepository']
|
|
49
46
|
}] }, { type: undefined, decorators: [{
|
|
50
47
|
type: Inject,
|
|
51
|
-
args: [
|
|
48
|
+
args: [PERSISTENCE_PROVIDER]
|
|
52
49
|
}] }, { type: i1.CouponService }]; } });
|
|
53
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2tvdXQtc3Vic2NyaXB0aW9uLnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9wcm9qZWN0cy9jb25uZWN0LWFuZ3VsYXIvc3JjL3NlcnZpY2VzL2NoZWNrb3V0LXN1YnNjcmlwdGlvbi5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxNQUFNLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFBO0FBQ2xELE9BQU8sRUFDTCxvQkFBb0IsRUFFcEIsYUFBYSxFQUViLEtBQUssRUFDTCxJQUFJLEdBQ0wsTUFBTSxtQkFBbUIsQ0FBQTtBQUUxQixPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sZ0JBQWdCLENBQUE7QUFHMUMsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sV0FBVyxDQUFBO0FBRWhELE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQTs7O0FBR2hELE1BQU0sT0FBTywyQkFBMkI7SUFDdEMsWUFFbUIsOEJBQThELEVBQ2hDLGVBQWdDLEVBQzlELGFBQTRCO1FBRjVCLG1DQUE4QixHQUE5Qiw4QkFBOEIsQ0FBZ0M7UUFDaEMsb0JBQWUsR0FBZixlQUFlLENBQWlCO1FBQzlELGtCQUFhLEdBQWIsYUFBYSxDQUFlO0lBQzVDLENBQUM7SUFFSix1QkFBdUIsQ0FBQyxZQUErQztRQUNyRSxPQUFPLElBQUksQ0FBQyxlQUFlO2FBQ3hCLEdBQUcsQ0FBQyx3QkFBd0IsQ0FBQzthQUM3QixJQUFJLENBQ0gsU0FBUyxDQUFDLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FDZixDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLDhCQUE4QixDQUFDLEdBQUcsQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQywwQkFBMEIsQ0FBQyxZQUFZLENBQUMsQ0FDN0csQ0FDRixDQUFBO0lBQ0wsQ0FBQztJQUVELG9DQUFvQztRQUNsQyxPQUFPLElBQUksQ0FBQyxlQUFlLENBQUMsTUFBTSxDQUFDLHdCQUF3QixDQUFDLENBQUE7SUFDOUQsQ0FBQztJQUVELFdBQVcsQ0FBQyxRQUFnQixFQUFFLFNBQWlCO1FBQzdDLE9BQU8sSUFBSSxDQUFDLHVCQUF1QixFQUFFLENBQUMsSUFBSSxDQUN4QyxTQUFTLENBQUMsQ0FBQyxRQUFRLEVBQUUsRUFBRSxDQUNyQixJQUFJLENBQUMsYUFBYTthQUNmLFdBQVcsQ0FBQyxRQUFRLEVBQUUsYUFBYSxDQUFDLFlBQVksRUFBRSxRQUFRLEVBQUUsUUFBUSxDQUFDLGdCQUFnQixDQUFDLElBQUksQ0FBQzthQUMzRixJQUFJLEVBQUUsQ0FDVixDQUNGLENBQUE7SUFDSCxDQUFDO0lBRUQsd0JBQXdCLENBQUMsTUFBYztRQUNyQyxPQUFPLElBQUksQ0FBQyx1QkFBdUIsRUFBRSxDQUFDLElBQUksQ0FDeEMsU0FBUyxDQUFDLENBQUMsUUFBUSxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLHdCQUF3QixDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUM5RixDQUFBO0lBQ0gsQ0FBQztJQUVPLEtBQUssQ0FBQywwQkFBMEIsQ0FDdEMsWUFBK0M7UUFFL0MsTUFBTSxRQUFRLEdBQUcsTUFBTSxJQUFJLENBQUMsOEJBQThCLENBQUMsTUFBTSxDQUFDO1lBQ2hFLFNBQVMsRUFBRSxJQUFJLElBQUksRUFBRTtZQUNyQixHQUFHLG9CQUFvQixDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsWUFBWSxFQUFFLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxPQUFPLEVBQUU7U0FDbkYsQ0FBQyxDQUFBO1FBRUYsTUFBTSxJQUFJLENBQUMsZUFBZSxDQUFDLEdBQUcsQ0FBQyx3QkFBd0IsRUFBRSxRQUFRLENBQUMsRUFBRSxDQUFDLENBQUMsU0FBUyxFQUFFLENBQUE7UUFFakYsT0FBTyxRQUFRLENBQUE7SUFDakIsQ0FBQzs7d0hBakRVLDJCQUEyQixrQkFFNUIsZ0NBQWdDLGFBRWhDLG9CQUFvQjs0SEFKbkIsMkJBQTJCOzJGQUEzQiwyQkFBMkI7a0JBRHZDLFVBQVU7OzBCQUdOLE1BQU07MkJBQUMsZ0NBQWdDOzswQkFFdkMsTUFBTTsyQkFBQyxvQkFBb0IiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3QsIEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJ1xuaW1wb3J0IHtcbiAgQ2hlY2tvdXRTdWJzY3JpcHRpb24sXG4gIENoZWNrb3V0U3Vic2NyaXB0aW9uUmVwb3NpdG9yeSxcbiAgQ2hlY2tvdXRUeXBlcyxcbiAgQ291cG9uLFxuICBpc05pbCxcbiAgcGljayxcbn0gZnJvbSAnQGluZnJhYjRhL2Nvbm5lY3QnXG5pbXBvcnQgeyBPYnNlcnZhYmxlIH0gZnJvbSAncnhqcydcbmltcG9ydCB7IGNvbmNhdE1hcCB9IGZyb20gJ3J4anMvb3BlcmF0b3JzJ1xuaW1wb3J0IHsgUmVxdWlyZWRDaGVja291dFN1YnNjcmlwdGlvbkRhdGEgfSBmcm9tICcuL3R5cGVzJ1xuXG5pbXBvcnQgeyBQRVJTSVNURU5DRV9QUk9WSURFUiB9IGZyb20gJy4uL2NvbnN0cydcbmltcG9ydCB7IERhdGFQZXJzaXN0ZW5jZSB9IGZyb20gJy4uL3BlcnNpc3RlbmNlJ1xuaW1wb3J0IHsgQ291cG9uU2VydmljZSB9IGZyb20gJy4vY291cG9uLnNlcnZpY2UnXG5cbkBJbmplY3RhYmxlKClcbmV4cG9ydCBjbGFzcyBDaGVja291dFN1YnNjcmlwdGlvblNlcnZpY2Uge1xuICBjb25zdHJ1Y3RvcihcbiAgICBASW5qZWN0KCdDaGVja291dFN1YnNjcmlwdGlvblJlcG9zaXRvcnknKVxuICAgIHByaXZhdGUgcmVhZG9ubHkgY2hlY2tvdXRTdWJzY3JpcHRpb25SZXBvc2l0b3J5OiBDaGVja291dFN1YnNjcmlwdGlvblJlcG9zaXRvcnksXG4gICAgQEluamVjdChQRVJTSVNURU5DRV9QUk9WSURFUikgcHJpdmF0ZSByZWFkb25seSBkYXRhUGVyc2lzdGVuY2U6IERhdGFQZXJzaXN0ZW5jZSxcbiAgICBwcml2YXRlIHJlYWRvbmx5IGNvdXBvblNlcnZpY2U6IENvdXBvblNlcnZpY2UsXG4gICkge31cblxuICBnZXRDaGVja291dFN1YnNjcmlwdGlvbihjaGVja291dERhdGE/OiBSZXF1aXJlZENoZWNrb3V0U3Vic2NyaXB0aW9uRGF0YSk6IE9ic2VydmFibGU8Q2hlY2tvdXRTdWJzY3JpcHRpb24+IHtcbiAgICByZXR1cm4gdGhpcy5kYXRhUGVyc2lzdGVuY2VcbiAgICAgIC5nZXQoJ2NoZWNrb3V0U3Vic2NyaXB0aW9uSWQnKVxuICAgICAgLnBpcGUoXG4gICAgICAgIGNvbmNhdE1hcCgoaWQpID0+XG4gICAgICAgICAgIWlzTmlsKGlkKSA/IHRoaXMuY2hlY2tvdXRTdWJzY3JpcHRpb25SZXBvc2l0b3J5LmdldCh7IGlkIH0pIDogdGhpcy5jcmVhdGVDaGVja291dFN1YnNjcmlwdGlvbihjaGVja291dERhdGEpLFxuICAgICAgICApLFxuICAgICAgKVxuICB9XG5cbiAgY2xlYXJDaGVja291dFN1YnNjcmlwdGlvbkZyb21TZXNzaW9uKCk6IE9ic2VydmFibGU8dm9pZD4ge1xuICAgIHJldHVybiB0aGlzLmRhdGFQZXJzaXN0ZW5jZS5yZW1vdmUoJ2NoZWNrb3V0U3Vic2NyaXB0aW9uSWQnKVxuICB9XG5cbiAgY2hlY2tDb3Vwb24obmlja25hbWU6IHN0cmluZywgdXNlckVtYWlsOiBzdHJpbmcpOiBPYnNlcnZhYmxlPENvdXBvbj4ge1xuICAgIHJldHVybiB0aGlzLmdldENoZWNrb3V0U3Vic2NyaXB0aW9uKCkucGlwZShcbiAgICAgIGNvbmNhdE1hcCgoY2hlY2tvdXQpID0+XG4gICAgICAgIHRoaXMuY291cG9uU2VydmljZVxuICAgICAgICAgIC5jaGVja0NvdXBvbihuaWNrbmFtZSwgQ2hlY2tvdXRUeXBlcy5TVUJTQ1JJUFRJT04sIGNoZWNrb3V0LCBjaGVja291dC5zdWJzY3JpcHRpb25QbGFuLm5hbWUpXG4gICAgICAgICAgLnBpcGUoKSxcbiAgICAgICksXG4gICAgKVxuICB9XG5cbiAgY2FsY0Rpc2NvdW50U3Vic2NyaXB0aW9uKGNvdXBvbjogQ291cG9uKSB7XG4gICAgcmV0dXJuIHRoaXMuZ2V0Q2hlY2tvdXRTdWJzY3JpcHRpb24oKS5waXBlKFxuICAgICAgY29uY2F0TWFwKChjaGVja291dCkgPT4gdGhpcy5jb3Vwb25TZXJ2aWNlLmNhbGNEaXNjb3VudFN1YnNjcmlwdGlvbihjb3Vwb24sIGNoZWNrb3V0KS5waXBlKCkpLFxuICAgIClcbiAgfVxuXG4gIHByaXZhdGUgYXN5bmMgY3JlYXRlQ2hlY2tvdXRTdWJzY3JpcHRpb24oXG4gICAgY2hlY2tvdXREYXRhPzogUmVxdWlyZWRDaGVja291dFN1YnNjcmlwdGlvbkRhdGEsXG4gICk6IFByb21pc2U8Q2hlY2tvdXRTdWJzY3JpcHRpb24+IHtcbiAgICBjb25zdCBjaGVja291dCA9IGF3YWl0IHRoaXMuY2hlY2tvdXRTdWJzY3JpcHRpb25SZXBvc2l0b3J5LmNyZWF0ZSh7XG4gICAgICBjcmVhdGVkQXQ6IG5ldyBEYXRlKCksXG4gICAgICAuLi5DaGVja291dFN1YnNjcmlwdGlvbi50b0luc3RhbmNlKHBpY2soY2hlY2tvdXREYXRhLCBbJ3VzZXInLCAnc2hvcCddKSkudG9QbGFpbigpLFxuICAgIH0pXG5cbiAgICBhd2FpdCB0aGlzLmRhdGFQZXJzaXN0ZW5jZS5zZXQoJ2NoZWNrb3V0U3Vic2NyaXB0aW9uSWQnLCBjaGVja291dC5pZCkudG9Qcm9taXNlKClcblxuICAgIHJldHVybiBjaGVja291dFxuICB9XG59XG4iXX0=
|
|
@@ -1,26 +1,24 @@
|
|
|
1
1
|
import { Inject, Injectable } from '@angular/core';
|
|
2
2
|
import { Checkout, CheckoutTypes, NotFoundError, Shops, isNil, pick, } from '@infrab4a/connect';
|
|
3
|
-
import cookie from 'js-cookie';
|
|
4
3
|
import { from, of, throwError } from 'rxjs';
|
|
5
4
|
import { concatMap } from 'rxjs/operators';
|
|
6
|
-
import { DEFAULT_SHOP } from '../consts';
|
|
5
|
+
import { DEFAULT_SHOP, PERSISTENCE_PROVIDER } from '../consts';
|
|
7
6
|
import { CouponService } from './coupon.service';
|
|
8
7
|
import * as i0 from "@angular/core";
|
|
9
8
|
import * as i1 from "./coupon.service";
|
|
10
9
|
import * as i2 from "@infrab4a/connect";
|
|
11
10
|
export class CheckoutService {
|
|
12
|
-
constructor(couponService, checkoutRepository,
|
|
11
|
+
constructor(couponService, checkoutRepository, userRepository, defaultShop, dataPersistence) {
|
|
13
12
|
this.couponService = couponService;
|
|
14
13
|
this.checkoutRepository = checkoutRepository;
|
|
15
|
-
this.orderRepository = orderRepository;
|
|
16
14
|
this.userRepository = userRepository;
|
|
17
15
|
this.defaultShop = defaultShop;
|
|
16
|
+
this.dataPersistence = dataPersistence;
|
|
18
17
|
}
|
|
19
18
|
getCheckout(checkoutData) {
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
return from(this.createCheckout(checkoutData));
|
|
19
|
+
return this.dataPersistence
|
|
20
|
+
.get('checkoutId')
|
|
21
|
+
.pipe(concatMap((id) => (!isNil(id) ? this.checkoutRepository.get({ id }) : this.createCheckout(checkoutData))));
|
|
24
22
|
}
|
|
25
23
|
getUserByCheckout(checkoutId) {
|
|
26
24
|
return from(this.checkoutRepository.get({ id: checkoutId })).pipe(concatMap((checkout) => checkout?.user?.id ? of(checkout.user) : from(this.userRepository.get({ id: checkout.user.id }))), concatMap((user) => of(user) || throwError(() => new NotFoundError('User is not found'))));
|
|
@@ -32,8 +30,7 @@ export class CheckoutService {
|
|
|
32
30
|
return from(this.checkoutRepository.update(Checkout.toInstance({ id: checkout.id, user: checkout.user })));
|
|
33
31
|
}
|
|
34
32
|
clearCheckoutFromSession() {
|
|
35
|
-
|
|
36
|
-
return of();
|
|
33
|
+
return this.dataPersistence.remove('checkoutId');
|
|
37
34
|
}
|
|
38
35
|
calcDiscount(coupon) {
|
|
39
36
|
return this.getCheckout().pipe(concatMap(async (checkout) => await this.couponService.calcDiscountShopping(coupon, checkout)));
|
|
@@ -47,25 +44,25 @@ export class CheckoutService {
|
|
|
47
44
|
...Checkout.toInstance(pick(checkoutData, ['user', 'shop'])).toPlain(),
|
|
48
45
|
shop: checkoutData?.shop || this.defaultShop,
|
|
49
46
|
});
|
|
50
|
-
|
|
47
|
+
await this.dataPersistence.set('checkoutId', checkout.id).toPromise();
|
|
51
48
|
return checkout;
|
|
52
49
|
}
|
|
53
50
|
}
|
|
54
|
-
CheckoutService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CheckoutService, deps: [{ token: i1.CouponService }, { token: 'CheckoutRepository' }, { token: '
|
|
51
|
+
CheckoutService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CheckoutService, deps: [{ token: i1.CouponService }, { token: 'CheckoutRepository' }, { token: 'UserRepository' }, { token: DEFAULT_SHOP }, { token: PERSISTENCE_PROVIDER }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
55
52
|
CheckoutService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CheckoutService });
|
|
56
53
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CheckoutService, decorators: [{
|
|
57
54
|
type: Injectable
|
|
58
55
|
}], ctorParameters: function () { return [{ type: i1.CouponService }, { type: undefined, decorators: [{
|
|
59
56
|
type: Inject,
|
|
60
57
|
args: ['CheckoutRepository']
|
|
61
|
-
}] }, { type: undefined, decorators: [{
|
|
62
|
-
type: Inject,
|
|
63
|
-
args: ['OrderRepository']
|
|
64
58
|
}] }, { type: undefined, decorators: [{
|
|
65
59
|
type: Inject,
|
|
66
60
|
args: ['UserRepository']
|
|
67
61
|
}] }, { type: i2.Shops, decorators: [{
|
|
68
62
|
type: Inject,
|
|
69
63
|
args: [DEFAULT_SHOP]
|
|
64
|
+
}] }, { type: undefined, decorators: [{
|
|
65
|
+
type: Inject,
|
|
66
|
+
args: [PERSISTENCE_PROVIDER]
|
|
70
67
|
}] }]; } });
|
|
71
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
68
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"checkout.service.js","sourceRoot":"","sources":["../../../../projects/connect-angular/src/services/checkout.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Inject, Injectable } from '@angular/core'\nimport {\n  Checkout,\n  CheckoutRepository,\n  CheckoutTypes,\n  Coupon,\n  NotFoundError,\n  Shops,\n  User,\n  UserRepository,\n  isNil,\n  pick,\n} from '@infrab4a/connect'\nimport { Observable, from, of, throwError } from 'rxjs'\nimport { concatMap } from 'rxjs/operators'\n\nimport { DEFAULT_SHOP, PERSISTENCE_PROVIDER } from '../consts'\n\nimport { DataPersistence } from '../persistence'\nimport { CouponService } from './coupon.service'\nimport { RequiredCheckoutData } from './types'\n\n@Injectable()\nexport class CheckoutService {\n  constructor(\n    private readonly couponService: CouponService,\n    @Inject('CheckoutRepository') private readonly checkoutRepository: CheckoutRepository,\n    @Inject('UserRepository') private readonly userRepository: UserRepository,\n    @Inject(DEFAULT_SHOP) private readonly defaultShop: Shops,\n    @Inject(PERSISTENCE_PROVIDER) private readonly dataPersistence: DataPersistence,\n  ) {}\n\n  getCheckout(checkoutData?: RequiredCheckoutData): Observable<Checkout> {\n    return this.dataPersistence\n      .get('checkoutId')\n      .pipe(concatMap((id) => (!isNil(id) ? this.checkoutRepository.get({ id }) : this.createCheckout(checkoutData))))\n  }\n\n  getUserByCheckout(checkoutId: string): Observable<User> {\n    return from(this.checkoutRepository.get({ id: checkoutId })).pipe(\n      concatMap((checkout) =>\n        checkout?.user?.id ? of(checkout.user) : from(this.userRepository.get({ id: checkout.user.id })),\n      ),\n      concatMap((user) => of(user) || throwError(() => new NotFoundError('User is not found'))),\n    )\n  }\n\n  updateCheckoutLineItems(checkout: Partial<Checkout>): Observable<Checkout> {\n    return from(this.checkoutRepository.update(Checkout.toInstance({ id: checkout.id, lineItems: checkout.lineItems })))\n  }\n\n  updateCheckoutUser(checkout: Partial<Checkout>): Observable<Checkout> {\n    return from(this.checkoutRepository.update(Checkout.toInstance({ id: checkout.id, user: checkout.user })))\n  }\n\n  clearCheckoutFromSession(): Observable<void> {\n    return this.dataPersistence.remove('checkoutId')\n  }\n\n  calcDiscount(coupon: Coupon) {\n    return this.getCheckout().pipe(\n      concatMap(async (checkout) => await this.couponService.calcDiscountShopping(coupon, checkout)),\n    )\n  }\n\n  checkCoupon(nickname: string, checkoutType: CheckoutTypes): Observable<Coupon> {\n    return this.getCheckout().pipe(\n      concatMap((checkout) => this.couponService.checkCoupon(nickname, CheckoutTypes.ECOMMERCE, checkout, null).pipe()),\n    )\n  }\n\n  private async createCheckout(checkoutData?: RequiredCheckoutData): Promise<Checkout> {\n    const checkout = await this.checkoutRepository.create({\n      createdAt: new Date(),\n      ...Checkout.toInstance(pick(checkoutData, ['user', 'shop'])).toPlain(),\n      shop: checkoutData?.shop || this.defaultShop,\n    })\n\n    await this.dataPersistence.set('checkoutId', checkout.id).toPromise()\n\n    return checkout\n  }\n}\n"]}
|
|
@@ -11,10 +11,10 @@ import * as i1$1 from '@angular/fire/firestore';
|
|
|
11
11
|
import { Firestore, provideFirestore, getFirestore, initializeFirestore, memoryLocalCache, docSnapshots, doc } from '@angular/fire/firestore';
|
|
12
12
|
import * as i2 from '@angular/fire/storage';
|
|
13
13
|
import { Storage, provideStorage, getStorage } from '@angular/fire/storage';
|
|
14
|
-
import { __awaiter, __decorate, __metadata } from 'tslib';
|
|
15
14
|
import cookie from 'js-cookie';
|
|
16
|
-
import {
|
|
15
|
+
import { from, combineLatest, of, throwError, Subject, iif, forkJoin } from 'rxjs';
|
|
17
16
|
import { map, mergeMap, catchError, concatMap, tap } from 'rxjs/operators';
|
|
17
|
+
import { __awaiter, __decorate, __metadata } from 'tslib';
|
|
18
18
|
import { Type } from 'class-transformer';
|
|
19
19
|
import * as i1$3 from '@angular/common/http';
|
|
20
20
|
|
|
@@ -932,19 +932,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImpor
|
|
|
932
932
|
|
|
933
933
|
class CookieDataPersistence {
|
|
934
934
|
get(key) {
|
|
935
|
-
return
|
|
936
|
-
return cookie.get(key);
|
|
937
|
-
});
|
|
935
|
+
return from(cookie.get(key));
|
|
938
936
|
}
|
|
939
937
|
remove(key) {
|
|
940
|
-
|
|
941
|
-
|
|
942
|
-
});
|
|
938
|
+
cookie.remove(key);
|
|
939
|
+
return;
|
|
943
940
|
}
|
|
944
941
|
set(key, value) {
|
|
945
|
-
return
|
|
946
|
-
yield cookie.set(key, value);
|
|
947
|
-
});
|
|
942
|
+
return from(cookie.set(key, value)).pipe(map(() => { }));
|
|
948
943
|
}
|
|
949
944
|
}
|
|
950
945
|
CookieDataPersistence.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CookieDataPersistence, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
|
|
@@ -1244,18 +1239,17 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImpor
|
|
|
1244
1239
|
} });
|
|
1245
1240
|
|
|
1246
1241
|
class CheckoutService {
|
|
1247
|
-
constructor(couponService, checkoutRepository,
|
|
1242
|
+
constructor(couponService, checkoutRepository, userRepository, defaultShop, dataPersistence) {
|
|
1248
1243
|
this.couponService = couponService;
|
|
1249
1244
|
this.checkoutRepository = checkoutRepository;
|
|
1250
|
-
this.orderRepository = orderRepository;
|
|
1251
1245
|
this.userRepository = userRepository;
|
|
1252
1246
|
this.defaultShop = defaultShop;
|
|
1247
|
+
this.dataPersistence = dataPersistence;
|
|
1253
1248
|
}
|
|
1254
1249
|
getCheckout(checkoutData) {
|
|
1255
|
-
|
|
1256
|
-
|
|
1257
|
-
|
|
1258
|
-
return from(this.createCheckout(checkoutData));
|
|
1250
|
+
return this.dataPersistence
|
|
1251
|
+
.get('checkoutId')
|
|
1252
|
+
.pipe(concatMap((id) => (!isNil(id) ? this.checkoutRepository.get({ id }) : this.createCheckout(checkoutData))));
|
|
1259
1253
|
}
|
|
1260
1254
|
getUserByCheckout(checkoutId) {
|
|
1261
1255
|
return from(this.checkoutRepository.get({ id: checkoutId })).pipe(concatMap((checkout) => { var _a; return ((_a = checkout === null || checkout === void 0 ? void 0 : checkout.user) === null || _a === void 0 ? void 0 : _a.id) ? of(checkout.user) : from(this.userRepository.get({ id: checkout.user.id })); }), concatMap((user) => of(user) || throwError(() => new NotFoundError('User is not found'))));
|
|
@@ -1267,8 +1261,7 @@ class CheckoutService {
|
|
|
1267
1261
|
return from(this.checkoutRepository.update(Checkout.toInstance({ id: checkout.id, user: checkout.user })));
|
|
1268
1262
|
}
|
|
1269
1263
|
clearCheckoutFromSession() {
|
|
1270
|
-
|
|
1271
|
-
return of();
|
|
1264
|
+
return this.dataPersistence.remove('checkoutId');
|
|
1272
1265
|
}
|
|
1273
1266
|
calcDiscount(coupon) {
|
|
1274
1267
|
return this.getCheckout().pipe(concatMap((checkout) => __awaiter(this, void 0, void 0, function* () { return yield this.couponService.calcDiscountShopping(coupon, checkout); })));
|
|
@@ -1279,12 +1272,12 @@ class CheckoutService {
|
|
|
1279
1272
|
createCheckout(checkoutData) {
|
|
1280
1273
|
return __awaiter(this, void 0, void 0, function* () {
|
|
1281
1274
|
const checkout = yield this.checkoutRepository.create(Object.assign(Object.assign({ createdAt: new Date() }, Checkout.toInstance(pick(checkoutData, ['user', 'shop'])).toPlain()), { shop: (checkoutData === null || checkoutData === void 0 ? void 0 : checkoutData.shop) || this.defaultShop }));
|
|
1282
|
-
|
|
1275
|
+
yield this.dataPersistence.set('checkoutId', checkout.id).toPromise();
|
|
1283
1276
|
return checkout;
|
|
1284
1277
|
});
|
|
1285
1278
|
}
|
|
1286
1279
|
}
|
|
1287
|
-
CheckoutService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CheckoutService, deps: [{ token: CouponService }, { token: 'CheckoutRepository' }, { token: '
|
|
1280
|
+
CheckoutService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CheckoutService, deps: [{ token: CouponService }, { token: 'CheckoutRepository' }, { token: 'UserRepository' }, { token: DEFAULT_SHOP }, { token: PERSISTENCE_PROVIDER }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
1288
1281
|
CheckoutService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CheckoutService });
|
|
1289
1282
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CheckoutService, decorators: [{
|
|
1290
1283
|
type: Injectable
|
|
@@ -1292,15 +1285,15 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImpor
|
|
|
1292
1285
|
return [{ type: CouponService }, { type: undefined, decorators: [{
|
|
1293
1286
|
type: Inject,
|
|
1294
1287
|
args: ['CheckoutRepository']
|
|
1295
|
-
}] }, { type: undefined, decorators: [{
|
|
1296
|
-
type: Inject,
|
|
1297
|
-
args: ['OrderRepository']
|
|
1298
1288
|
}] }, { type: undefined, decorators: [{
|
|
1299
1289
|
type: Inject,
|
|
1300
1290
|
args: ['UserRepository']
|
|
1301
1291
|
}] }, { type: i1$2.Shops, decorators: [{
|
|
1302
1292
|
type: Inject,
|
|
1303
1293
|
args: [DEFAULT_SHOP]
|
|
1294
|
+
}] }, { type: undefined, decorators: [{
|
|
1295
|
+
type: Inject,
|
|
1296
|
+
args: [PERSISTENCE_PROVIDER]
|
|
1304
1297
|
}] }];
|
|
1305
1298
|
} });
|
|
1306
1299
|
|
|
@@ -2013,27 +2006,18 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImpor
|
|
|
2013
2006
|
} });
|
|
2014
2007
|
|
|
2015
2008
|
class CheckoutSubscriptionService {
|
|
2016
|
-
constructor(checkoutSubscriptionRepository,
|
|
2009
|
+
constructor(checkoutSubscriptionRepository, dataPersistence, couponService) {
|
|
2017
2010
|
this.checkoutSubscriptionRepository = checkoutSubscriptionRepository;
|
|
2018
|
-
this.
|
|
2011
|
+
this.dataPersistence = dataPersistence;
|
|
2019
2012
|
this.couponService = couponService;
|
|
2020
2013
|
}
|
|
2021
2014
|
getCheckoutSubscription(checkoutData) {
|
|
2022
|
-
|
|
2023
|
-
|
|
2024
|
-
|
|
2025
|
-
return from(this.createCheckoutSubscription(checkoutData));
|
|
2026
|
-
}
|
|
2027
|
-
createCheckoutSubscription(checkoutData) {
|
|
2028
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
2029
|
-
const checkout = yield this.checkoutSubscriptionRepository.create(Object.assign({ createdAt: new Date() }, CheckoutSubscription.toInstance(pick(checkoutData, ['user', 'shop'])).toPlain()));
|
|
2030
|
-
cookie.set('checkoutSubscriptionId', checkout.id);
|
|
2031
|
-
return checkout;
|
|
2032
|
-
});
|
|
2015
|
+
return this.dataPersistence
|
|
2016
|
+
.get('checkoutSubscriptionId')
|
|
2017
|
+
.pipe(concatMap((id) => !isNil(id) ? this.checkoutSubscriptionRepository.get({ id }) : this.createCheckoutSubscription(checkoutData)));
|
|
2033
2018
|
}
|
|
2034
2019
|
clearCheckoutSubscriptionFromSession() {
|
|
2035
|
-
|
|
2036
|
-
return of();
|
|
2020
|
+
return this.dataPersistence.remove('checkoutSubscriptionId');
|
|
2037
2021
|
}
|
|
2038
2022
|
checkCoupon(nickname, userEmail) {
|
|
2039
2023
|
return this.getCheckoutSubscription().pipe(concatMap((checkout) => this.couponService
|
|
@@ -2043,8 +2027,15 @@ class CheckoutSubscriptionService {
|
|
|
2043
2027
|
calcDiscountSubscription(coupon) {
|
|
2044
2028
|
return this.getCheckoutSubscription().pipe(concatMap((checkout) => this.couponService.calcDiscountSubscription(coupon, checkout).pipe()));
|
|
2045
2029
|
}
|
|
2030
|
+
createCheckoutSubscription(checkoutData) {
|
|
2031
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
2032
|
+
const checkout = yield this.checkoutSubscriptionRepository.create(Object.assign({ createdAt: new Date() }, CheckoutSubscription.toInstance(pick(checkoutData, ['user', 'shop'])).toPlain()));
|
|
2033
|
+
yield this.dataPersistence.set('checkoutSubscriptionId', checkout.id).toPromise();
|
|
2034
|
+
return checkout;
|
|
2035
|
+
});
|
|
2036
|
+
}
|
|
2046
2037
|
}
|
|
2047
|
-
CheckoutSubscriptionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CheckoutSubscriptionService, deps: [{ token: 'CheckoutSubscriptionRepository' }, { token:
|
|
2038
|
+
CheckoutSubscriptionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CheckoutSubscriptionService, deps: [{ token: 'CheckoutSubscriptionRepository' }, { token: PERSISTENCE_PROVIDER }, { token: CouponService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
2048
2039
|
CheckoutSubscriptionService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CheckoutSubscriptionService });
|
|
2049
2040
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: CheckoutSubscriptionService, decorators: [{
|
|
2050
2041
|
type: Injectable
|
|
@@ -2054,7 +2045,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImpor
|
|
|
2054
2045
|
args: ['CheckoutSubscriptionRepository']
|
|
2055
2046
|
}] }, { type: undefined, decorators: [{
|
|
2056
2047
|
type: Inject,
|
|
2057
|
-
args: [
|
|
2048
|
+
args: [PERSISTENCE_PROVIDER]
|
|
2058
2049
|
}] }, { type: CouponService }];
|
|
2059
2050
|
} });
|
|
2060
2051
|
|