@infrab4a/connect-angular 4.13.4-beta.1 → 4.13.4

package/fesm2020/infrab4a-connect-angular.mjs

@@ -1380,7 +1380,6 @@ class CartService {
         this.categoryRepository = categoryRepository;
         this.variantRepository = variantRepository;
         this.buy2WinRepository = buy2WinRepository;
-        this.cart = {};
         this.cartSubject = new Subject();
         this.updateLineItemInCart = (lineItem, quantity, checkout) => (isNil(checkout) ? this.checkoutService.getCheckout() : of(checkout)).pipe(concatMap((checkoutLoaded) => {
             const items = [];
@@ -1397,6 +1396,13 @@ class CartService {
                 .updateCheckoutLineItems(checkoutLoaded)
                 .pipe(map((updatedCheckout) => this.generateCartObject(updatedCheckout.lineItems)));
         }));
+        this.generateCartObject = (items) => items?.reduce((cart, item) => ({
+            ...cart,
+            [item.id]: LineItem.toInstance({
+                ...(cart[item.id] || item),
+                quantity: (cart[item.id]?.quantity || 0) + (item.quantity ? item.quantity : 1),
+            }),
+        }), {}) || {};
         this.buildLineItem = async ({ checkout, item, quantity, }) => {
             const product = await this.getProductData(item.id);
             item.quantity = item?.quantity || checkout?.lineItems?.find((lineItem) => lineItem.id === item.id)?.quantity || 0;
@@ -1481,8 +1487,10 @@ class CartService {
         }), concatMap((checkout) => this.checkoutService.updateCheckoutLineItems(checkout)), map((checkout) => this.generateCartObject(checkout.lineItems)), tap((cart) => this.cartSubject.next(cart)));
     }
     updateUserCart(user) {
-        if (this.user?.id === user?.id && this.user?.isSubscriber === user?.isSubscriber)
-            return this.cartSubject.asObservable();
+        const isSameUserId = !user?.id || this.user?.id === user?.id;
+        const isSameUser = isSameUserId && !!this.user?.isSubscriber === !!user?.isSubscriber;
+        if (isSameUser)
+            return this.getCart();
         return this.checkoutService.getCheckout().pipe(concatMap((checkout) => this.checkoutService.updateCheckoutUser(Checkout.toInstance({ ...checkout.toPlain(), user }))), concatMap(async (checkout) => await this.checkoutService
             .updateCheckoutLineItems(Checkout.toInstance({
             ...checkout.toPlain(),
@@ -1490,7 +1498,7 @@ class CartService {
                 ? await Promise.all(checkout.lineItems?.map(async (item) => (await this.buildLineItem({ checkout, item })).lineItem))
                 : [],
         }))
-            .toPromise()), map((checkout) => this.generateCartObject(checkout.lineItems)), tap((cart) => this.cartSubject.next(cart)));
+            .toPromise()), map((checkout) => this.generateCartObject(checkout.lineItems)), tap((cart) => (this.user = user)), tap((cart) => this.cartSubject.next(cart)));
     }
     clearCart() {
         return this.checkoutService.getCheckout().pipe(map((checkout) => {
@@ -1501,16 +1509,6 @@ class CartService {
     buildCartFromCheckout(checkoutData) {
         return this.checkoutService.getCheckout(checkoutData).pipe(map((checkout) => checkout.lineItems), concatMap((lineItems) => of(this.generateCartObject(lineItems))));
     }
-    generateCartObject(items) {
-        return (this.cart =
-            items?.reduce((cart, item) => ({
-                ...cart,
-                [item.id]: LineItem.toInstance({
-                    ...(cart[item.id] || item),
-                    quantity: (cart[item.id]?.quantity || 0) + (item.quantity ? item.quantity : 1),
-                }),
-            }), {}) || {});
-    }
     roundPrice(productPrice) {
         const { price, fullPrice, subscriberPrice } = productPrice;
         return {