Commit Graph

953 Commits

Author SHA1 Message Date
nflnkr
d327033c1b replace history entry when navigating from /afterpay 2024-03-30 15:07:45 +03:00
Tamara
6cb618ed1e исправление поехавшей верстки в тарифах 2024-03-29 23:46:14 +03:00
Tamara
b333527103 карточка оплаты банковской картой 2024-03-29 23:31:06 +03:00
aleksandr-raw
9523bb290f updated oferta documentation 2024-03-29 12:14:48 +04:00
aleksandr-raw
82d451cba1 Created the ofertaQuizDevelop documentation and added it to the footer. 2024-03-29 10:39:25 +04:00
1f92ae6fb1 Merge branch 'dev' into 'staging'
Dev

See merge request frontend/marketplace!152
2024-03-27 21:55:48 +00:00
Tamara
42150dc3a4 правка логики перевода ошибок 2024-03-28 00:18:24 +03:00
e19e234c1c применение промокода из fastlink 2024-03-27 22:27:15 +03:00
a984ecbe7e Update Dockerfile 2024-03-27 13:48:28 +00:00
9c65e6fc0f Update Dockerfile 2024-03-27 13:48:06 +00:00
nflnkr
a3f5143a10 use custom tariffs types from kitui 2024-03-27 16:13:33 +03:00
Tamara
19004ae833 -- 2024-03-27 16:11:53 +03:00
nflnkr
22f74ba27b use cart calc functions from kitui 2024-03-27 13:32:39 +03:00
bb4827dd97 Merge branch 'dev' into 'staging'
change cart and tariffs calculation logic

See merge request frontend/marketplace!150
2024-03-27 06:03:21 +00:00
9b7314985e Merge branch 'page-404' into dev 2024-03-27 09:02:26 +03:00
nflnkr
10e2022035 rework calcCart
use swr for discounts datafetching
remove discounts store
refetch discount on promocode apply
2024-03-26 17:49:35 +03:00
nflnkr
6607919624 add useCart debug value 2024-03-23 15:36:47 +03:00
nflnkr
73741a97e3 update cart test results 2024-03-23 10:32:06 +03:00
nflnkr
2d41e125df pass userId to calcCart 2024-03-22 22:53:00 +03:00
nflnkr
79c4d97732 Merge branch 'cart-calc' into promocode-field 2024-03-22 20:59:43 +03:00
nflnkr
ff0c23c79f upgrade @frontend/kitui 2024-03-22 20:59:16 +03:00
nflnkr
a2ded0d895 Merge branch 'cart-calc' into promocode-field 2024-03-22 20:47:07 +03:00
nflnkr
337028f023 add promocode expired error message display 2024-03-22 15:37:53 +03:00
nflnkr
a424a8030e extract promocode field component 2024-03-22 14:47:37 +03:00
nflnkr
5f5ff2d0c4 fix promocode activation error message 2024-03-22 14:46:46 +03:00
nflnkr
8f3af3a325 add activate promocode request content-type 2024-03-21 21:15:40 +03:00
nflnkr
82e2f550c7 add apply promocode button 2024-03-21 19:34:44 +03:00
IlyaDoronin
cc8f3bea26 feat: Page 404 2024-03-20 10:56:36 +03:00
ebe7c3faa9 Merge branch 'dev' into 'staging'
Dev

See merge request frontend/marketplace!148
2024-03-20 02:05:32 +00:00
3ffa3418c0 возвратный урл платёжки ведёт на страницу спасибо 2024-03-20 05:04:27 +03:00
8349a631c0 стр спс за денежку 2024-03-20 03:36:53 +03:00
nflnkr
cdb7b4efc6 add vitest to test cart 2024-03-19 20:10:42 +03:00
nflnkr
61070c26d1 add cart test data 2024-03-19 19:25:47 +03:00
nflnkr
76a4a8ea4b fix types 2024-03-19 18:52:17 +03:00
nflnkr
285aa5d89c fix privilege types 2024-03-19 18:17:57 +03:00
nflnkr
7b2a15f925 reset not enough money amount when deleting cart items 2024-03-18 17:30:28 +03:00
nflnkr
c98c670d6f fix minor typerror 2024-03-18 17:21:56 +03:00
nflnkr
9b67ffaeef rename jsx file to tsx 2024-03-18 17:21:34 +03:00
nflnkr
b197745563 Merge branch 'dev' into cart-calc 2024-03-18 17:19:58 +03:00
nflnkr
63627b96d3 move notEnoughMoneyAmount to global state 2024-03-18 17:10:34 +03:00
nflnkr
0990dc081f change cart and tariffs calculation logic
use swr for cart tariffs datafetching
remove console clutter
remove cart store
some fixes
2024-03-18 17:02:28 +03:00
542f395962 Merge branch 'dev' into 'staging'
--

See merge request frontend/marketplace!147
2024-03-17 09:23:15 +00:00
72ebc7b24b -- 2024-03-17 12:22:49 +03:00
cc4d01d26b Merge branch 'dev' into 'staging'
Dev

See merge request frontend/marketplace!146
2024-03-17 09:06:54 +00:00
Tamara
6ab53ee318 запрос на оплату разными способами 2024-03-17 00:41:48 +03:00
IlyaDoronin
7f56e0bc03 fix: full-screen 2024-03-14 18:13:12 +03:00
548c88187b Merge branch 'dev' into 'staging'
temporarily fix cart history

See merge request frontend/marketplace!144
2024-03-14 02:21:50 +00:00
b0e0e82378 Merge branch 'support-chat-fixes' into dev 2024-03-14 05:21:19 +03:00
IlyaDoronin
3519bd6cbd fix: empty messages 2024-03-13 17:43:07 +03:00
IlyaDoronin
be6949022f fix: loading messages 2024-03-13 17:36:47 +03:00