Commit Graph

1013 Commits

Author SHA1 Message Date
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
nflnkr
fdd38aa42f temporarily fix cart history
remove console clutter
upgrade typescript version
2024-03-12 20:07:56 +03:00
IlyaDoronin
76f72aa9d3 fix: support 2024-03-12 16:59:47 +03:00
IlyaDoronin
d834dbd906 fix: support logic 2024-03-12 13:28:13 +03:00
a39fa9949e Merge branch 'dev' into 'staging'
version

See merge request frontend/marketplace!142
2024-03-11 21:49:04 +00:00
e2355b1453 version 2024-03-12 00:46:41 +03:00
0555a7c637 Merge branch 'dev' into 'staging'
move notEnoughMoneyAmount to global state

See merge request frontend/marketplace!141
2024-03-11 20:46:38 +00:00
e7c87e1d78 отправка медиа в чатах тп 2024-03-11 23:45:20 +03:00
b9a81321b1 Merge branch 'support-chat-uploading' into dev 2024-03-11 23:27:48 +03:00
9acb2e1406 отображение медиа в новой вкладке и в чатах тп 2024-03-11 23:27:19 +03:00
nflnkr
e47c1e66a0 fix login button text 2024-03-11 21:38:03 +03:00
nflnkr
f18465393e move notEnoughMoneyAmount to global state
reset notEnoughMoneyAmount on tariffs change
2024-03-11 21:32:10 +03:00
nflnkr
c6cb63bb45 total price at custom tariff page show cart price 2024-03-11 21:27:06 +03:00
nflnkr
3f23b7b2aa fix cart drawer not enough money autocomplete 2024-03-11 21:00:24 +03:00
IlyaDoronin
0f91f0037d feat: support chat upload file 2024-03-11 19:02:37 +03:00
a2ea0a1248 Merge branch 'dev' into 'staging'
перенос кнопок в корзине, тариф с шильдиком

See merge request frontend/marketplace!140
2024-03-03 21:30:39 +00:00
Tamara
c730993fef перенос кнопок в корзине, тариф с шильдиком 2024-03-04 00:25:14 +03:00
e36fc7e303 Merge branch 'payment' into 'staging'
РС принимает число

See merge request frontend/marketplace!138
2024-02-23 00:04:14 +00:00
e81a5d50a6 РС принимает число 2024-02-23 03:02:22 +03:00
833dd025aa Merge branch 'payment' into 'staging'
РС принимает строку

See merge request frontend/marketplace!137
2024-02-22 22:36:45 +00:00
65ff25a122 РС принимает строку 2024-02-23 01:36:06 +03:00
b91ac38da7 Merge branch 'payment' into 'staging'
test autorisation from quiz

See merge request frontend/marketplace!136
2024-02-22 21:36:08 +00:00
c5dc6166ae test autorisation from quiz 2024-02-23 00:35:29 +03:00
b0e3a92e13 Merge branch 'payment' into 'staging'
test autorisation from quiz

See merge request frontend/marketplace!135
2024-02-22 21:19:42 +00:00
c85c3295f5 test autorisation from quiz 2024-02-23 00:19:07 +03:00
1bdcd355ba Merge branch 'payment' into 'staging'
test autorisation from quiz

See merge request frontend/marketplace!134
2024-02-22 21:06:29 +00:00
2717c7fd3b test autorisation from quiz 2024-02-23 00:05:56 +03:00
5a39604b52 Merge branch 'payment' into 'staging'
test autorisation from quiz

See merge request frontend/marketplace!133
2024-02-22 20:39:20 +00:00
47bbd3b805 test autorisation from quiz 2024-02-22 23:35:11 +03:00
61940073ca Merge branch 'payment' into 'staging'
fix: payment

See merge request frontend/marketplace!131
2024-02-21 18:27:10 +00:00
ea8c89d7ec РС всегда оплатить 2024-02-21 21:26:06 +03:00
acb08e7918 Merge branch 'payment' into 'staging'
Payment

See merge request frontend/marketplace!132
2024-02-21 15:18:14 +00:00
IlyaDoronin
2982c37b12 feat: tempCustomTariffsResponse 2024-02-21 18:15:22 +03:00
IlyaDoronin
01968cd57e fix: payment 2024-02-21 12:46:51 +03:00
1ea4064229 Merge branch 'dev' into 'staging'
Dev

See merge request frontend/marketplace!130
2024-02-20 04:43:49 +00:00
08edc8205f модалки при блюре 2024-02-20 07:40:58 +03:00
0ce33baf56 сообщение о нехватке денег не всплывает, при нехватке кидает на пополнение 2024-02-20 07:22:10 +03:00
9d4f22812b Merge branch 'dev' into 'staging'
предупреждение о смене логина пароля и обработка ошибки корзины

See merge request frontend/marketplace!129
2024-02-19 20:48:34 +00:00
ec8c8e3eb8 предупреждение о смене логина пароля и обработка ошибки корзины 2024-02-19 23:21:17 +03:00
b2de52aa02 Merge branch 'payment-response' into 'staging'
Payment response

See merge request frontend/marketplace!128
2024-02-16 18:20:18 +00:00
584e4666c1 отправка от 900р 2024-02-16 18:27:39 +03:00