From 654844d3e91675571475446189e6c946dc80b391 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Sun, 28 Jan 2024 20:28:42 -0600 Subject: [PATCH 1/3] more --- src/Components/SignupPage/SignupPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Components/SignupPage/SignupPage.js b/src/Components/SignupPage/SignupPage.js index b949023..273921f 100644 --- a/src/Components/SignupPage/SignupPage.js +++ b/src/Components/SignupPage/SignupPage.js @@ -139,7 +139,7 @@ const SignupPage = () => { }; try { - const collecRef = collection(db, "incompleteSignups"); + const collecRef = collection(db, "signupLeads"); await setDoc(doc(collecRef, `${signupId}`), userData); } catch (error) { console.log(`Error saving new user to db: ${error}`); From b06aa1f053069bfc73e939ae944ad69d5477b7bb Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Sun, 28 Jan 2024 21:03:50 -0600 Subject: [PATCH 2/3] more --- src/Components/Modals/PaymentModal.js | 7 ++++++- src/Components/SignupPage/SignupPage.js | 14 ++++++++------ src/Utils/Form.js | 1 - 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/Components/Modals/PaymentModal.js b/src/Components/Modals/PaymentModal.js index 5c2cf8d..2bdd7f0 100644 --- a/src/Components/Modals/PaymentModal.js +++ b/src/Components/Modals/PaymentModal.js @@ -34,7 +34,11 @@ const PaymentModal = ({ const extraAccountsPrice = isAnnual ? additionalAccountsAnnualPriceToday - : additionalAccountsMonthlyPriceToday; + ? additionalAccountsAnnualPriceToday + : 0 + : additionalAccountsMonthlyPriceToday + ? additionalAccountsMonthlyPriceToday + : 0; const showAdditionaLAccountsView = (selectedPlan[0]?.value === "partner" && numberOfAccountsToAdd > 0) || @@ -45,6 +49,7 @@ const PaymentModal = ({ const amountToday = isAnnual ? annualSubscriptionPriceToday : monthlySubscriptionPriceToday; + const totalToday = amountToday + extraAccountsPrice; function handleValidateAndPay() { diff --git a/src/Components/SignupPage/SignupPage.js b/src/Components/SignupPage/SignupPage.js index 273921f..e8f96ef 100644 --- a/src/Components/SignupPage/SignupPage.js +++ b/src/Components/SignupPage/SignupPage.js @@ -217,12 +217,12 @@ const SignupPage = () => { return; } - /* - const userDataValues = validateUserData(); + const dataValues = validateUserData(); if (dataValues === null) { return; } - */ + + /* const userDataValues = { barNumber: "232323", city: "broolyn", @@ -237,7 +237,8 @@ const SignupPage = () => { telephone: "(313) 555-5555", zipCode: "12345", }; - saveLeadData(userDataValues); + */ + saveLeadData(dataValues); setShowSelectPlan(!showSelectPlan); }; @@ -265,7 +266,7 @@ const SignupPage = () => { let error = false; let subscriptionId = null; let customerId = null; - + console.log("~~~~~~~~~~~~~~~~~~~~~~~~handleStripeAuthorization fired"); const token = await stripe.tokens.create({ card: { number: paymentDataValues.cardNumber, @@ -280,6 +281,7 @@ const SignupPage = () => { }); try { + console.log("got to create-subscription try block"); let response = await fetch(`${apiUrl}/create-subscription`, { method: "POST", headers: { @@ -333,7 +335,7 @@ const SignupPage = () => { if (dataValues === null) { return; } - + console.log("dataValues in handleSignup", dataValues); const planType = determinePlan(isAnnual, activeRadioOption); setIsBusy(true); diff --git a/src/Utils/Form.js b/src/Utils/Form.js index c719043..3fcd6aa 100644 --- a/src/Utils/Form.js +++ b/src/Utils/Form.js @@ -84,7 +84,6 @@ export const getValidatedFormData = (data, fields) => }, data); export const handleFormDataChange = (e, name, data, fields) => { - console.log("fields", fields); if (!fields) { return; } From 926b69695f7c6e3c59cbd8072bdbd92c3dbb223c Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Sun, 28 Jan 2024 23:19:06 -0600 Subject: [PATCH 3/3] more --- src/Components/Modals/PaymentModal.js | 5 +- src/Components/SignupPage/SignupPage.js | 77 +++++++++++++++++-------- src/Constants/Fields/RadioFields.js | 1 + src/Utils/Form.js | 1 - 4 files changed, 56 insertions(+), 28 deletions(-) diff --git a/src/Components/Modals/PaymentModal.js b/src/Components/Modals/PaymentModal.js index 2bdd7f0..40620c1 100644 --- a/src/Components/Modals/PaymentModal.js +++ b/src/Components/Modals/PaymentModal.js @@ -26,8 +26,9 @@ const PaymentModal = ({ const monthlySubscriptionPriceToday = selectedPlan[0].pricing[0].amount; const annualSubscriptionPriceToday = selectedPlan[0].pricing[1].amount * 12; - const additionalAccountsMonthlyPriceToday = - selectedPlan[0].pricing[2].amount * numberOfAccountsToAdd; + const additionalAccountsMonthlyPriceToday = selectedPlan[0].pricing[2].amount + ? selectedPlan[0].pricing[2].amount * numberOfAccountsToAdd + : null; const additionalAccountsAnnualPriceToday = additionalAccountsMonthlyPriceToday * 12; diff --git a/src/Components/SignupPage/SignupPage.js b/src/Components/SignupPage/SignupPage.js index e8f96ef..1612bc6 100644 --- a/src/Components/SignupPage/SignupPage.js +++ b/src/Components/SignupPage/SignupPage.js @@ -216,29 +216,14 @@ const SignupPage = () => { if (isBusy) { return; } - + /* const dataValues = validateUserData(); if (dataValues === null) { return; } - /* - const userDataValues = { - barNumber: "232323", - city: "broolyn", - email: "j@s.com", - firm: "asdf", - firstName: "ghghg", - lastName: "hhhhh", - password: "123344556", - practiceArea: "dfdfdf", - state: "New York", - streetAddress: "123 Main", - telephone: "(313) 555-5555", - zipCode: "12345", - }; - */ saveLeadData(dataValues); + */ setShowSelectPlan(!showSelectPlan); }; @@ -260,13 +245,16 @@ const SignupPage = () => { paymentDataValues, customerDataValues ) { + console.log( + "~~~~~~~~~~~~~~~~~~~~_______-~~~~handleStripeAuthorization fired" + ); const additionalAccounts = numberOfAccountsToAdd ? numberOfAccountsToAdd : 0; let error = false; let subscriptionId = null; let customerId = null; - console.log("~~~~~~~~~~~~~~~~~~~~~~~~handleStripeAuthorization fired"); + const token = await stripe.tokens.create({ card: { number: paymentDataValues.cardNumber, @@ -279,16 +267,15 @@ const SignupPage = () => { paymentDataValues.cardLastName, }, }); - + const type = selectedPlan[0].value ? selectedPlan[0].value : null; try { - console.log("got to create-subscription try block"); let response = await fetch(`${apiUrl}/create-subscription`, { method: "POST", headers: { "Content-Type": "application/json", }, body: JSON.stringify({ - type: selectedPlan, + planType: type, additionalAccounts: additionalAccounts, isAnnual: isAnnual, customerData: { @@ -325,18 +312,37 @@ const SignupPage = () => { const handleSignup = async (totalDue) => { console.log(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>handleSignup fired"); - console.log("totalDue", totalDue); + const paymentDataValues = validatePaymentData(); if (paymentDataValues === null) { return; } - let dataValues = validateUserData(); + /* let dataValues = validateUserData(); if (dataValues === null) { return; } - console.log("dataValues in handleSignup", dataValues); + */ + const id = uuidv4(); + const email = `${id}@jim.com`; + let dataValues = { + firstName: "fffff", + lastName: "ffff", + firm: "form", + telephone: "(313) 333-3333", + streetAddress: "123 main", + city: "new york", + state: "New York", + zipCode: "10122", + barNumber: "2343434", + practiceArea: "3df", + email: email, + password: "stingPrug1", + confirmPassword: "stingPrug1", + }; + const planType = determinePlan(isAnnual, activeRadioOption); + console.log(planType); setIsBusy(true); if (paymentDataValues && dataValues) { @@ -369,6 +375,7 @@ const SignupPage = () => { } } catch (error) { setIsBusy(false); + console.log("-------->error", error); setNotice( error.message || "Sorry, something went wrong. Please try again." ); @@ -625,4 +632,24 @@ const SignupPage = () => { }; export default SignupPage; -// + +/* + + + const userDataValues = { + barNumber: "232323", + city: "broolyn", + email: "j@s.com", + firm: "asdf", + firstName: "ghghg", + lastName: "hhhhh", + password: "123344556", + practiceArea: "dfdfdf", + state: "New York", + streetAddress: "123 Main", + telephone: "(313) 555-5555", + zipCode: "12345", + }; + + +*/ diff --git a/src/Constants/Fields/RadioFields.js b/src/Constants/Fields/RadioFields.js index 83d2106..f7d4c5e 100644 --- a/src/Constants/Fields/RadioFields.js +++ b/src/Constants/Fields/RadioFields.js @@ -13,6 +13,7 @@ export const signupRadioFields = [ pricing: [ { type: "monthly", amount: 69 }, { type: "annDiscount", amount: 52 }, + { type: "additionalAccount", amount: 0 }, ], }, { diff --git a/src/Utils/Form.js b/src/Utils/Form.js index 3fcd6aa..0bd66bf 100644 --- a/src/Utils/Form.js +++ b/src/Utils/Form.js @@ -101,7 +101,6 @@ export const handleFormDataChange = (e, name, data, fields) => { }; export const isFormDataHasErrors = (data) => { - console.log("data", data); return Object.values(data).reduce( (hasErrors, { error }) => hasErrors || error, false