diff --git a/src/Components/SignupPage/SignupPage.js b/src/Components/SignupPage/SignupPage.js index d8d4b81..7ebdfcc 100644 --- a/src/Components/SignupPage/SignupPage.js +++ b/src/Components/SignupPage/SignupPage.js @@ -43,9 +43,12 @@ const SignupPage = () => { getFormDataDefaults(paymentfields) ); const [showPaymentModal, setShowPaymentModal] = useState(false); + /* const [showSelectPlan, setShowSelectPlan] = useState( isUpgrade ? true : false ); + */ + const [showSelectPlan, setShowSelectPlan] = useState(true); const [activeRadioOption, setActiveRadioOption] = useState("partner"); const [selectedPlan, setSelectedPlan] = useState([signupRadioFields[1]]); const [isAnnual, setIsAnnual] = useState(1); @@ -508,128 +511,127 @@ const SignupPage = () => { {!isUpgrade && !isBusy ? signupForm : <>} {showSelectPlan && !isBusy ? (
-
-
-
-
- Select a subscription plan -
-
-
-
-

Billed annually

- -

Billed montly

-
+
+
+
+ Select a subscription plan +
+
+
+
+

Billed annually

+ +

Billed montly

-
- {signupRadioFields?.map((option, index) => ( -
- +
+
+ {signupRadioFields?.map((option, index) => ( +
+ +
+ ))} +
+ {showAddAccount && !isBusy ? ( +
+
+
+
+ Add additional accounts +
+

+ User profiles will be setup later +

- ))} -
- {showAddAccount && !isBusy ? ( -
-
-
-
- Add additional accounts -
-

- User profiles will be setup later -

-
-
-
- + handleChangeAccountSelect(e, "addAccountsSelect") + } + > + + {selectAdditionalAccountValues.map((item, i) => ( - {selectAdditionalAccountValues.map((item, i) => ( - - ))} - -
+ key={`item${i}`} + > + {item} + + ))} +
-
+
+
+
+
+ ) : ( + <> + )} +
+ {!showAddAccount && !isBusy ? ( + <> + {showAddAccountBtn ? ( +
) : ( diff --git a/src/Constants/Fields/RadioFields.js b/src/Constants/Fields/RadioFields.js index 72e99a2..361e01e 100644 --- a/src/Constants/Fields/RadioFields.js +++ b/src/Constants/Fields/RadioFields.js @@ -5,7 +5,7 @@ export const signupRadioFields = [ value: "associate", description: [ "1 document per month", - "Carryover 1 document to next period", + "Carryover 1 unused document each subscription period", "Documents conforming with state rules", "24/7 support", "First month free!", @@ -24,7 +24,7 @@ export const signupRadioFields = [ value: "partner", description: [ "3 documents per month", - "Carryover 2 documents to next period", + "Carryover 1 unused document per month", "Documents conforming with state rules", "Up to 2 additional accounts: $49/each", "24/7 support", @@ -55,5 +55,22 @@ export const signupRadioFields = [ { type: "additionalAccount", amount: 39 }, ], }, + { + name: "Of Counsel", + label: "Of Counsel", + value: "ofCounsel", + description: [ + "One document - pay as you go", + "24/7 support", + "Document conforming with state rules", + ], + details: "", + docsAllowedPerMonth: 1, + pricing: [ + { type: "oneTime", amount: 59 }, + { type: "oneTime", amount: 59 }, + { type: "oneTime", amount: 59 }, + ], + }, ]; // diff --git a/src/pageElements/Radio.js b/src/pageElements/Radio.js index 6898216..bf2fb95 100644 --- a/src/pageElements/Radio.js +++ b/src/pageElements/Radio.js @@ -15,6 +15,7 @@ const Radio = (props) => { isAnnual, isUpgrade, currentPlan, + parentIndex, } = props; const classCheckbox = "checkbox"; @@ -43,9 +44,15 @@ const Radio = (props) => { )}
{`${name}`}
-
- {`$${price[index]["amount"]}/mo`} -
+ {parentIndex > 2 ? ( +
+ {`$${price[index]["amount"]}/doc`} +
+ ) : ( +
+ {`$${price[index]["amount"]}/mo`} +
+ )}
diff --git a/src/styles/signup.scss b/src/styles/signup.scss index 3c715cb..3fa3f5c 100644 --- a/src/styles/signup.scss +++ b/src/styles/signup.scss @@ -11,7 +11,7 @@ flex-direction: column; align-items: center; margin-top: 45px; - width: 960px; + width: 920px; padding: 12px; border-radius: 10px; background-color: rgb(240, 247, 250); @@ -81,13 +81,6 @@ width: 160px; } -.select-plan-container { - display: flex; - flex-direction: row; - margin-top: 24px; - width: 920px; -} - .select-plan-header { display: flex; flex-direction: row; @@ -118,17 +111,22 @@ width: 50%; } +.select-plan-container { + display: flex; + flex-direction: column; + margin-top: 24px; + width: 920px; + min-height: 810px; + border-radius: 10px; + background-color: rgb(240, 247, 250); + border: 1px solid #e9e9e9; +} + .select-sub-left { display: flex; flex-direction: column; align-items: center; - margin-top: 45px; width: 100%; - padding: 12px; - border-radius: 10px; - background-color: rgb(240, 247, 250); - border: 1px solid #e9e9e9; - padding: 6px; } .select-sub-right { @@ -168,9 +166,9 @@ .radio-group-box { display: flex; flex-direction: row; + flex-wrap: wrap; padding: 6px; width: 100%; - height: 340px; } .select-plan-summary-box { @@ -197,7 +195,7 @@ } .signup-radio-container { - width: 350px; + width: 300px; height: 100%; }