simpo-component-library 1.9.1 → 1.9.3

package/fesm2022/simpo-component-library.mjs

@@ -4586,22 +4586,24 @@ class CartComponent extends BaseSection {
         this.couponDialogRef = null;
     }
     ngOnInit() {
-        this._eventService.showLoadingScreen.subscribe((response) => {
+        this.loadingSubscription = this._eventService.showLoadingScreen.subscribe((response) => {
             this.isLoading = response;
             if (!this.isLoading) {
                 this.getIndexDBData();
             }
         });
-        if (this.storageService.getUser()) {
-            this.updateUserCart();
-        }
-        else {
-            this.getIndexDBData();
-            console.log(this.responseData);
-        }
+        // if (this.storageService.getUser()) {
+        //   this.updateUserCart();
+        // } else {
+        //   this.getIndexDBData();
+        //   console.log(this.responseData);
+        // }
         console.log(this.responseData);
         this.styles = this.data?.styles;
     }
+    ngOnDestroy() {
+        this.loadingSubscription?.unsubscribe();
+    }
     updateUserCart() {
         const deliveryOption = JSON.parse(localStorage.getItem("deliveryOptions") ?? "{}");
         this.userDetails = this.storageService.getUser();
@@ -4617,7 +4619,8 @@ class CartComponent extends BaseSection {
             this.cartInfo["cartId"] = response.data?.[0]?.cartId;
             this.getCouponList();
             if (response.data?.[0]?.orderedItems?.length > 0) {
-                this.storageService.addAllProductsToCart(tempUserCart).oncomplete = () => {
+                this.mergeOrderItems(tempUserCart);
+                this.storageService.addAllProductsToCart(this.cartInfo.orderedItems).oncomplete = () => {
                     this.storageService.getUserCart().then((cartResponse) => {
                         cartResponse.onsuccess = (cartData) => {
                             if (!(localStorage.getItem("couponId") == "undefined" || localStorage.getItem("couponId") == "null"))
@@ -4683,6 +4686,34 @@ class CartComponent extends BaseSection {
             }
         });
     }
+    // updateUserCart2() {
+    //   const deliveryOption = JSON.parse(localStorage.getItem("deliveryOptions") ?? "{}");
+    //   this.userDetails = this.storageService.getUser() as User;
+    //   this.cartInfo.userDetails = {
+    //     "userId": this.userDetails?.userId,
+    //     "userName": this.userDetails?.contact.name,
+    //     "mobile": this.userDetails?.contact.mobile,
+    //     "email": this.userDetails?.contact.email,
+    //   }
+    //   this.restService.getUserItems(this.userDetails.userId, "CART").subscribe((response: any) => {
+    //     const tempUserCart = response?.data?.[0]?.orderedItems ?? [];
+    //     this.mergeOrderItems(tempUserCart);
+    //   })
+    // }
+    mergeOrderItems(syncedItems) {
+        for (let product of syncedItems) {
+            let itemFound = false;
+            for (let cartItem of this.cartInfo.orderedItems) {
+                if (cartItem.varientId === product.varientId) {
+                    itemFound = true;
+                    cartItem.quantity += product.quantity;
+                }
+            }
+            if (!itemFound) {
+                this.cartInfo.orderedItems.push(product);
+            }
+        }
+    }
     getCouponList() {
         if (!this.cartInfo.cartId && !(localStorage.getItem("cartId") == "undefined" || localStorage.getItem("cartId") == "null"))
             this.cartInfo.cartId = localStorage.getItem("cartId");
@@ -4737,6 +4768,8 @@ class CartComponent extends BaseSection {
                 console.log(this.cartInfo.billdetails.totalNetValue, this.cartInfo.billdetails.totalTax, this.cartInfo.billdetails.deliveryCharges);
                 this.cartInfo.totalAmount = this.cartInfo.billdetails.totalNetValue + this.getTaxAmount() + this.cartInfo.billdetails.deliveryCharges;
                 this.cartInfo.orderedItems = this.USER_CART_ITEMS;
+                if (this.storageService.getUser())
+                    this.updateUserCart();
                 this.responseData = this.cartInfo;
             };
         });