conflict resolved

WWWPiramalFinanceCOM · Jul 3, 2024 · 0926972 · 0926972
2 parents ad46006 + 03b3313
commit 0926972
Show file tree

Hide file tree

Showing 17 changed files with 2,179 additions and 452 deletions.
diff --git a/blocks/applyloanform/applyloanform.js b/blocks/applyloanform/applyloanform.js
@@ -4,15 +4,15 @@ import { applyLoanPopper } from "./applyloanpopper.js";
 import { loanutmForm } from "./loanutm.js";
 import { stateMasterApi } from "./statemasterapi.js";
 import { validationJSFunc } from "./validation.js";
-import AirDatepicker from "./datepickertest.js";
+import AirDatepicker from "../datepickerlib/datepickerlib.js";
 import Popper from "../datepickerlib/popper.js";
 import { loanFromBtn, loanOtpInput } from "./loanformdom.js";
 import { workFlow } from "./loanformapi.js";
-// import { buttonCLick } from "./loanformapi.js";
+import { buttonCLick } from "./loanformapi.js";
 
-export default function decorate(block) {
+export default async function decorate(block) {
   let cfURL = block.querySelector("a")?.textContent.trim();
-  // const cfRepsonse = CFApiCall(cfURL);
+  // const cfRepsonse = await CFApiCall(cfURL);
 
   block.innerHTML = appplyLoanTemplate();
   try {
@@ -21,15 +21,7 @@ export default function decorate(block) {
     loanutmForm();
     stateMasterApi();
     validationJSFunc();
-    // buttonCLick();
-    let loanStatus = "Rejected";
-
-    loanFromBtn().addEventListener("click", function ({ currentTarget }) {
-      // debugger;
-      currentTarget.closest(".loan-form-button-container").classList.add("loader-initialized");
-      loanOtpInput().value = "";
-      workFlow();
-    });
+    buttonCLick();
   } catch (error) {
     console.warn(error);
   }

diff --git a/blocks/applyloanform/applyloantemplate.js b/blocks/applyloanform/applyloantemplate.js
@@ -47,8 +47,8 @@ export function appplyLoanTemplate() {
     options: [
       {
         "Personal Loan": [
-          { litext: "Loan less than 5 Lac", loantype: "pl" },
-          { litext: "Loan more than 5 Lac", loantype: "pl" },
+          { litext: "Loan less than 5 Lacs", loantype: "pl" },
+          { litext: "Loan more than 5 Lacs", loantype: "pl" },
         ],
       },
       {

diff --git a/blocks/applyloanform/loanformapi.js b/blocks/applyloanform/loanformapi.js
@@ -10,7 +10,6 @@ let loanStatus = "Rejected";
 
 export function buttonCLick() {
 
-
     loanFromBtn().addEventListener("click", function ({ currentTarget }) {
         // debugger;
         currentTarget.closest(".loan-form-button-container").classList.add("loader-initialized");

diff --git a/blocks/applyloanform/loanutm.js b/blocks/applyloanform/loanutm.js
@@ -1,25 +1,25 @@
+export let isMobile = {
+    Android: function() {
+        return navigator.userAgent.match(/Android/i);
+    },
+    BlackBerry: function() {
+        return navigator.userAgent.match(/BlackBerry/i);
+    },
+    iOS: function() {
+        return navigator.userAgent.match(/iPhone|iPad|iPod/i);
+    },
+    Opera: function() {
+        return navigator.userAgent.match(/Opera Mini/i);
+    },
+    Windows: function() {
+        return navigator.userAgent.match(/IEMobile/i) || navigator.userAgent.match(/WPDesktop/i);
+    },
+    any: function() {
+        return (isMobile.Android() || isMobile.BlackBerry() || isMobile.iOS() || isMobile.Opera() || isMobile.Windows());
+    }
+};
 
 export function loanutmForm(){
-    const isMobile = {
-        Android: function() {
-            return navigator.userAgent.match(/Android/i);
-        },
-        BlackBerry: function() {
-            return navigator.userAgent.match(/BlackBerry/i);
-        },
-        iOS: function() {
-            return navigator.userAgent.match(/iPhone|iPad|iPod/i);
-        },
-        Opera: function() {
-            return navigator.userAgent.match(/Opera Mini/i);
-        },
-        Windows: function() {
-            return navigator.userAgent.match(/IEMobile/i) || navigator.userAgent.match(/WPDesktop/i);
-        },
-        any: function() {
-            return (isMobile.Android() || isMobile.BlackBerry() || isMobile.iOS() || isMobile.Opera() || isMobile.Windows());
-        }
-      };
       let utmBtns = document.querySelectorAll(".loan-form-utm");
 
       if(utmBtns.length) {
@@ -40,8 +40,6 @@ export function loanFormUTM() {
 }
 
 
-
-
 export function loginFormUTM() {
     let redirectionLink=document.querySelector(".location-link").innerHTML;
 

diff --git a/blocks/city-list/city-list.js b/blocks/city-list/city-list.js
@@ -1,29 +1,11 @@
-import { getProps, renderHelper } from "../../scripts/scripts.js";
+import { fetchAPI, getProps, renderHelper } from "../../scripts/scripts.js";
 
-export default function decorate(block) {
+export default async function decorate(block) {
     const [url] = getProps(block);
+    const resp = await fetchAPI("GET", url);
+    const data = await resp.json();
 
-    const resp = [
-        {
-            url: "https://publish-p133703-e1305981.adobeaemcloud.com/in/en/home-loan/ahmedabad.html",
-            text: "Ahmedabad"
-        },
-        {
-            url: "https://publish-p133703-e1305981.adobeaemcloud.com/in/en/home-loan/chennai.html",
-            text: "Chennai"
-        },
-        {
-            url: "https://publish-p133703-e1305981.adobeaemcloud.com/in/en/home-loan/delhi.html",
-            text: "Delhi"
-        },
-        {
-            url: "https://publish-p133703-e1305981.adobeaemcloud.com/in/en/home-loan/bangalore.html",
-            text: "Bangalore"
-        }
-    ]
-
-
-    let li = renderHelper(resp, `<div class="forName">
+    let li = renderHelper(data.data, `<div class="forName">
         <li><a href="{url}" title="{text}">{text}</a></li>    
     </div>`)
     block.innerHTML = '<ul>' + li + '</ul>'

diff --git a/blocks/datepickerlib/datepickerlib.js b/blocks/datepickerlib/datepickerlib.js
diff --git a/blocks/eligibilitycalculator/eligibilitycalculator.js b/blocks/eligibilitycalculator/eligibilitycalculator.js
@@ -7,9 +7,9 @@ import { targetObject } from "../../scripts/scripts.js";
 let calculatorType, elgCalDiv, elgOverlay, overlay;
 
 
-export default function decorate(block) {
+export default async function decorate(block) {
   let cfURL = block.querySelector("a")?.textContent.trim();
-  // const cfRepsonse = CFApiCall(cfURL);
+  // const cfRepsonse = await CFApiCall(cfURL);
 
   const callAJson = {
     total: 1,
@@ -166,7 +166,9 @@ export default function decorate(block) {
         calendarmobile: "/content/dam/piramalfinance/homepage/images/calc-calendarwebp",
         outputtext: "Your home loan EMI is",
         button1text: "Talk to loan expert",
+        button1link: "https://www.google.com/",
         button2text: "Apply loan now",
+        button2link: "https://www.google.com/",
         pageproperties: "bl",
       },
     ],

diff --git a/blocks/emiandeligiblitycalc/templatehtml1.js b/blocks/emiandeligiblitycalc/templatehtml1.js
@@ -250,11 +250,11 @@ const eligibilitydiv = callJson.data[0].chechboxelibilityobj.chechboxemi
   
                           <div class="customerbuttons">
   
-                              <a target="_self">
+                              <a href="${callJson.data[0].button1link}" target="_self">
   
                                   <button class="expert">${callJson.data[0].button1text}</button>
                               </a>
-                              <a target="_self">
+                              <a href="${callJson.data[0].button2link}" target="_self">
   
                                   <button class="expert orangeexpert">${callJson.data[0].button2text}</button>
                               </a>