Commit Graph

1018 Commits

Author SHA1 Message Date
ArtChaos189
aca962a087 update discount Box 2023-12-16 00:27:03 +03:00
783fce1112 Merge branch 'dev' into 'main'
Dev

See merge request frontend/marketplace!74
2023-12-15 19:50:42 +00:00
c81f700a2c feat: disount badges in all places 2023-12-15 22:49:10 +03:00
18fdb74230 feat: tariff description handling 2023-12-15 20:21:50 +03:00
51c73c72d9 feat: add discount badges 2023-12-15 16:53:36 +03:00
9cd8fdc645 feat: day custom tariff doesn't allow to set value less than 30 days 2023-12-15 14:11:08 +03:00
664ff5e57f Merge branch 'dev' into 'main'
fix: privilege dicount calculation onamoun

See merge request frontend/marketplace!73
2023-12-13 22:50:15 +00:00
e36ac75838 fix: privilege dicount calculation onamoun 2023-12-14 01:48:07 +03:00
51965d2763 Merge branch 'dev' into 'main'
fix: product discounts are based on amount

See merge request frontend/marketplace!72
2023-12-13 01:54:18 +00:00
cbb9e180bf fix: product discounts are based on amount 2023-12-13 04:51:38 +03:00
0bce2ff74a Merge branch 'dev' into 'main'
Dev

See merge request frontend/marketplace!71
2023-12-10 23:31:23 +00:00
nflnkr
7b7b825806 fix custom tariffs max value access 2023-12-06 14:55:28 +03:00
Tamara
4672a2ce27 кнопка личный кабинет у авторизованных пользователях 2023-11-27 20:45:23 +03:00
48dcc57a47 Merge branch 'dev' into 'main'
запрос на ранее купленные тарифы

See merge request frontend/marketplace!70
2023-11-26 20:58:56 +00:00
Tamara
ad3420e7c1 запрос на ранее купленные тарифы 2023-11-26 23:57:31 +03:00
abf72d117f Merge branch 'dev' into 'main'
Dev

See merge request frontend/marketplace!69
2023-11-11 10:46:00 +00:00
nflnkr
47d83997e4 fix discount applying 2023-11-10 17:52:31 +03:00
nflnkr
c0113af9cf fix tariff history 2023-11-10 17:51:50 +03:00
c158934de8 Merge branch 'dev' into 'main'
DISABLE_ESLINT_PLUGIN=true

See merge request frontend/marketplace!68
2023-11-08 11:59:17 +00:00
a341badcfc DISABLE_ESLINT_PLUGIN=true 2023-11-08 14:58:40 +03:00
bbdbafe02a Merge branch 'dev' into 'main'
Dev

See merge request frontend/marketplace!67
2023-11-07 21:51:43 +00:00
08d9f7e2ac Update .gitlab-ci.yml 2023-11-07 21:32:09 +00:00
Tamara
c94fe7c950 Текст для FAQ 2023-11-07 23:38:13 +03:00
d69d27acb4 add husky && eslinter 2023-11-06 02:48:07 +03:00
0a8d46e086 Merge branch 'dev' into 'main'
navbars name

See merge request frontend/marketplace!66
2023-10-28 21:05:46 +00:00
Tamara
69e677ccaa navbars name 2023-10-28 17:20:12 +03:00
91fd8a675a Merge branch 'dev' into 'main'
Dev

See merge request frontend/marketplace!65
2023-10-27 23:45:33 +00:00
38d3e3b535 merge 2023-10-28 02:43:29 +03:00
9b7be15cf4 fix verification methods patch && post 2023-10-28 02:13:54 +03:00
nflnkr
4490536276 wrap components with error boundaries, minox fixes 2023-10-27 20:38:06 +03:00
nflnkr
ebecee8a49 add error send request batching 2023-10-27 13:57:34 +03:00
nflnkr
0c493b839e fix wrong svg prop names 2023-10-27 13:53:52 +03:00
nflnkr
f86e993da1 add error boundary to history list 2023-10-26 17:14:24 +03:00
nflnkr
e6a57373fb fix custom tariffs nko discount apply 2023-10-26 15:33:03 +03:00
nflnkr
35547195c4 fix cart drawer redirect 2023-10-26 14:29:27 +03:00
nflnkr
4705945781 fix not enough money number parsing 2023-10-26 14:27:41 +03:00
nflnkr
68c6c86432 fix nko discount applying to non-nko user 2023-10-26 13:56:40 +03:00
nflnkr
d7f8c32b6d fix adding to cart 2023-10-26 13:39:58 +03:00
94219fb9a0 Merge branch 'dev' into 'main'
Dev

See merge request frontend/marketplace!64
2023-10-25 10:43:42 +00:00
4768ad8c29 диалоги гамбургеров + планш/моб версии главной 2023-10-25 13:43:12 +03:00
683c63f192 замена текстов главной 2023-10-24 14:49:39 +03:00
e2f7668261 Merge branch 'dev' into 'main'
Dev

See merge request frontend/marketplace!63
2023-10-20 17:06:48 +00:00
41bc8bd470 перевод текста серверных ошибок на русский 2023-10-18 19:57:22 +03:00
c1db530e86 обработка ошибки тарифа не существующего в БД 2023-10-18 19:06:15 +03:00
a6ef841657 Кнопка повторение заказа из корзины 2023-10-18 10:39:07 +03:00
035ad88ba3 fix history types 2023-10-17 00:05:18 +03:00
ce7587d0dd Merge branch 'dev' into 'main'
fix createdAt in history

See merge request frontend/marketplace!62
2023-10-16 11:38:58 +00:00
feb64933de fix createdAt in history 2023-10-16 14:37:54 +03:00
e20247cacb Merge branch 'dev' into 'main'
Dev

See merge request frontend/marketplace!61
2023-10-15 18:01:56 +00:00
nflnkr
bd8511fe97 fix nko discount applying 2023-10-14 13:19:43 +03:00