From 6b500e29391795ed97f9389a939459b876addbc0 Mon Sep 17 00:00:00 2001 From: sachinganesh Date: Mon, 24 Apr 2023 15:58:39 +0530 Subject: [PATCH] code added --- dist/Js/auth/login.js | 8 ++++ dist/Js/navbar.js | 4 +- dist/Js/productdetails/productdetails.js | 59 +++++++++++++++++------- dist/Js/shoppingcart/select_delivery.js | 2 + login.html | 1 + productdetails.html | 20 ++++---- selectdelivery.html | 32 ++----------- 7 files changed, 67 insertions(+), 59 deletions(-) diff --git a/dist/Js/auth/login.js b/dist/Js/auth/login.js index 05b6213..bfe0573 100644 --- a/dist/Js/auth/login.js +++ b/dist/Js/auth/login.js @@ -138,6 +138,14 @@ function initLogin() { //window.localStorage.setItem("Userpassword", userPassword); window.localStorage.setItem("Isloggedintoaster", true); window.localStorage.setItem("Isloggedin", true); + + const isCartAdded = localStorage.getItem(CART_ADD); + if(isCartAdded){ + localStorage.removeItem(CART_ADD); + window.location.href = `/selectdelivery.html`; + return; + } + window.location.href = `./index.html`; } else { toasterOpts(); diff --git a/dist/Js/navbar.js b/dist/Js/navbar.js index c8edd69..aae82f8 100644 --- a/dist/Js/navbar.js +++ b/dist/Js/navbar.js @@ -1,9 +1,7 @@ let nav_html = `
-
+
diff --git a/dist/Js/productdetails/productdetails.js b/dist/Js/productdetails/productdetails.js index c21b72c..e80ceb5 100644 --- a/dist/Js/productdetails/productdetails.js +++ b/dist/Js/productdetails/productdetails.js @@ -110,6 +110,19 @@ function startDetails(){ }); } + function updateDetailsByObj(obj){ + $('.productname').html(obj.itemname) + $('.price').html(obj.pricelist); + appendSpecs(obj.itemid) + $('#skudetailitem').val(obj.sku) + $('.des_productdes').html(obj.itemdescription); + + let defaultImg = obj.itemimageurl ? obj.itemimageurl: `./dist/assets/imgs/nophoto.png`; +console.log(obj.itemimageurl,'obj.itemimageurlobj.itemimageurlobj.itemimageurl'); + $('.productDetailsMain > img').attr('src',defaultImg); + + } + function searchComb(){ let valuesSelected = []; @@ -155,20 +168,15 @@ function startDetails(){ const {quantity} = itemtagscombinationRes[i]; if(quantity>=$('#quantity').val() && quantity>=1){ currentComb = itemtagscombinationRes[i]; - $('.productname').html(itemtagscombinationRes[i].itemname) - $('.price').html(itemtagscombinationRes[i].pricelist); + // $('.productname').html(itemtagscombinationRes[i].itemname) + // $('.price').html(itemtagscombinationRes[i].pricelist); // location.hash = itemtagscombinationRes[i].itemname.trim(); - appendSpecs(itemtagscombinationRes[i].itemid) + // appendSpecs(itemtagscombinationRes[i].itemid) history.replaceState(null, null, `#itemid=${itemtagscombinationRes[i].itemid}#${itemtagscombinationRes[i].itemname.trim()}`); - let searchparms = location.search; - debugger; - - -// const regex = /sku="(\w+)"/g; -// const newParams = searchparms.replace("sku", `$1${itemtagscombinationRes[i].sku}$2`); -// location.search = newParams; - $('#skudetailitem').val(itemtagscombinationRes[i].sku) + // $('#skudetailitem').val(itemtagscombinationRes[i].sku) + // $('.des_productdes').html(itemtagscombinationRes[i].itemdescription); + updateDetailsByObj(itemtagscombinationRes[i]); }else{ debugger; let name = itemtagscombinationRes[i].itemname.split('-')[0]; @@ -184,6 +192,7 @@ function startDetails(){ history.replaceState(null, null, `#`); $('.msgErrorDetailsItem').removeClass('d-none'); + $('.des_productdes').html(''); $('.price').html(''); } @@ -252,7 +261,7 @@ function startDetails(){ async function getProductDetails(id){ - + debugger // let res = await getStatAPIService(`${SERVERNAME}/apis/v4/bizgaze/integrations/products/productattributelist/productid/${id}`); @@ -358,12 +367,22 @@ function startDetails(){ if(isTrue){ debugger; console.log(itemtagscombinationRes[i],'itemtagscombinationRes[i]'); + + currentComb = itemtagscombinationRes[i]; - $('.productname').html(itemtagscombinationRes[i].itemname); location.hash = itemtagscombinationRes[i].itemname.trim(); - $('#skudetailitem').val(itemtagscombinationRes[i].sku) - $('.price').html(itemtagscombinationRes[i].pricelist) - appendSpecs(itemtagscombinationRes[i].itemid) + + // $('.productname').html(itemtagscombinationRes[i].itemname); + // $('#skudetailitem').val(itemtagscombinationRes[i].sku) + // $('.price').html(itemtagscombinationRes[i].pricelist) + // debugger; + // appendSpecs(itemtagscombinationRes[i].itemid); + // $('.des_productdes').html(itemtagscombinationRes[i].itemdescription); + + updateDetailsByObj(itemtagscombinationRes[i]); + + + isGo = false; let {tagnames,tagids,pricelist} = itemtagscombinationRes[i]; tagids = tagids.split('|'); @@ -387,12 +406,18 @@ function startDetails(){ tagnames = tagnames.split('|'); $('.optiontaganwi').removeClass('borderselector'); currentComb = itemtagscombinationRes[0]; + + for(let i=0;i + diff --git a/productdetails.html b/productdetails.html index 00ba4ea..65dbe97 100644 --- a/productdetails.html +++ b/productdetails.html @@ -97,10 +97,8 @@
ORA3, M.2 NVMe SSD
-
Improve your system's responsiveness, run apps faster and multitask - with ease. Compatibility assurance when using the Crucial System Scanner or Crucial - Advisor Tool
-
₹3000
+
+
₹
Product out of stock
@@ -258,9 +256,9 @@
-
+
-
    +
    • No Cost EMI Available Learn More
    • Buy Anwi Extended Warranty 1 Year at ₹2,699
      - Description + - Specification + Specification
      -
      + +
      diff --git a/selectdelivery.html b/selectdelivery.html index d673082..c9fedfc 100644 --- a/selectdelivery.html +++ b/selectdelivery.html @@ -36,12 +36,13 @@ -
      + +
      - +
      1
      @@ -197,32 +198,7 @@
      Your Order
      -
      -
      - -
      -
      -
      -
      Jeans with sequins
      -
      -
      - 7000 x 02 -
      -
      -
      -
      -
      - -
      -
      -
      -
      Jeans with sequins
      -
      -
      - 7000 x 02 -
      -
      -
      +