simpo-component-library 1.4.15 → 1.4.16

package/fesm2022/simpo-component-library.mjs

@@ -14,10 +14,12 @@ import * as i1 from '@angular/platform-browser';
 import { map } from 'rxjs';
 import * as i1$1 from '@angular/common/http';
 import * as i2$2 from '@angular/router';
+import * as i4 from '@simpo-ui/services/storage.service';
 import * as i2$3 from '@angular/material/snack-bar';
 import * as i2$4 from 'ngx-skeleton-loader';
 import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
 import * as mapboxgl from 'mapbox-gl';
+import { v1 } from 'uuid';
 import * as i8 from 'ngx-image-zoom';
 import { NgxImageZoomModule } from 'ngx-image-zoom';
 import * as i8$1 from '@angular/material/slider';
@@ -2985,18 +2987,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.4", ngImpor
             }] } });
 
 var orderedItems$1 = [
-	{
-		itemId: "1ef50089-2cf0-6bdf-8ea9-b51e0a912f33",
-		businessId: "21",
-		itemName: "Anime T-Shirt",
-		brandName: "Excee",
-		imgUrl: "https://dev-beeos.s3.amazonaws.com/library-media/291611c1707983189501product-details-2.jpg.jpg",
-		price: 120,
-		itemTax: 10,
-		quantity: 2,
-		discountedPrice: 20,
-		taxAfterDiscount: 10
-	}
 ];
 var cartType$1 = "CART";
 var billdetails$1 = {
@@ -3234,11 +3224,12 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.4", ngImpor
         }], ctorParameters: () => [{ type: RestService }, { type: i2$2.Router }, { type: i3.MatDialogRef }] });
 
 class AuthenticateUserComponent {
-    constructor(matData, restService, router, matDialog, dialogRef) {
+    constructor(matData, restService, router, matDialog, storageService, dialogRef) {
         this.matData = matData;
         this.restService = restService;
         this.router = router;
         this.matDialog = matDialog;
+        this.storageService = storageService;
         this.dialogRef = dialogRef;
         // @Input() index? : number;
         // @Input() edit? : boolean;
@@ -3274,14 +3265,16 @@ class AuthenticateUserComponent {
     verifyOTP() {
         this.restService.verifyOTP(this.mobile ?? "", this.otpString).subscribe((response) => {
             // localStorage.setItem("userId", response.userId);
-            UserInfo.user = response.data;
-            if (UserInfo.user?.contact?.name?.length > 0) {
+            const userDetails = this.storageService.addUser(response.data);
+            if (userDetails.contact?.name?.length > 0) {
                 if (this.dialogRef)
                     this.dialogRef.close();
                 else
                     this.router.navigate(['/']);
             }
             else {
+                if (this.dialogRef)
+                    this.dialogRef.close();
                 this.matDialog.open(UserBasicInfoComponent, {
                     height: '50vh',
                     width: '40vw',
@@ -3298,7 +3291,7 @@ class AuthenticateUserComponent {
     get isMobile() {
         return window.innerWidth <= 475;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.4", ngImport: i0, type: AuthenticateUserComponent, deps: [{ token: MAT_DIALOG_DATA, optional: true }, { token: RestService }, { token: i2$2.Router }, { token: i3.MatDialog }, { token: i3.MatDialogRef, optional: true }], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.4", ngImport: i0, type: AuthenticateUserComponent, deps: [{ token: MAT_DIALOG_DATA, optional: true }, { token: RestService }, { token: i2$2.Router }, { token: i3.MatDialog }, { token: i4.StorageServiceService }, { token: i3.MatDialogRef, optional: true }], target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.1.4", type: AuthenticateUserComponent, isStandalone: true, selector: "simpo-authenticate-user", inputs: { data: "data", responseData: "responseData" }, ngImport: i0, template: "<div [style.height.vh]=\"isMobile ? '90' : ''\">\r\n    <ng-container [ngSwitch]=\"screen\">\r\n        <section style=\"padding: 15px;\"\r\n            class=\"d-flex flex-column align-item-center justify-content-center position-relative h-100\"\r\n            *ngSwitchCase=\"'LOGIN'\"[ngClass]=\"{'fullSection': isMobile}\">\r\n            <h5 class=\"text-center onlyDesktop\">Excee Fashion</h5>\r\n            <h2 class=\"text-center\">Welcome</h2>\r\n            <p class=\"text-center\">Log or Signup in to your account</p>\r\n            <input type=\"number\" placeholder=\"Mobile Number\" [(ngModel)]=\"mobile\">\r\n            <p class=\"text-center\">You will receive an SMS verification</p>\r\n\r\n            <div class=\"action-btn d-flex flex-column align-item-center justify-content-center\">\r\n                <button class=\"btn\" simpoButtonDirective [buttonStyle]=\"data?.action?.buttons[0]?.styles\"\r\n                    [color]=\"styles?.background?.accentColor\" (click)=\"generateOTP()\">Continue</button>\r\n                <div class=\"alternate-opt text-center\" [style.color]=\"data?.styles.background?.accentColor\">Use email\r\n                    instead</div>\r\n            </div>\r\n            <div class=\"close-btn onlyDesktop\" (click)=\"close()\">\r\n                <mat-icon>close</mat-icon>\r\n            </div>\r\n        </section>\r\n        <section *ngSwitchCase=\"'OTP'\" style=\"padding: 15px;\"\r\n            class=\"d-flex flex-column align-item-center justify-content-center position-relative h-100\" [ngClass]=\"{'fullSection': isMobile}\">\r\n            <h5 class=\"text-center onlyDesktop\">Excee Fashion</h5>\r\n            <h2 class=\"text-center\">Verify OTP</h2>\r\n            <p class=\"text-center\">Enter the 6-digit that we have sent via the phone number +{{ countryCode }}{{ mobile\r\n                }}</p>\r\n            <div class=\"otpContainer\">\r\n                <ng-container *ngFor=\"let _ of [].constructor(6); let idx = index\">\r\n                    <input type=\"number\" class=\"otp\" max=\"1\" [id]=\"'otp_'+idx\" (keyup)=\"move($event, idx)\">\r\n                </ng-container>\r\n            </div>\r\n\r\n            <div class=\"action-btn d-flex flex-column align-item-center justify-content-center\">\r\n                <button class=\"btn\" simpoButtonDirective [buttonStyle]=\"data?.action?.buttons[0]?.styles\"\r\n                    [color]=\"styles?.background?.accentColor\" (click)=\"verifyOTP()\">Continue</button>\r\n                <div class=\"alternate-opt text-center\" [style.color]=\"data?.styles.background?.accentColor\"\r\n                    (click)=\"resendOTP()\">Resend code</div>\r\n            </div>\r\n\r\n            <div class=\"close-btn onlyDesktop\" (click)=\"close()\">\r\n                <mat-icon>close</mat-icon>\r\n            </div>\r\n            <div class=\"back-btn\" (click)=\"goBack()\">\r\n                <mat-icon>keyboard_backspace</mat-icon>\r\n            </div>\r\n        </section>\r\n    </ng-container>\r\n</div>", styles: ["input,button{width:80%!important;margin:10px auto}input{padding:10px}.alternate-opt:hover{text-decoration:underline;cursor:pointer}.close-btn{position:absolute;top:10px;right:10px;cursor:pointer}.otpContainer{display:flex;gap:4px;margin:auto}.otpContainer .otp{border-radius:50%;padding:5px;height:50px;width:50px!important;margin:5px!important;text-align:center}input::-webkit-outer-spin-button,input::-webkit-inner-spin-button{-webkit-appearance:none;margin:0}input[type=number]{-moz-appearance:textfield}.back-btn{position:absolute;top:10px;left:10px;cursor:pointer}@media screen and (max-width: 475px){.onlyDesktop{display:none}.text-center{text-align:left!important}button,input{width:100%!important}.fullSection{justify-content:start!important}.action-btn{position:absolute;bottom:50px;width:95%}.action-btn .text-center{text-align:center!important}.otpContainer{margin-top:20px;position:relative;right:10px}}\n"], dependencies: [{ kind: "ngmodule", type: FormsModule }, { kind: "directive", type: i5.DefaultValueAccessor, selector: "input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]" }, { kind: "directive", type: i5.NumberValueAccessor, selector: "input[type=number][formControlName],input[type=number][formControl],input[type=number][ngModel]" }, { kind: "directive", type: i5.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i5.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "component", type: MatIcon, selector: "mat-icon", inputs: ["color", "inline", "svgIcon", "fontSet", "fontIcon"], exportAs: ["matIcon"] }, { kind: "ngmodule", type: CommonModule }, { kind: "directive", type: i2.NgClass, selector: "[ngClass]", inputs: ["class", "ngClass"] }, { kind: "directive", type: i2.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "directive", type: i2.NgSwitch, selector: "[ngSwitch]", inputs: ["ngSwitch"] }, { kind: "directive", type: i2.NgSwitchCase, selector: "[ngSwitchCase]", inputs: ["ngSwitchCase"] }, { kind: "directive", type: ButtonDirectiveDirective, selector: "[simpoButtonDirective]", inputs: ["buttonStyle", "color", "scrollValue"] }] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.4", ngImport: i0, type: AuthenticateUserComponent, decorators: [{
@@ -3314,7 +3307,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.4", ngImpor
                 }, {
                     type: Inject,
                     args: [MAT_DIALOG_DATA]
-                }] }, { type: RestService }, { type: i2$2.Router }, { type: i3.MatDialog }, { type: i3.MatDialogRef, decorators: [{
+                }] }, { type: RestService }, { type: i2$2.Router }, { type: i3.MatDialog }, { type: i4.StorageServiceService }, { type: i3.MatDialogRef, decorators: [{
                     type: Optional
                 }] }], propDecorators: { data: [{
                 type: Input
@@ -4678,7 +4671,7 @@ var UserFavourite = {
 
 class OrderedItems {
     constructor(json) {
-        this.itemId = json?.["itemId"];
+        this.itemId = json?.["itemId"] ?? v1();
         this.businessId = json?.["businessId"];
         this.itemName = json?.["name"];
         this.brandName = json?.["brandName"];
@@ -4689,83 +4682,164 @@ class OrderedItems {
         this.discountedPrice = json?.["price"]?.["discountedPrice"];
         this.taxAfterDiscount = json?.["taxAfterDiscount"];
     }
-    set setQuantity(quantity) {
-        this.quantity = quantity;
+}
+
+class StorageServiceService {
+    constructor() {
+        this.databaseName = "USER";
+        this.databaseVersion = 1;
+        this.cartCollectionName = "USER_CART";
+        this.favouriteCollectionName = "USER_FAVOURITE";
+        this.userCollectionName = "USER";
+        this.cartCollectionRef = null;
+        this.favouriteCollectionRef = null;
+        this.userCollectionRef = null;
+        this.createDataBase();
+    }
+    async createDataBase() {
+        const request = window.indexedDB.open(this.databaseName, 1);
+        request.onerror = () => { };
+        request.onsuccess = async (event) => {
+            this.database = await event.target.result;
+        };
+        request.onupgradeneeded = (event) => {
+            this.database = event.target.result;
+            this.cartCollectionRef = this.database.createObjectStore(this.cartCollectionName, { keyPath: "itemId" });
+            this.favouriteCollectionRef = this.database.createObjectStore(this.favouriteCollectionName, { keyPath: "itemId" });
+            this.userCollectionRef = this.database.createObjectStore(this.userCollectionName, { keyPath: "userId" });
+        };
+    }
+    // CART SERVICE
+    async getUserCart() {
+        const request = await this.cartCollectionRef?.getAll();
+        return request;
+    }
+    addProductToCart(product) {
+        const transaction = this.database.transaction(this.cartCollectionName, "readwrite");
+        return transaction.objectStore(this.cartCollectionName).put(product);
+    }
+    removeProductFromCart(productId) {
+        const transaction = this.database.transaction(this.cartCollectionName, "readwrite");
+        return transaction.objectStore(this.cartCollectionName).delete(productId);
+    }
+    async getProductFromCart(productId) {
+        const transaction = this.database.transaction(this.cartCollectionName, "readwrite");
+        return await transaction.objectStore(this.cartCollectionName).get(productId);
+    }
+    // WISHLIST SERVICE
+    async getUserWhishlist() {
+        const request = await this.cartCollectionRef?.getAll();
+        return request;
     }
-    get getQuantity() { return this.quantity; }
-    get getItemId() { return this.itemId; }
-    get getPrice() { return this.price; }
+    addProductToWishlist(product) {
+        const transaction = this.database.transaction(this.favouriteCollectionName, "readwrite");
+        return transaction.objectStore(this.favouriteCollectionName).put(product);
+    }
+    removeProductFromWishlist(productId) {
+        const transaction = this.database.transaction(this.favouriteCollectionName, "readwrite");
+        return transaction.objectStore(this.favouriteCollectionName).delete(productId);
+    }
+    async getProductFromWishlist(productId) {
+        const transaction = this.database.transaction(this.favouriteCollectionName, "readwrite");
+        return await transaction.objectStore(this.favouriteCollectionName).get(productId);
+    }
+    // USER SERVICE
+    addUser(user) {
+        localStorage.setItem("user", JSON.stringify(user));
+        return user;
+    }
+    getUser() {
+        const user = localStorage.getItem("user") ?? "{}";
+        return JSON.parse(user);
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.4", ngImport: i0, type: StorageServiceService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.1.4", ngImport: i0, type: StorageServiceService, providedIn: 'root' }); }
 }
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.4", ngImport: i0, type: StorageServiceService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: () => [] });
 
 class CartService {
-    constructor(restService) {
+    constructor(restService, storageService) {
         this.restService = restService;
+        this.storageService = storageService;
     }
     addItemToCart(product) {
-        this.storeItemToJSON(UserCart, product, "CART");
+        const orderedItem = this.objectMapper(product);
+        let productIdx = -1;
+        UserCart.orderedItems.forEach((item, idx) => productIdx = (item.itemId == product.itemId) ? idx : -1);
+        if (productIdx >= 0) {
+            UserCart.orderedItems[productIdx].quantity = product.quantity;
+        }
+        else {
+            UserCart.orderedItems.push(product);
+        }
+        console.log(UserCart);
+        this.storageService.addProductToCart(orderedItem);
     }
     addItemToFavourite(product) {
-        this.storeItemToJSON(UserFavourite, product, "WISHLIST");
-    }
-    removeItemToFavourite(product) {
-        const index = this.getItemIdxJSON(product.itemId, UserFavourite);
-        console.log("index: ", index);
-        if (index >= 0)
-            UserFavourite.orderedItems.splice(index, 1);
-        console.log(UserFavourite);
+        const orderedItem = this.objectMapper(product);
+        let productIdx = -1;
+        UserFavourite.orderedItems.forEach((item, idx) => productIdx = (item.itemId == product.itemId) ? idx : -1);
+        if (productIdx >= 0) {
+            UserFavourite.orderedItems[productIdx].quantity = product.quantity;
+        }
+        else {
+            UserFavourite.orderedItems.push(product);
+        }
+        this.storageService.addProductToWishlist(orderedItem);
     }
-    convertFavToCart(product) {
-        const index = this.getItemIdxJSON(product.getItemId, UserFavourite);
+    removeItemFromFavourite(product) {
+        const index = this.getItemIdxJSON(product.itemId, 'FAVOURITE');
         if (index >= 0) {
             const item = UserFavourite.orderedItems.splice(index, 1)[0];
             UserCart.orderedItems.push(item);
+            this.storageService.removeProductFromWishlist(product.itemId);
         }
     }
-    convertCartToFav(product) {
-        const index = this.getItemIdxJSON(product.getItemId, UserCart);
+    removeItemFromCart(product) {
+        const index = this.getItemIdxJSON(product.itemId, 'CART');
         if (index >= 0) {
             const item = UserCart.orderedItems.splice(index, 1)[0];
-            UserFavourite.orderedItems.push(item);
+            UserCart.orderedItems.push(item);
+            this.storageService.removeProductFromCart(product.itemId);
         }
     }
-    storeItemToJSON(json, product, type) {
-        const orderProduct = this.objectMapper(product);
-        let productIndex = -1;
-        json.orderedItems.forEach((p, idx) => {
-            if (p.itemId == product.itemId)
-                productIndex = idx;
-        });
-        if (productIndex == -1)
-            json.orderedItems.push(orderProduct);
-        else {
-            if (product.quantity > 0) {
-                json.orderedItems[productIndex].quantity = orderProduct.getQuantity;
+    // public convertFavToCart(product: OrderedItems) {
+    //   const index = this.getItemIdxJSON(product.getItemId, UserFavourites);
+    //   if (index >= 0) {
+    //     const item = UserFavourites.orderedItems.splice(index, 1)[0];
+    //     UserCart.orderedItems.push(item as never);
+    //   }
+    // }
+    // public convertCartToFav(product: OrderedItems) {
+    //   const index = this.getItemIdxJSON(product.getItemId, UserCart);
+    //   if (index >= 0) {
+    //     const item = UserCart.orderedItems.splice(index, 1)[0];
+    //     UserFavourites.orderedItems.push(item as never);
+    //   }
+    // }
+    storeItemToDB(product, type) {
+        if (type == "CART") {
+            const orderProduct = this.objectMapper(this.storageService.getProductFromCart(product.itemId));
+            if (orderProduct) {
+                this.storageService.addProductToCart(orderProduct);
+                UserCart.orderedItems.push(orderProduct);
             }
-            else {
-                json.orderedItems.splice(productIndex, 1);
+        }
+        else {
+            const orderProduct = this.objectMapper(this.storageService.getProductFromWishlist(product.itemId));
+            if (orderProduct) {
+                this.storageService.addProductToWishlist(orderProduct);
+                UserFavourite.orderedItems.push(orderProduct);
             }
-            json.billdetails.totalNetValue = 0;
-            json.billdetails.totalTax = 0;
-            json.orderedItems.forEach((item) => json.billdetails.totalNetValue += (item.price * item.quantity));
-            json.orderedItems.forEach((item) => json.billdetails.totalTax += (item.itemTax));
-            json.totalAmount = json.billdetails.totalTax + json.billdetails.totalNetValue;
         }
     }
-    getItemQuantity(itemId) {
-        let productIndex = -1;
-        UserCart.orderedItems.forEach((p, idx) => {
-            if (p.itemId == itemId)
-                productIndex = idx;
-        });
-        if (productIndex == -1)
-            return 0;
-        else
-            return UserCart.orderedItems[productIndex].getQuantity;
-    }
-    getIsItemPresent(itemId, type) {
-        return type == "FAVOURITE" ? this.getItemIdxJSON(itemId, UserFavourite) >= 0 : this.getItemIdxJSON(itemId, UserCart) >= 0;
-    }
-    getItemIdxJSON(itemId, json) {
+    getItemIdxJSON(itemId, type) {
+        const json = type == "FAVOURITE" ? UserFavourite : UserCart;
         let productIndex = -1;
         json.orderedItems.forEach((p, idx) => {
             if (p.itemId == itemId)
@@ -4773,29 +4847,37 @@ class CartService {
         });
         return productIndex;
     }
+    getItemByIdx(itemId, type) {
+        const productIdx = this.getItemIdxJSON(itemId, type);
+        const json = (type == "FAVOURITE") ? UserFavourite : UserCart;
+        if (productIdx >= 0)
+            return json.orderedItems[productIdx];
+        return null;
+    }
     objectMapper(product) {
+        debugger;
         return new OrderedItems(product);
     }
-    storeJSONToDB() {
-        this.restService.addItemToDB(UserCart).subscribe((response) => { });
-        this.restService.addItemToDB(UserFavourite).subscribe((response) => { });
+    storeDataToServer() {
+        // this.restService.addItemToDB(UserCart).subscribe((response)=> {});
+        // this.restService.addItemToDB(UserFavourites).subscribe((response)=> {});
     }
     storeDBToJSON() {
-        const userId = UserInfo.user?.userId;
-        if (!userId)
-            return;
-        this.restService.getUserItems(userId, "CART").subscribe((response) => {
-            UserCart.orderedItems = response.data.orderedItems;
-            UserCart.billdetails = response.data.billdetails;
-            UserCart.totalAmount = response.totalAmount;
-        });
-        this.restService.getUserItems(userId, "WISHLIST").subscribe((response) => {
-            UserFavourite.orderedItems = response.data.orderedItems;
-            UserFavourite.billdetails = response.data.billdetails;
-            UserFavourite.totalAmount = response.totalAmount;
-        });
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.4", ngImport: i0, type: CartService, deps: [{ token: RestService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+        // const userId = UserDetails.user?.userId;
+        // if (!userId)
+        //   return;
+        // this.restService.getUserItems(userId, "CART").subscribe((response: any)=> {
+        //   UserCart.orderedItems = response.data.orderedItems;
+        //   UserCart.billdetails = response.data.billdetails;
+        //   UserCart.totalAmount = response.totalAmount;
+        // })
+        // this.restService.getUserItems(userId, "WISHLIST").subscribe((response: any)=> {
+        //   UserFavourites.orderedItems = response.data.orderedItems;
+        //   UserFavourites.billdetails = response.data.billdetails;
+        //   UserFavourites.totalAmount = response.totalAmount;
+        // })
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.1.4", ngImport: i0, type: CartService, deps: [{ token: RestService }, { token: StorageServiceService }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.1.4", ngImport: i0, type: CartService, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.4", ngImport: i0, type: CartService, decorators: [{
@@ -4803,7 +4885,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.1.4", ngImpor
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: () => [{ type: RestService }] });
+        }], ctorParameters: () => [{ type: RestService }, { type: StorageServiceService }] });
 
 class FeaturedProductsComponent extends BaseSection {
     constructor(platformId, _eventService, restService, router, cartService) {
@@ -4864,14 +4946,14 @@ class FeaturedProductsComponent extends BaseSection {
         if (type == 'ADD')
             this.cartService.addItemToFavourite(product);
         else
-            this.cartService.removeItemToFavourite(product);
+            this.cartService.removeItemFromFavourite(product);
     }
     proceedToProductDesc(productId) {
         this.router.navigate([`details`], { queryParams: { id: productId } });
         // this._eventService.redirectToPage.emit({redirectTo: '/details', data: {productId: productId}})
     }
     isItemFav(product) {
-        return this.cartService.getIsItemPresent(product.itemId, 'FAVOURITE');
+        return this.cartService.getItemIdxJSON(product.itemId, 'FAVOURITE');
     }
     togglePreviewImage(product, idx) {
         const element = document.getElementById('preview_' + idx);
@@ -5018,7 +5100,13 @@ class ProductDescComponent extends BaseSection {
                 this.restService.getProductDetails(productId).subscribe((response) => {
                     this.responseData = response[0];
                     if (this.responseData) {
-                        this.responseData.quantity = this.cartService.getItemQuantity(this.responseData?.itemId);
+                        const cartItem = this.cartService.getItemByIdx(this.responseData?.itemId, "CART");
+                        const favItem = this.cartService.getItemByIdx(this.responseData?.itemId, "FAVOURITE");
+                        response.quantity = 0;
+                        if (cartItem)
+                            response.quantity = cartItem.quantity;
+                        if (favItem)
+                            response.quantity = favItem.quantity;
                         this.currentImg = this.responseData?.itemImages[0].imgUrl;
                         this.getProductByCategory();
                     }
@@ -5054,10 +5142,10 @@ class ProductDescComponent extends BaseSection {
         this.cartService.addItemToFavourite(this.responseData);
     }
     removeToFavourite() {
-        this.cartService.removeItemToFavourite(this.responseData);
+        this.cartService.removeItemFromFavourite(this.responseData);
     }
     get isItemAsFavorite() {
-        return this.cartService.getIsItemPresent(this.responseData?.itemId, "FAVOURITE");
+        return false;
     }
     get getFeatureProductData() {
         return this.data;
@@ -5466,7 +5554,7 @@ class CartComponent extends BaseSection {
         this.currentTab = "BAG";
     }
     ngOnInit() {
-        this.cartService.storeDBToJSON();
+        // this.cartService.storeDBToJSON();
         this.responseData = UserCart;
         console.log("a: ", UserCart, this.responseData);
         this.styles = this.data?.styles;
@@ -5612,10 +5700,10 @@ class WhislistComponent {
         this.styles = this.data?.styles;
     }
     moveToCart(item) {
-        this.cartService.convertFavToCart(item);
+        // this.cartService.convertFavToCart(item);
     }
     deleteFromWhislist(item) {
-        this.cartService.removeItemToFavourite(item);
+        // this.cartService.removeItemToFavourite(item);
     }
     addToFav(item, type) {
         if (type == 'ADD')
@@ -5774,6 +5862,7 @@ class Cart {
         this.platform = json?.["platform"];
         this.locationDetails = json?.["locationDetails"];
         this.userDetails = json?.["userDetails"];
+        this.totalAmount = 0;
     }
 }