Commit Graph

464 Commits

Author SHA1 Message Date
c6c5e85a71 Update admin.conf 2024-04-17 23:15:22 +00:00
b0ff7f0b39 Merge branch 'staging' into 'main'
add promocode datafetching

See merge request frontend/admin!73
2024-04-16 23:52:37 +00:00
9fb1422c87 -- 2024-04-16 22:52:21 +03:00
848834c1d4 Merge branch 'dev' into 'staging'
мейк реквест в обёртке

See merge request frontend/admin!72
2024-04-16 19:02:05 +00:00
b8c4a44867 мейк реквест в обёртке 2024-04-16 22:01:22 +03:00
5d6df42b15 kit 82 2024-04-16 13:13:10 +03:00
a294c98dff -- 2024-04-16 12:24:23 +03:00
80b2d48693 Merge branch 'dev' into staging 2024-04-16 11:54:06 +03:00
98eebec4b5 Merge branch 'fast-links-list-fix' into 'dev'
fix: fast links list

See merge request frontend/admin!70
2024-04-16 08:52:22 +00:00
490b158bb9 up kit 81v 2024-04-16 11:44:39 +03:00
IlyaDoronin
4181d6d9ca fix: fast links list 2024-04-15 13:17:32 +03:00
nflnkr
aa3dbe6761 fix usePromocodes deps array 2024-04-14 20:17:13 +03:00
nflnkr
32e9ccc640 fix getAllPromocodes request item limit 2024-04-14 20:15:48 +03:00
475e7d0631 Merge branch 'dev' into 'staging'
установка полей перед созданием

See merge request frontend/admin!69
2024-04-13 12:40:03 +00:00
1d9be4f223 установка полей перед созданием 2024-04-13 15:38:46 +03:00
f7eda79bec Merge branch 'dev' into staging 2024-04-13 02:44:41 +03:00
541dc1610e fl more info 2024-04-13 02:42:30 +03:00
IlyaDoronin
cf169c0d58 feat: StatisticsModal privilege 2024-04-12 16:38:50 +03:00
383d4a37d3 fl to quiz 2024-04-12 15:58:58 +03:00
92de3d2e4a Merge branch 'dev' into 'staging'
fl promocode for hub

See merge request frontend/admin!66
2024-04-12 09:27:38 +00:00
2a12526a13 fl to hub & shub 2024-04-12 12:26:36 +03:00
605409d38f fl promocode for hub 2024-04-12 03:02:26 +03:00
682983f6ba Merge branch 'dev' into 'staging'
сервискей для привилегии

See merge request frontend/admin!65
2024-04-11 19:48:46 +00:00
6081e83aee сервискей для привилегии 2024-04-11 22:48:10 +03:00
5a31cb5fde Merge branch 'dev' into 'staging'
Dev

See merge request frontend/admin!64
2024-04-10 15:01:05 +00:00
4f11fb0215 Merge branch 'create-promocode-privilege' into 'dev'
feat: privilegeId

See merge request frontend/admin!63
2024-04-10 14:55:43 +00:00
IlyaDoronin
b2c2f28a8d feat: privilegeId 2024-04-10 17:52:27 +03:00
db4465c48d Merge branch 'dev' into 'staging'
upgrade kitui

See merge request frontend/admin!62
2024-04-03 21:54:43 +00:00
6483c9bc6d статистика квиза 2024-04-04 00:53:59 +03:00
36970ac6b6 Merge branch 'promocodes-statistic' into dev 2024-04-03 22:00:47 +03:00
IlyaDoronin
3f3c4125ba fix: swr 2024-04-02 17:56:23 +03:00
IlyaDoronin
5f593cf8dc fix: statistics modal link 2024-04-02 16:21:17 +03:00
IlyaDoronin
fc5096d238 fix: statistics 2024-04-02 14:43:00 +03:00
78c3e9683d создание фастлинк и его копирование 2024-03-30 23:54:37 +03:00
f3b66d92e0 вывод таблицы 2024-03-30 23:19:53 +03:00
Tamara
153b518914 запросы статистики промокодов(сырые, нужны доработки) 2024-03-29 23:27:07 +03:00
Tamara
7daa2f7e99 квизы в панели юзера(возможно требует доработок) 2024-03-28 23:31:28 +03:00
IlyaDoronin
9e7d44e6fc fix: conflicts resolved 2024-03-28 17:08:38 +03:00
nflnkr
e2f5781d0c trim promocode field on use 2024-03-27 20:34:17 +03:00
nflnkr
e09443b4c6 fix cart promocode apply 2024-03-27 20:31:51 +03:00
nflnkr
473f77568c upgrade kitui
use cart calc functions from kitui
fix cart discount list display
fix types
2024-03-27 17:50:14 +03:00
IlyaDoronin
7bc2219d86 fix: styles 2024-03-27 10:35:28 +03:00
1f133351e5 разнесение сообщений по сторонам от разных отправителей 2024-03-27 09:31:30 +03:00
IlyaDoronin
fd80f38b4f feat: Promocode statistics modal 2024-03-26 18:41:22 +03:00
nflnkr
e4ecd541ff round promocode discount value 2024-03-22 13:27:52 +03:00
nflnkr
3ef684fdfe fix promocode creation date field 2024-03-22 13:27:36 +03:00
nflnkr
001eb4ee02 fix promocode creation error display 2024-03-22 13:27:15 +03:00
44d03b4e29 Merge branch 'dev' into 'staging'
fix: support

See merge request frontend/admin!59
2024-03-14 02:24:06 +00:00
IlyaDoronin
9933f7cfbd fix: support 2024-03-12 16:57:32 +03:00
9f908a92c3 Merge branch 'dev' into 'staging'
add promocode datafetching

See merge request frontend/admin!57
2024-03-11 22:04:47 +00:00