gofnnp/w-aura
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'preview/email-pay-email' into 'develop'

Browse Source 
Revert "fix: remove double image key and update filter of subscription plans"

See merge request witapp/aura-webapp!66
This commit is contained in:
Daniil Chemerkin 2024-04-02 23:46:48 +00:00
commit 9a97167e49
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/api/resources/SinglePayment.ts
View File

@ -15,6 +15,7 @@ export interface PayloadPost extends Payload {
name: string; name: string;
sign: string; sign: string;
age: number; age: number;
gender?: string;
}; };
partner: { partner: {
sign: string | null; sign: string | null;

2
src/components/pages/Gender/index.tsx
View File

@ -20,7 +20,7 @@ function GenderPage(): JSX.Element {
const selectGender = (gender: Gender) => { const selectGender = (gender: Gender) => {
dispatch(actions.questionnaire.update({ gender: gender.id })); dispatch(actions.questionnaire.update({ gender: gender.id }));
if (pathName === "/epe/gender") { if (pathName.includes("/epe/gender")) {
return navigate(routes.client.epeBirthdate()); return navigate(routes.client.epeBirthdate());
} }
navigate(`/questionnaire/profile/flowChoice`); navigate(`/questionnaire/profile/flowChoice`);

4
src/components/pages/PaymentWithEmailPage/index.tsx
View File

@ -33,6 +33,7 @@ function PaymentWithEmailPage() {
const timezone = getClientTimezone(); const timezone = getClientTimezone();
const dispatch = useDispatch(); const dispatch = useDispatch();
const birthday = useSelector(selectors.selectBirthday); const birthday = useSelector(selectors.selectBirthday);
const { gender } = useSelector(selectors.selectQuestionnaire);
const locale = i18n.language; const locale = i18n.language;
const [email, setEmail] = useState(""); const [email, setEmail] = useState("");
const [name, setName] = useState(""); const [name, setName] = useState("");
@ -119,7 +120,7 @@ function PaymentWithEmailPage() {
token, token,
}); });
const currentProduct = productsSinglePayment.find( const currentProduct = productsSinglePayment.find(
(product) => product.key === "compatibility.pdf" (product) => product.key === "moons.pdf.aura"
); );
return currentProduct; return currentProduct;
}; };
@ -140,6 +141,7 @@ function PaymentWithEmailPage() {
name: name || "", name: name || "",
sign: user?.profile?.sign?.sign || getZodiacSignByDate(birthday), sign: user?.profile?.sign?.sign || getZodiacSignByDate(birthday),
age: user?.profile?.age?.years || 1, age: user?.profile?.age?.years || 1,
gender: gender,
}, },
partner: { partner: {
sign: "partner_cancer", sign: "partner_cancer",