IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,620 Commits 40 Branches 22 Tags 420 MiB
63ee0ca117
Commit Graph

191 Commits

Author SHA1 Message Date
SuhorukovAnton
fc78a0508d TenantDbContext -async part2 2023-03-22 11:27:01 +03:00
SuhorukovAnton
a3800de721 TenantDbContext -async part1 2023-03-20 19:16:00 +03:00
SuhorukovAnton
405ed839bb CoreDbContext -async 2023-03-14 23:44:44 +03:00
pavelbannov
d0fe06052e Db: optimization 2022-12-21 15:57:32 +03:00
pavelbannov
a1daacb4d0 fix 2022-12-21 12:38:47 +03:00
pavelbannov
ca85ef1d49 fix usings 2022-11-07 12:34:50 +03:00
pavelbannov
35592fd306 Quota: fix 2022-10-19 19:27:04 +03:00
pavelbannov
2b95553037 another fix quota 2022-10-19 16:22:13 +03:00
pavelbannov
0ad23f779c fix quota 2022-10-19 14:53:56 +03:00
pavelbannov
a2afba0a28 Quota: fix 2022-10-18 18:13:35 +03:00
SuhorukovAnton
19ad5b0ef2 fix api system 2022-10-17 12:15:44 +03:00
pavelbannov
c7fbe5d87c Billing: fix cache 2022-10-13 12:30:24 +03:00
pavelbannov
1c5bea4fcc fix cache 2022-10-12 17:02:07 +03:00
pavelbannov
803f342d2d Payments: fix delay 2022-10-05 13:38:35 +03:00
pavelbannov
731c32795f Payments: fix cache 2022-10-05 12:12:16 +03:00
pavelbannov
9f9a4c3815 Payments: id from billing 2022-10-04 15:58:59 +03:00
pavelbannov
130e485a0c Payments: refactoring. TrialEnabled setting 2022-09-21 18:44:32 +03:00
pavelbannov
5740b578db Payment: rename 2022-09-19 18:20:21 +03:00
pavelbannov
071f882d53 Payments: customerId = email 2022-09-13 17:29:38 +03:00
pavelbannov
87cfb294ab Quota: CountRoomFeature 2022-09-09 10:27:35 +03:00
pavelbannov
4b183c2fa1 Quota: removed open feature 2022-09-07 16:28:52 +03:00
pavelbannov
941689b6ca Quota: refactoring 2022-09-06 12:14:08 +03:00
pavelbannov
ea2d97b6f5 Api: removed unused columns 2022-08-30 19:01:12 +03:00
pavelbannov
641695ec51 Removed paymentManager, DbButton, DbTenantPartner. Added PaymentConfiguration, PaymentsController 2022-08-25 23:09:12 +03:00
Sergey Linnik
7854acbac0 CoreCommon: return payment link if available only 2022-08-25 09:47:07 +03:00
Sergey Linnik
6cededcfba CoreCommon: check exists payment id in quota 2022-08-25 09:16:09 +03:00
Sergey Linnik
551ba285d6 CoreCommon: do not modify the source quota when multiplying 2022-08-25 09:15:59 +03:00
pavelbannov
7a9e46bf54 Quota: refactoring 2022-08-24 19:05:15 +03:00
Sergey Linnik
301ac773af CoreCommon: checking quotas before update (TODO) 2022-08-18 14:17:55 +03:00
Sergey Linnik
b6559781ea CoreCommon: update subscription 2022-08-12 15:57:35 +03:00
Sergey Linnik
ef7419c9ae CoreCommon: payment url with quantity of products 2022-08-12 15:57:35 +03:00
Sergey Linnik
3c926c4011 Api: backUrl for stripe link 2022-08-12 15:57:33 +03:00
Sergey Linnik
6f98ad9c5f CoreCommon: get stripe portal link 2022-08-12 15:57:33 +03:00
Sergey Linnik
a140de338b CoreCommon: email in payment 2022-08-12 15:57:33 +03:00
Sergey Linnik
7ffdb8bb44 CoreCommon: id as primary key in TariffRow table 2022-08-12 15:57:32 +03:00
Sergey Linnik
44b75f71f9 CoreCommon: fix parse payment 2022-08-12 15:57:32 +03:00
Sergey Linnik
9fcefe157d Api: added method portal/payment/url 2022-08-12 15:57:32 +03:00
Sergey Linnik
c697a12f80 CoreCommon: fix test arg 2022-08-12 15:57:32 +03:00
Sergey Linnik
bcc5b220a8 CoreCommon: switch to stripe 2022-08-12 15:57:31 +03:00
Sergey Linnik
bcd7711e24 CoreCommon: sync request to billing 2022-08-12 15:57:31 +03:00
Sergey Linnik
90c19508ea CoreCommon: tariff contains a list of quotas 2022-08-12 15:57:31 +03:00
Sergey Linnik
751c76c015 CoreCommon: Prolongable field in Tariff is not used 2022-08-12 15:57:30 +03:00
Sergey Linnik
4218e45601 CoreCommon: rename AvangateId field to ProductId 2022-08-12 15:57:28 +03:00
Sergey Linnik
40e58d73b2 CoreCommon: removed autorenewal field 2022-08-12 15:57:27 +03:00
pavelbannov
8d89d8e8f2 Common: added dbcontext pool 2022-07-28 15:29:03 +03:00
Vashchuk Nikita
e49d082fa3 Merge branch 'develop' into feature/migrations-fix 
# Conflicts:
#	common/ASC.Core.Common/EF/Model/Core/Acl.cs
#	common/ASC.Core.Common/GlobalUsings.cs
#	common/ASC.Core.Common/Messaging/EventMessage.cs
#	common/ASC.Core.Common/Messaging/LoginEvent.cs
#	common/ASC.Core.Common/Messaging/MessageTarget.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20211012145320_CoreDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20220708104408_FilesDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20220708104408_FilesDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20220708104428_MessagesContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20220708104428_MessagesContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20211012145322_UserDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20220708104402_UserDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/MySqlUserDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/CoreDbContextPostgreSql/20211012145321_CoreDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20220708104409_FilesDbContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20220708104409_FilesDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20220708104429_MessagesContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20220708104429_MessagesContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/TenantDbContextPostgreSql/20211012145343_TenantDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/20211012145323_UserDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/20220708104403_UserDbContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/PostgreSqlUserDbContextModelSnapshot.cs
#	common/ASC.Data.Backup.Core/Migrations/MySql/BackupsContextMySql/20220708104422_BackupsContextMySql.Designer.cs
#	common/ASC.Data.Backup.Core/Migrations/PostgreSql/BackupsContextPostgreSql/20220708104423_BackupsContextPostgreSql.Designer.cs
#	common/ASC.MessagingSystem/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
#	common/ASC.MessagingSystem/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.Designer.cs
#	common/ASC.Resource.Manager/ResourceData.cs
#	common/services/ASC.AuditTrail/GlobalUsings.cs
#	products/ASC.Files/Core/Core/EF/DbFilesThirdpartyAccount.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
#	products/ASC.Files/Core/Migrations/PostgreSql/FilesDbContextPostgreSql/20211022170841_FilesDbContextPostgreSql.cs
#	products/ASC.Files/Core/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
#	web/ASC.Web.Api/GlobalUsings.cs
 2022-07-11 13:28:49 +03:00
Vashchuk Nikita
4628769136 fix Contexts, 
fix migrations,
removed MailDbContext.cs,
moved ResourceDbContext.cs
 2022-07-08 14:24:18 +03:00
pavelbannov
8ea04bcc81 Merge branch 'develop' into feature/12.0 
# Conflicts:
#	common/ASC.MessagingSystem/Data/MessagesRepository.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
 2022-06-17 19:19:00 +03:00
pavelbannov
a861268e4f moved from ddf515b8 2022-06-01 17:07:08 +03:00
Alexey Bannov
3ebd67f444 merge from develop 2022-06-01 14:44:30 +03:00