From ae3e8ef7900d73f409de3a7cc7d12859bb4e9913 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Sun, 28 Jan 2024 18:36:55 -0600 Subject: [PATCH] more --- src/Components/Modals/PaymentModal.js | 27 +++++++++++++++++++------ src/Components/SignupPage/SignupPage.js | 7 ++++--- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/src/Components/Modals/PaymentModal.js b/src/Components/Modals/PaymentModal.js index d756aa5..73626f2 100644 --- a/src/Components/Modals/PaymentModal.js +++ b/src/Components/Modals/PaymentModal.js @@ -8,12 +8,10 @@ import Row from "react-bootstrap/Row"; import "../../styles/modals.scss"; const PaymentModal = ({ - buttonLabelText, isBusy, paymentData, paymentfields, handleChangePaymentInput, - orderSummary, handleSignUp, setShowPaymentModal, handleSignup, @@ -22,14 +20,16 @@ const PaymentModal = ({ fieldsChunkSize, numberOfAccountsToAdd, }) => { - console.timeLog(); + const monthlyAddAccountPrice = selectedPlan[0].pricing[2].amount; const monthlySubscriptionPriceToday = selectedPlan[0].pricing[0].amount; const annualSubscriptionPriceToday = selectedPlan[0].pricing[1].amount * 12; - console.log("monthlySubscriptionPriceToday", monthlySubscriptionPriceToday); - const monthlyAddAccountPrice = selectedPlan[0].pricing[2].amount; - const annualAddAccountPrice = monthlyAddAccountPrice * 12; + const additionalAccountsMonthlyPriceToday = + selectedPlan[0].pricing[2].amount * numberOfAccountsToAdd; + + const additionalAccountsAnnualPriceToday = + additionalAccountsMonthlyPriceToday * 12; const showAdditionaLAccountsView = (selectedPlan[0]?.value === "partner" && numberOfAccountsToAdd > 0) || @@ -62,8 +62,18 @@ const PaymentModal = ({ {billingPeriod} - ${amountToday} +
Addiitonal accounts:
+
+ {isAnnual + ? additionalAccountsAnnualPriceToday + : additionalAccountsMonthlyPriceToday} +
+
+ +
+
Total today:
{isAnnual ? ( @@ -82,6 +92,11 @@ const PaymentModal = ({
Additional Accounts:
+
+ {isAnnual + ? additionalAccountsAnnualPriceToday + : additionalAccountsMonthlyPriceToday} +
) : ( <> diff --git a/src/Components/SignupPage/SignupPage.js b/src/Components/SignupPage/SignupPage.js index f64a085..27d557a 100644 --- a/src/Components/SignupPage/SignupPage.js +++ b/src/Components/SignupPage/SignupPage.js @@ -58,11 +58,12 @@ const SignupPage = () => { }; const handleChangeAccountSelect = (e, name) => { - console.log("e, name", e, name); + console.log("~~~~~~~~~~~~~~e.target.value, name", e.target.value, name); const num = e.target.value; - setNumberOfAccountsToAdd(num); + const temp = Number(num); + setNumberOfAccountsToAdd(temp); }; - + console.log("numberOfAccountsToAdd", numberOfAccountsToAdd); const handleChangePaymentInput = (e, name) => { const newPaymentData = handleFormDataChange( e,