Commit Graph

286 Commits

Author SHA1 Message Date
dev.daminik00
1f51ec4ec2 update stripe trial 2024-05-05 00:55:20 +02:00
dev.daminik00
72426a65de update stripe trial 2024-05-05 00:49:08 +02:00
Daniil Chemerkin
845725f9f3 Merge branch 'AW-58-newJWTTokenMethod' into 'develop'
AW-58-newJWTTokenMethod

See merge request witapp/aura-webapp!117
2024-05-04 20:11:35 +00:00
Денис Катаев
3a87ee5c93 AW-58-newJWTTokenMethod 2024-05-04 20:11:35 +00:00
Денис Катаев
2d7be6a578 AW-51-newAuthentication 2024-05-04 20:11:24 +00:00
Daniil Chemerkin
57eb7ab913 Merge branch 'AW-47-duplicateSubscriptionPlans' into 'develop'
AW-47-duplicateSubscriptionPlans

See merge request witapp/aura-webapp!108
2024-04-25 14:35:22 +00:00
Денис Катаев
0920d84843 AW-47-duplicateSubscriptionPlans 2024-04-25 14:35:22 +00:00
Денис Катаев
b51fc34b7f AW-46-changePaymentForm 2024-04-25 14:35:13 +00:00
Денис Катаев
38e1779cf6 AW-45-deletePayPal 2024-04-24 14:53:38 +00:00
Денис Катаев
b5ab8415ac AW-42-UTMParameters 2024-04-22 22:46:11 +00:00
Денис Катаев
f7af37c861 AW-41-addFreeTrial 2024-04-22 22:20:54 +00:00
Денис Катаев
fc21cc90b0 AW-31-addEnvVariables 2024-04-22 17:35:23 +00:00
Денис Катаев
b5aabf16cc AW-22-deleteChargebee 2024-04-19 16:30:40 +00:00
Денис Катаев
74d76a17e2 AW-28-displayPaymentErrors 2024-04-18 21:54:57 +00:00
Денис Катаев
d590d157f3 AW-6-changeCameraSize-cameraButton 2024-04-18 19:56:00 +00:00
Daniil Chemerkin
daec6325b6 Merge branch 'main' into 'develop'
# Conflicts:
#   src/components/App/index.tsx
#   src/components/BirthdayPage/index.tsx
#   src/components/pages/BirthPlacePage/index.tsx
#   src/routes.ts
2024-04-17 23:29:42 +00:00
e1e506312c fix short path 2024-04-18 00:10:16 +04:00
11c3091269 fix ShortPathOutlet 2024-04-16 23:51:28 +04:00
782dd0fb51 fix always reload payment page 2024-04-16 22:49:07 +04:00
Daniil Chemerkin
c9b737a660 Develop 2024-04-16 17:51:32 +00:00
578c7486d0 fix build 2024-04-16 21:15:57 +04:00
Daniil Chemerkin
f1254d9c2e Develop 2024-04-16 16:58:07 +00:00
Денис Катаев
1ec7135014 Merge branch 'main' into 'develop'
# Conflicts:
#   src/components/App/index.tsx
#   src/components/pages/AdditionalPurchases/pages/AddConsultation/index.tsx
#   src/components/pages/AdditionalPurchases/pages/AddReport/index.tsx
#   src/components/pages/AdditionalPurchases/pages/UnlimitedReadings/index.tsx
#   src/components/pages/Gender/index.tsx
#   src/components/pages/PaymentWithEmailPage/index.tsx
#   src/routes.ts
#   src/services/singlePayment/index.ts
2024-04-16 06:18:30 +00:00
200541f74e fix path bug 2024-04-15 22:55:00 +04:00
ca758e2dfa remove request to hint and remove upload from device 2024-04-15 21:33:16 +04:00
d0bbb296b7 fix: force parameter 2024-04-15 20:39:13 +04:00
95628ba2cf add lines drawing 2024-04-15 19:36:18 +04:00
Денис Катаев
e9afdd802d Epe short path 2024-04-12 22:52:44 +00:00
Денис Катаев
1095ab5d29 Epe short path 2024-04-11 15:54:10 +00:00
1ecd01b518 add jwtToken to epe short path 2024-04-10 00:32:29 +04:00
Денис Катаев
4667e066e0 Preview/advisor short path 2024-04-09 19:19:05 +00:00
Денис Катаев
ef239432d5 add short path for advisor chat 2024-04-09 16:46:50 +00:00
Денис Катаев
73380e0883 Preview/advisors 2024-04-06 20:40:38 +00:00
Денис Катаев
25022ab387 Fix/api host 2024-04-05 20:00:57 +00:00
Daniil Chemerkin
a3b215d6e3 Merge branch 'fix/apiHost' into 'develop'
change api host

See merge request witapp/aura-webapp!73
2024-04-05 19:59:15 +00:00
fbd99cf3c9 change api host 2024-04-05 23:56:05 +04:00
e2a230af88 add key of product 2024-04-05 18:42:11 +04:00
Daniil Chemerkin
2ee80ee89f Develop 2024-04-03 16:49:24 +00:00
Денис Катаев
f088690aa5 Preview/additional purchases 2024-04-03 11:17:58 +00:00
Daniil Chemerkin
6f01a0abea Revert "Merge branch 'preview/additional-purchases' into 'develop'" 2024-04-03 00:03:25 +00:00
Денис Катаев
abf1deee48 feat: add payment, add test page with background video 2024-04-02 23:53:44 +00:00
Денис Катаев
078ccc920e Revert "fix: remove double image key and update filter of subscription plans" 2024-04-02 23:46:48 +00:00
Daniil Chemerkin
000f28190b Develop 2024-04-02 22:03:16 +00:00
Денис Катаев
4a14459cf0 Revert "fix: remove double image key and update filter of subscription plans" 2024-03-27 19:20:25 +00:00
Денис Катаев
238160d610 Preview/advisors 2024-03-27 18:49:58 +00:00
Евгений Пономарев
14dcd3b057 Palmistry discount page 2024-03-25 23:09:06 +00:00
2b5ebed85e fix: merge conflict 2024-03-25 01:32:46 +04:00
Евгений Пономарев
974453cb74 Payment on palmistry/discount page 2024-03-24 21:14:13 +00:00
Денис Катаев
6fbc1c3a21 Revert "fix: remove double image key and update filter of subscription plans" 2024-03-24 21:01:16 +00:00
Victor Ershov
5bd1896465 Merge branch 'hotfix/subPlans' into 'develop'
fix: remove double image key, filter subscription plans

See merge request witapp/aura-webapp!58
2024-03-22 19:59:11 +00:00
Victor Ershov
4c03ec7b61 Merge branch 'hotfix/subPlans' into 'main'
fix: remove double image key, filter subscription plans

See merge request witapp/aura-webapp!57
2024-03-22 19:58:52 +00:00
4deed550cd fix: remove double image key, filter subscription plans 2024-03-22 23:45:25 +04:00
Евгений Пономарев
21de1c6322 Palmistry 2024-03-22 00:28:03 +00:00
Victor Ershov
fa952a75e8 Merge branch 'hotfix/discount-text' into 'develop'
fix: text on discount page

See merge request witapp/aura-webapp!55
2024-03-21 23:03:46 +00:00
3c944745ba fix: text on discount page 2024-03-22 02:26:14 +04:00
Evgenij Ponomarev
99ace176e4 Add new screens in palmistry 2024-03-20 00:59:03 +03:00
Evgenij Ponomarev
d6022cd880 Update birthdate in store 2024-03-12 03:02:50 +07:00
Evgenij Ponomarev
544f26f019 Redirect to home if subscribed 2024-03-12 02:28:51 +07:00
Evgenij Ponomarev
c72e1e9e39 Improve work with subscription plans 2024-03-12 01:10:58 +07:00
Evgenij Ponomarev
28bf5f4778 Fix photo modal 2024-03-11 03:14:04 +07:00
Evgenij Ponomarev
b547d0d51d Fix payment page 2024-03-11 02:44:19 +07:00
Evgenij Ponomarev
40adddb432 Fix build errors 2024-03-11 02:19:05 +07:00
Evgenij Ponomarev
ee47242834 Fix hasNoHeader function 2024-03-11 02:08:20 +07:00
Evgenij Ponomarev
3af1919ef7 Complete palmistry transition 2024-03-11 02:08:19 +07:00
Денис Катаев
866f798117 Preview/additional purchases 2024-03-10 18:30:49 +00:00
Денис Катаев
3aee33898c Preview/discount pages 2024-02-29 15:44:41 +00:00
Денис Катаев
733561a56c Preview/discount pages 2024-02-28 19:18:22 +00:00
Денис Катаев
737cda9770 Preview/discount pages 2024-02-24 01:29:01 +00:00
Денис Катаев
23e674ca78 Preview/discount pages 2024-02-21 21:15:03 +00:00
Денис Катаев
ca220dfdf7 Preview/discount pages 2024-02-21 06:24:50 +00:00
Денис Катаев
e99343a17d Preview/discount pages 2024-02-19 07:00:07 +00:00
Денис Катаев
08b4113c09 Preview/discount pages 2024-02-18 16:54:33 +00:00
Денис Катаев
a46b3a812d Preview/discount pages 2024-02-17 23:29:48 +00:00
Денис Катаев
339ec70766 Preview/discount pages 2024-02-16 14:36:03 +00:00
Денис Катаев
ee71102bad Preview/discount pages 2024-02-14 06:42:15 +00:00
Денис Катаев
a6ea20283d Preview/discount pages 2024-02-13 22:23:12 +00:00
Денис Катаев
fae4569c4f Preview/discount pages 2024-02-11 05:44:06 +00:00
Денис Катаев
1ccc5aa835 Preview/discount pages 2024-02-10 02:30:02 +00:00
Денис Катаев
88f971e88c feat: add yandex metric, smartlook manage 2024-02-07 22:43:54 +00:00
Денис Катаев
6aa8db35d4 feat: add information with partner on trial payment page 2024-02-07 18:04:49 +00:00
Денис Катаев
1028742891 feat: add react-ga4 2024-02-04 23:42:08 +00:00
Денис Катаев
e8b28cd54a feat: add google tag manager 2024-02-04 20:22:53 +00:00
Денис Катаев
8ea2886cf5 fix: subscription route protected 2024-02-04 19:21:23 +00:00
Денис Катаев
2ab0e08918 fix: days of trial period 2024-02-04 17:53:55 +00:00
Денис Катаев
ce1e853f68 feat: some edits 2024-02-04 01:09:49 +00:00
Денис Катаев
cbe40bc7b2 fix: change api url 2024-01-31 19:22:29 +00:00
Денис Катаев
2d6144f0fb feat: some edits 2024-01-31 18:49:27 +00:00
Денис Катаев
415d9c4d7b feat: add and change pages after questionnaire path 2024-01-30 17:59:31 +00:00
Денис Катаев
3520f9f181 fix: payment status 2024-01-23 18:27:22 +00:00
Денис Катаев
037e1078ec feat: questionnaire 2024-01-23 00:15:05 +00:00
Денис Катаев
3c381c9ab9 Questionnaire 2024-01-16 23:32:02 +00:00
c086b6cf3b fix: remove commit 2023-12-31 04:49:54 +04:00
Денис Катаев
37833a888f Questionnaire 2023-12-31 00:33:55 +00:00
Денис Катаев
e9e35f81d3 feat: add modal with required data 2023-12-21 23:21:51 +00:00
Денис Катаев
0f3e376484 fix: paymentRequest 2023-12-21 04:06:33 +00:00
Денис Катаев
d9d8d54dba fix: ref subscription url 2023-12-19 04:00:53 +00:00
Денис Катаев
ac08b62ca2 fix: fix build 2023-12-18 22:23:12 +00:00
Денис Катаев
19d5fa3430 fix: fix double request 2023-12-17 20:48:57 +00:00
Денис Катаев
59783fb846 fix: add timeout createSubscriptionReceipt stripe 2023-12-15 18:45:21 +00:00
Денис Катаев
829f9882b0 fix: payPal redirect 2023-12-15 17:33:50 +00:00