From b06aa1f053069bfc73e939ae944ad69d5477b7bb Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Sun, 28 Jan 2024 21:03:50 -0600 Subject: [PATCH] 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; }