Commit Graph

356 Commits

Author SHA1 Message Date
1df8502813 Merge branch 'dev' into 'main'
Dev

See merge request frontend/marketplace!28
2023-08-04 14:49:05 +00:00
ca4fe18ac5 Dev 2023-08-04 14:49:05 +00:00
8aba098364 Merge branch 'dev' into 'main'
+tp кастомы по 5к

See merge request frontend/marketplace!25
2023-08-01 00:57:06 +00:00
e4f3a6c26b +tp кастомы по 5к 2023-08-01 03:56:03 +03:00
bf40ca9317 Merge branch 'dev' into 'main'
Dev

See merge request frontend/marketplace!24
2023-07-31 21:21:01 +00:00
d3d75cb004 old dialog navbar 2023-08-01 00:20:17 +03:00
3641d4a578 Merge branch 'mobile-carousel' into 'dev'
Mobile carousel

See merge request frontend/marketplace!23
2023-07-31 16:49:24 +00:00
IlyaDoronin
f0e7c02964 feat: TariffCard tooltip 2023-07-31 18:51:40 +03:00
IlyaDoronin
01e02f3cd9 fix: TariffCard styles 2023-07-31 18:34:45 +03:00
IlyaDoronin
ec33a587c6 feat: slider mobile styles 2023-07-31 17:31:47 +03:00
fcc5ab7840 Merge branch 'verification-fixes' into 'main'
fix: verification status

See merge request frontend/marketplace!21
2023-07-28 16:39:07 +00:00
b572f162a0 Merge branch 'deploy' into 'main'
fix: design

See merge request frontend/marketplace!20
2023-07-28 16:37:39 +00:00
IlyaDoronin
37ff9c2e30 fix: design bugs 2023-07-28 18:56:19 +03:00
IlyaDoronin
73ab4728be fix: design 2023-07-28 16:24:21 +03:00
IlyaDoronin
84c45524b4 fix: verification status 2023-07-28 09:42:44 +03:00
ff77f95f12 Merge branch 'dev' into 'main'
upgrade kitui package

See merge request frontend/marketplace!18
2023-07-27 19:04:38 +00:00
e1dd6d95b7 хедер главной без выбора тарифа 2023-07-27 21:48:11 +03:00
nflnkr
912d16c22d add custom tariffs value inputs 2023-07-27 21:48:11 +03:00
nflnkr
c1894398f2 add minwidth to some icons 2023-07-27 21:48:11 +03:00
nflnkr
35415075e6 fix custom tariff date display 2023-07-27 21:48:11 +03:00
ac1af76c2b merge design-act into dev 2023-07-27 21:48:08 +03:00
nflnkr
0c398d7252 upgrade kitui package
fix cart to use new types
2023-07-27 21:32:05 +03:00
nflnkr
c40e91e36e use tariff type from kitui package 2023-07-27 21:32:05 +03:00
nflnkr
0ed279c050 refactor calcCart function 2023-07-27 21:32:05 +03:00
nflnkr
f75f951c60 upgrade kitui package 2023-07-27 21:32:05 +03:00
nflnkr
f4c36abfed fix payments 2023-07-27 21:32:05 +03:00
nflnkr
1a18d91da4 remove unused types 2023-07-27 21:32:05 +03:00
nflnkr
3477bea742 fix returnurl 2023-07-27 21:32:05 +03:00
nflnkr
6df7146396 fix hook deps 2023-07-27 21:32:05 +03:00
nflnkr
1c6fdbaa5c add cart tests 2023-07-27 21:32:05 +03:00
fedf8b93ba Merge branch 'send-documents' into 'main'
feat: send pdf documents

See merge request frontend/marketplace!15
2023-07-21 01:00:59 +00:00
IlyaDoronin
55e9255f59 fix: conflicts 2023-07-20 10:54:13 +03:00
IlyaDoronin
562e741547 fix: default document url 2023-07-19 15:50:37 +03:00
nflnkr
048f442204 fix cart field name 2023-07-18 15:00:08 +03:00
IlyaDoronin
32c5d5d6ed fix: display files from server 2023-07-18 13:47:14 +03:00
nflnkr
3115747ee1 fix calcCart 2023-07-14 19:12:43 +03:00
nflnkr
21586a0603 fix calcCart to use reactive discounts 2023-07-14 16:55:01 +03:00
nflnkr
6ac5c61c96 use cart types from package 2023-07-14 16:48:06 +03:00
nflnkr
dde07629c0 refactor tariff prices to use reactive values 2023-07-14 16:41:31 +03:00
nflnkr
d051705804 refactor totalprice props 2023-07-14 15:47:36 +03:00
ade3a102e8 Merge branch 'dev' into 'main'
fix: remove cart price from custom tariff price summary

See merge request frontend/marketplace!14
2023-07-13 23:54:50 +00:00
9672db143f fix: remove cart price from custom tariff price summary 2023-07-14 02:25:48 +03:00
43695f18a9 Merge branch 'dev' into 'main'
fix cart & custom tariff calculations

See merge request frontend/marketplace!13
2023-07-13 20:21:36 +00:00
nflnkr
a6ac175f22 fix cart & custom tariff calculations
use discount type from kitui package
use functions for finding discounts from kitui package
remove old discount types
2023-07-13 21:59:38 +03:00
IlyaDoronin
0a4d30be72 feat: download PDF 2023-07-13 16:30:47 +03:00
IlyaDoronin
4a25001e4b fix: get verification 2023-07-13 15:11:30 +03:00
f77adf6ded Merge branch 'dev' into 'main'
Dev

See merge request frontend/marketplace!12
2023-07-12 17:19:00 +00:00
a72f8618ee fix: use discounts in custom tariffs 2023-07-12 03:31:00 +03:00
3043800754 fix: cart and tariffs use backend discounts fully 2023-07-11 04:33:36 +03:00
d6f07c0f28 getDiscounts теперь хук 2023-07-11 00:25:25 +03:00