@infrab4a/connect-angular 4.4.0-beta.7 → 4.4.0-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.
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Inject, Injectable } from '@angular/core';
|
|
2
|
-
import { Checkout, CheckoutTypes,
|
|
2
|
+
import { Checkout, CheckoutTypes, NotFoundError, Shops, isNil, pick, } from '@infrab4a/connect';
|
|
3
3
|
import cookie from 'js-cookie';
|
|
4
4
|
import { from, of, throwError } from 'rxjs';
|
|
5
5
|
import { concatMap } from 'rxjs/operators';
|
|
@@ -42,24 +42,11 @@ export class CheckoutService {
|
|
|
42
42
|
return this.getCheckout().pipe(concatMap((checkout) => this.couponService.checkCoupon(nickname, CheckoutTypes.ECOMMERCE, checkout, null).pipe()));
|
|
43
43
|
}
|
|
44
44
|
async createCheckout(checkoutData) {
|
|
45
|
-
const
|
|
45
|
+
const checkout = await this.checkoutRepository.create({
|
|
46
46
|
createdAt: new Date(),
|
|
47
47
|
...Checkout.toInstance(pick(checkoutData, ['user', 'shop'])).toPlain(),
|
|
48
48
|
shop: checkoutData?.shop || this.defaultShop,
|
|
49
|
-
};
|
|
50
|
-
const checkout2 = Checkout.toInstance({
|
|
51
|
-
createdAt: new Date(),
|
|
52
|
-
...pick(checkoutData, ['user', 'shop']),
|
|
53
|
-
shop: checkoutData?.shop || this.defaultShop,
|
|
54
49
|
});
|
|
55
|
-
console.log('createCheckout');
|
|
56
|
-
const checkout = await this.checkoutRepository.create(checkout2);
|
|
57
|
-
console.log('checkout', checkout);
|
|
58
|
-
// const checkout = await this.checkoutRepository.create({
|
|
59
|
-
// createdAt: new Date(),
|
|
60
|
-
// ...Checkout.toInstance(pick(checkoutData, ['user', 'shop'])).toPlain(),
|
|
61
|
-
// shop: checkoutData?.shop || this.defaultShop,
|
|
62
|
-
// })
|
|
63
50
|
cookie.set('checkoutId', checkout.id);
|
|
64
51
|
return checkout;
|
|
65
52
|
}
|
|
@@ -81,4 +68,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImpor
|
|
|
81
68
|
type: Inject,
|
|
82
69
|
args: [DEFAULT_SHOP]
|
|
83
70
|
}] }]; } });
|
|
84
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
71
|
+
//# 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'\r\nimport {\r\n  Checkout,\r\n  CheckoutRepository,\r\n  CheckoutTypes,\r\n  Coupon,\r\n  NotFoundError,\r\n  OrderRepository,\r\n  Shops,\r\n  User,\r\n  UserRepository,\r\n  isNil,\r\n  pick,\r\n} from '@infrab4a/connect'\r\nimport cookie from 'js-cookie'\r\nimport { Observable, from, of, throwError } from 'rxjs'\r\nimport { concatMap } from 'rxjs/operators'\r\n\r\nimport { DEFAULT_SHOP } from '../consts'\r\n\r\nimport { CouponService } from './coupon.service'\r\nimport { RequiredCheckoutData } from './types'\r\n\r\n@Injectable()\r\nexport class CheckoutService {\r\n  constructor(\r\n    private readonly couponService: CouponService,\r\n    @Inject('CheckoutRepository') private readonly checkoutRepository: CheckoutRepository,\r\n    @Inject('OrderRepository') private readonly orderRepository: OrderRepository,\r\n    @Inject('UserRepository') private readonly userRepository: UserRepository,\r\n    @Inject(DEFAULT_SHOP) private readonly defaultShop: Shops,\r\n  ) {}\r\n\r\n  getCheckout(checkoutData?: RequiredCheckoutData): Observable<Checkout> {\r\n    const checkoutId = cookie.get('checkoutId')\r\n\r\n    if (!isNil(checkoutId)) return from(this.checkoutRepository.get({ id: checkoutId }))\r\n\r\n    return from(this.createCheckout(checkoutData))\r\n  }\r\n\r\n  getUserByCheckout(checkoutId: string): Observable<User> {\r\n    return from(this.checkoutRepository.get({ id: checkoutId })).pipe(\r\n      concatMap((checkout) =>\r\n        checkout?.user?.id ? of(checkout.user) : from(this.userRepository.get({ id: checkout.user.id })),\r\n      ),\r\n      concatMap((user) => of(user) || throwError(() => new NotFoundError('User is not found'))),\r\n    )\r\n  }\r\n\r\n  updateCheckoutLineItems(checkout: Partial<Checkout>): Observable<Checkout> {\r\n    return from(this.checkoutRepository.update(Checkout.toInstance({ id: checkout.id, lineItems: checkout.lineItems })))\r\n  }\r\n\r\n  updateCheckoutUser(checkout: Partial<Checkout>): Observable<Checkout> {\r\n    return from(this.checkoutRepository.update(Checkout.toInstance({ id: checkout.id, user: checkout.user })))\r\n  }\r\n\r\n  clearCheckoutFromSession(): Observable<void> {\r\n    cookie.remove('checkoutId')\r\n\r\n    return of()\r\n  }\r\n\r\n  calcDiscount(coupon: Coupon) {\r\n    return this.getCheckout().pipe(\r\n      concatMap(async (checkout) => await this.couponService.calcDiscountShopping(coupon, checkout)),\r\n    )\r\n  }\r\n\r\n  checkCoupon(nickname: string, checkoutType: CheckoutTypes): Observable<Coupon> {\r\n    return this.getCheckout().pipe(\r\n      concatMap((checkout) => this.couponService.checkCoupon(nickname, CheckoutTypes.ECOMMERCE, checkout, null).pipe()),\r\n    )\r\n  }\r\n\r\n  private async createCheckout(checkoutData?: RequiredCheckoutData): Promise<Checkout> {\r\n    const checkout = await this.checkoutRepository.create({\r\n      createdAt: new Date(),\r\n      ...Checkout.toInstance(pick(checkoutData, ['user', 'shop'])).toPlain(),\r\n      shop: checkoutData?.shop || this.defaultShop,\r\n    })\r\n\r\n    cookie.set('checkoutId', checkout.id)\r\n\r\n    return checkout\r\n  }\r\n}\r\n"]}
|
|
@@ -1253,16 +1253,7 @@ class CheckoutService {
|
|
|
1253
1253
|
}
|
|
1254
1254
|
createCheckout(checkoutData) {
|
|
1255
1255
|
return __awaiter(this, void 0, void 0, function* () {
|
|
1256
|
-
const
|
|
1257
|
-
const checkout2 = Checkout.toInstance(Object.assign(Object.assign({ createdAt: new Date() }, pick(checkoutData, ['user', 'shop'])), { shop: (checkoutData === null || checkoutData === void 0 ? void 0 : checkoutData.shop) || this.defaultShop }));
|
|
1258
|
-
console.log('createCheckout');
|
|
1259
|
-
const checkout = yield this.checkoutRepository.create(checkout2);
|
|
1260
|
-
console.log('checkout', checkout);
|
|
1261
|
-
// const checkout = await this.checkoutRepository.create({
|
|
1262
|
-
// createdAt: new Date(),
|
|
1263
|
-
// ...Checkout.toInstance(pick(checkoutData, ['user', 'shop'])).toPlain(),
|
|
1264
|
-
// shop: checkoutData?.shop || this.defaultShop,
|
|
1265
|
-
// })
|
|
1256
|
+
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 }));
|
|
1266
1257
|
cookie.set('checkoutId', checkout.id);
|
|
1267
1258
|
return checkout;
|
|
1268
1259
|
});
|