Commit Graph

213 Commits

Author SHA1 Message Date
Денис Катаев
3a87ee5c93 AW-58-newJWTTokenMethod 2024-05-04 20:11:35 +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
Денис Катаев
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
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
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