diff --git a/api/modules/Kurs.Notifications/Kurs.Notifications.Domain/Entities/Notification.cs b/api/modules/Kurs.Notifications/Kurs.Notifications.Domain/Entities/Notification.cs index 36c967ed..c77e51ec 100644 --- a/api/modules/Kurs.Notifications/Kurs.Notifications.Domain/Entities/Notification.cs +++ b/api/modules/Kurs.Notifications/Kurs.Notifications.Domain/Entities/Notification.cs @@ -10,7 +10,7 @@ public class Notification : FullAuditedEntity public required string NotificationType { get; set; } // Bildirim tipine göre bildirimi alacak olan hedef bilgisini içerir - public required string Identifier { get; set; } //UserId, Email, Phone.. + public required string Identifier { get; set; } //UserId, Email, PhoneNumber.. public Guid? UserId { get; set; } public required string Message { get; set; } diff --git a/api/src/Kurs.Platform.Application.Contracts/Banks/BankDto.cs b/api/src/Kurs.Platform.Application.Contracts/Banks/BankDto.cs index 38e90d3d..c84f8e6c 100644 --- a/api/src/Kurs.Platform.Application.Contracts/Banks/BankDto.cs +++ b/api/src/Kurs.Platform.Application.Contracts/Banks/BankDto.cs @@ -14,6 +14,6 @@ public class BankDto : AuditedEntityDto public string City { get; set; } public string PostalCode { get; set; } public string Country { get; set; } - public string Phone { get; set; } + public long PhoneNumber { get; set; } public string Email { get; set; } } \ No newline at end of file diff --git a/api/src/Kurs.Platform.Application.Contracts/Intranet/EmployeeDto.cs b/api/src/Kurs.Platform.Application.Contracts/Intranet/EmployeeDto.cs index 6329811b..6676e944 100644 --- a/api/src/Kurs.Platform.Application.Contracts/Intranet/EmployeeDto.cs +++ b/api/src/Kurs.Platform.Application.Contracts/Intranet/EmployeeDto.cs @@ -21,8 +21,8 @@ public class EmployeeDto : FullAuditedEntityDto public string District { get; set; } public string Street { get; set; } public string PostalCode { get; set; } - public string Phone { get; set; } - public string PersonalPhone { get; set; } + public long? PhoneNumber { get; set; } + public long? MobileNumber { get; set; } public string Email { get; set; } public string Address1 { get; set; } public string Address2 { get; set; } @@ -30,7 +30,7 @@ public class EmployeeDto : FullAuditedEntityDto // Emergency contact public string EmergencyContactName { get; set; } public string EmergencyContactRelationship { get; set; } - public string EmergencyContactPhone { get; set; } + public long EmergencyContactPhoneNumber { get; set; } public DateTime HireDate { get; set; } public DateTime? TerminationDate { get; set; } diff --git a/api/src/Kurs.Platform.Application.Contracts/Intranet/VisitorDto.cs b/api/src/Kurs.Platform.Application.Contracts/Intranet/VisitorDto.cs index f26f0f19..255fa14c 100644 --- a/api/src/Kurs.Platform.Application.Contracts/Intranet/VisitorDto.cs +++ b/api/src/Kurs.Platform.Application.Contracts/Intranet/VisitorDto.cs @@ -10,7 +10,7 @@ public class VisitorDto : FullAuditedEntityDto public string FullName { get; set; } public string CompanyName { get; set; } public string Email { get; set; } - public string Phone { get; set; } + public long PhoneNumber { get; set; } public string Purpose { get; set; } public DateTime VisitDate { get; set; } public DateTime? CheckIn { get; set; } diff --git a/api/src/Kurs.Platform.Application.Contracts/ListForms/DynamicApi/CreateUpdateTenantInput.cs b/api/src/Kurs.Platform.Application.Contracts/ListForms/DynamicApi/CreateUpdateTenantInput.cs index a58806ed..1a50ee32 100644 --- a/api/src/Kurs.Platform.Application.Contracts/ListForms/DynamicApi/CreateUpdateTenantInput.cs +++ b/api/src/Kurs.Platform.Application.Contracts/ListForms/DynamicApi/CreateUpdateTenantInput.cs @@ -22,9 +22,9 @@ public class CreateUpdateTenantInput public string Address1 { get; set; } public string Address2 { get; set; } public string PostalCode { get; set; } - public long Phone { get; set; } - public long Mobile { get; set; } - public long Fax { get; set; } + public long? PhoneNumber { get; set; } + public long? MobileNumber { get; set; } + public long? FaxNumber { get; set; } public string Email { get; set; } public string Website { get; set; } public string MenuGroup { get; set; } diff --git a/api/src/Kurs.Platform.Application.Contracts/Public/ContactDto.cs b/api/src/Kurs.Platform.Application.Contracts/Public/ContactDto.cs index ac5e60fb..9df6685a 100644 --- a/api/src/Kurs.Platform.Application.Contracts/Public/ContactDto.cs +++ b/api/src/Kurs.Platform.Application.Contracts/Public/ContactDto.cs @@ -8,7 +8,7 @@ namespace Kurs.Platform.Public; public class ContactDto : EntityDto { public string Address { get; set; } - public string Phone { get; set; } + public long PhoneNumber { get; set; } public string Email { get; set; } public string Location { get; set; } public string TaxNumber { get; set; } diff --git a/api/src/Kurs.Platform.Application.Contracts/Public/DemoDto.cs b/api/src/Kurs.Platform.Application.Contracts/Public/DemoDto.cs index 2bcbe519..049326da 100644 --- a/api/src/Kurs.Platform.Application.Contracts/Public/DemoDto.cs +++ b/api/src/Kurs.Platform.Application.Contracts/Public/DemoDto.cs @@ -9,7 +9,7 @@ public class DemoDto : FullAuditedEntityDto public string OrganizationName { get; set; } public string FullName { get; set; } public string Email { get; set; } - public string Phone { get; set; } + public long PhoneNumber { get; set; } public string Address { get; set; } public int NumberOfBranches { get; set; } public int NumberOfUsers { get; set; } diff --git a/api/src/Kurs.Platform.Application.Contracts/Tenants/CustomTenantDto.cs b/api/src/Kurs.Platform.Application.Contracts/Tenants/CustomTenantDto.cs index 75fd15e1..9c3197f5 100644 --- a/api/src/Kurs.Platform.Application.Contracts/Tenants/CustomTenantDto.cs +++ b/api/src/Kurs.Platform.Application.Contracts/Tenants/CustomTenantDto.cs @@ -19,9 +19,9 @@ public class CustomTenantDto public string Address1 { get; set; } public string Address2 { get; set; } public string PostalCode { get; set; } - public long Phone { get; set; } - public long Mobile { get; set; } - public long Fax { get; set; } + public long MobileNumber { get; set; } + public long? PhoneNumber { get; set; } + public long? FaxNumber { get; set; } public string Email { get; set; } public string Website { get; set; } public string MenuGroup { get; set; } diff --git a/api/src/Kurs.Platform.Application/ListForms/ListFormDynamicApiAppService.cs b/api/src/Kurs.Platform.Application/ListForms/ListFormDynamicApiAppService.cs index bb76b512..f683561e 100644 --- a/api/src/Kurs.Platform.Application/ListForms/ListFormDynamicApiAppService.cs +++ b/api/src/Kurs.Platform.Application/ListForms/ListFormDynamicApiAppService.cs @@ -124,9 +124,9 @@ public class ListFormDynamicApiAppService : PlatformAppService, IListFormDynamic entity.SetAddress1(input.Data.Address1); entity.SetAddress2(input.Data.Address2); entity.SetPostalCode(input.Data.PostalCode); - entity.SetPhone(input.Data.Phone); - entity.SetMobile(input.Data.Mobile); - entity.SetFax(input.Data.Fax); + entity.SetPhoneNumber(input.Data.PhoneNumber); + entity.SetMobileNumber(input.Data.MobileNumber); + entity.SetFaxNumber(input.Data.FaxNumber); entity.SetEmail(input.Data.Email); entity.SetWebsite(input.Data.Website); entity.SetMenuGroup(input.Data.MenuGroup); @@ -159,9 +159,9 @@ public class ListFormDynamicApiAppService : PlatformAppService, IListFormDynamic entity.SetAddress1(input.Data.Address1); entity.SetAddress2(input.Data.Address2); entity.SetPostalCode(input.Data.PostalCode); - entity.SetPhone(input.Data.Phone); - entity.SetMobile(input.Data.Mobile); - entity.SetFax(input.Data.Fax); + entity.SetPhoneNumber(input.Data.PhoneNumber); + entity.SetMobileNumber(input.Data.MobileNumber); + entity.SetFaxNumber(input.Data.FaxNumber); entity.SetEmail(input.Data.Email); entity.SetWebsite(input.Data.Website); entity.SetMenuGroup(input.Data.MenuGroup); diff --git a/api/src/Kurs.Platform.Application/Public/PublicAppService.cs b/api/src/Kurs.Platform.Application/Public/PublicAppService.cs index 2ac05182..bc2ae4dd 100644 --- a/api/src/Kurs.Platform.Application/Public/PublicAppService.cs +++ b/api/src/Kurs.Platform.Application/Public/PublicAppService.cs @@ -75,7 +75,7 @@ public class PublicAppService : PlatformAppService bodyBuilder.AppendLine($"Şirket: {input.OrganizationName}"); bodyBuilder.AppendLine($"Ad Soyad: {input.FullName}"); bodyBuilder.AppendLine($"E-Posta: {input.Email}"); - bodyBuilder.AppendLine($"Telefon: {input.Phone}"); + bodyBuilder.AppendLine($"Telefon: {input.PhoneNumber}"); bodyBuilder.AppendLine($"Adres: {input.Address}"); bodyBuilder.AppendLine($"Şube Sayısı: {input.NumberOfBranches}"); bodyBuilder.AppendLine($"Kullanıcı Sayısı: {input.NumberOfUsers}"); @@ -235,9 +235,9 @@ public class PublicAppService : PlatformAppService Country = input.Tenant.Country, City = input.Tenant.City, PostalCode = input.Tenant.PostalCode, - Phone = input.Tenant.Phone, - Mobile = input.Tenant.Mobile, - Fax = input.Tenant.Fax, + MobileNumber = input.Tenant.MobileNumber, + PhoneNumber = input.Tenant.PhoneNumber, + FaxNumber = input.Tenant.FaxNumber, Email = input.Tenant.Email, Website = input.Tenant.Website, MenuGroup = input.Tenant.MenuGroup, diff --git a/api/src/Kurs.Platform.Application/Tenants/PlatformTenantAppService.cs b/api/src/Kurs.Platform.Application/Tenants/PlatformTenantAppService.cs index bbb17f7a..2c7331d9 100644 --- a/api/src/Kurs.Platform.Application/Tenants/PlatformTenantAppService.cs +++ b/api/src/Kurs.Platform.Application/Tenants/PlatformTenantAppService.cs @@ -86,9 +86,9 @@ public class PlatformTenantAppService : TenantAppService, IPlatformTenantAppServ dto.Address1 = tenant.GetAddress1(); dto.Address2 = tenant.GetAddress2(); dto.PostalCode = tenant.GetPostalCode(); - dto.Phone = tenant.GetPhone(); - dto.Mobile = tenant.GetMobile(); - dto.Fax = tenant.GetFax(); + dto.PhoneNumber = tenant.GetPhoneNumber(); + dto.MobileNumber = tenant.GetMobileNumber(); + dto.FaxNumber = tenant.GetFaxNumber(); dto.Email = tenant.GetEmail(); dto.Website = tenant.GetWebsite(); dto.MenuGroup = tenant.GetMenuGroup(); diff --git a/api/src/Kurs.Platform.DbMigrator/Seeds/LanguagesData.json b/api/src/Kurs.Platform.DbMigrator/Seeds/LanguagesData.json index 3d8a52b6..83d43317 100644 --- a/api/src/Kurs.Platform.DbMigrator/Seeds/LanguagesData.json +++ b/api/src/Kurs.Platform.DbMigrator/Seeds/LanguagesData.json @@ -7227,9 +7227,9 @@ }, { "resourceName": "Platform", - "key": "Public.common.phone", - "tr": "Telefon", - "en": "Phone" + "key": "Public.common.phoneNumber", + "tr": "Telefon No", + "en": "Phone Number" }, { "resourceName": "Platform", @@ -7299,9 +7299,9 @@ }, { "resourceName": "Platform", - "key": "Public.contact.phone", - "tr": "Telefon", - "en": "Phone" + "key": "Public.contact.phoneNumber", + "tr": "Telefon No", + "en": "Phone Number" }, { "resourceName": "Platform", @@ -7395,7 +7395,7 @@ }, { "resourceName": "Platform", - "key": "Public.demo.phone", + "key": "Public.demo.phoneNumber", "tr": "+90 (555) 123-4567", "en": "+90 (555) 123-4567" }, @@ -8049,9 +8049,9 @@ }, { "resourceName": "Platform", - "key": "Public.payment.customer.phone", - "tr": "Telefon:", - "en": "Phone:" + "key": "Public.payment.customer.phoneNumber", + "tr": "Telefon No:", + "en": "Phone Number:" }, { "resourceName": "Platform", @@ -8277,9 +8277,9 @@ }, { "resourceName": "Platform", - "key": "Public.products.tenantForm.phone", - "tr": "Telefon *", - "en": "Phone *" + "key": "Public.products.tenantForm.phoneNumber", + "tr": "Telefon No*", + "en": "Phone Number*" }, { "resourceName": "Platform", diff --git a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Accounting.cs b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Accounting.cs index 3c70d057..aad6ccbf 100644 --- a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Accounting.cs +++ b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Accounting.cs @@ -13,8 +13,6 @@ using Volo.Abp.Data; using Volo.Abp.DependencyInjection; using Volo.Abp.Domain.Repositories; using Volo.Abp.Identity; -using Volo.Abp.TenantManagement; -using AbpIdentity = Kurs.Platform.Data.Seeds.SeedConsts.AbpIdentity; using AppCodes = Kurs.Platform.Data.Seeds.SeedConsts.AppCodes; using static Kurs.Platform.PlatformConsts; using static Kurs.Platform.PlatformSeeder.SeederDefaults; @@ -110,7 +108,7 @@ public class ListFormSeeder_Accounting : IDataSeedContributor, ITransientDepende new EditingFormItemDto { Order = 7, DataField = "City", ColSpan = 1, IsRequired = true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order = 8, DataField = "District", ColSpan = 1, IsRequired = true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order = 9, DataField = "PostalCode", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 10, DataField = "Phone", ColSpan = 1, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, + new EditingFormItemDto { Order = 10, DataField = "PhoneNumber", ColSpan = 1, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, new EditingFormItemDto { Order = 11, DataField = "Email", ColSpan = 1, EditorType2=EditorTypes.dxTextBox }, ]} }), @@ -327,13 +325,14 @@ public class ListFormSeeder_Accounting : IDataSeedContributor, ITransientDepende ListFormCode = formBank.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.Int64, - FieldName = "Phone", + FieldName = "PhoneNumber", Width = 150, ListOrderNo = 11, Visible = true, IsActive = true, IsDeleted = false, AllowSearch = true, + EditorOptions = EditorOptionValues.PhoneEditorOptions, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AppCodes.Accounting.Bank), PivotSettingsJson = DefaultPivotSettingsJson, @@ -415,7 +414,7 @@ public class ListFormSeeder_Accounting : IDataSeedContributor, ITransientDepende new EditingFormItemDto { Order = 8, DataField = "City", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order = 9, DataField = "District", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order = 10, DataField = "PostalCode", ColSpan = 2, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 11, DataField = "Phone", ColSpan = 2, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, + new EditingFormItemDto { Order = 11, DataField = "PhoneNumber", ColSpan = 2, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, new EditingFormItemDto { Order = 12, DataField = "Email", ColSpan = 2, EditorType2=EditorTypes.dxTextBox }, ]} }), @@ -637,13 +636,14 @@ public class ListFormSeeder_Accounting : IDataSeedContributor, ITransientDepende ListFormCode = listFormBank.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.Int64, - FieldName = "Phone", + FieldName = "PhoneNumber", Width = 150, ListOrderNo = 11, Visible = true, IsActive = true, IsDeleted = false, AllowSearch = true, + EditorOptions = EditorOptionValues.PhoneEditorOptions, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AppCodes.Accounting.Bank), PivotSettingsJson = DefaultPivotSettingsJson diff --git a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Administration.cs b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Administration.cs index eaf67899..26bfc68d 100644 --- a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Administration.cs +++ b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Administration.cs @@ -1132,6 +1132,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep IsActive = true, IsDeleted = false, AllowSearch = true, + EditorOptions = EditorOptionValues.PhoneEditorOptions, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(PlatformConsts.IdentityPermissions.Users.Create, PlatformConsts.IdentityPermissions.Users.Default, PlatformConsts.IdentityPermissions.Users.Update, true, true, false), PivotSettingsJson = DefaultPivotSettingsJson @@ -2264,8 +2265,8 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep new EditingFormItemDto { Order = 2, DataField = "Description", ColSpan = 2, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order = 3, DataField = "Category", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order = 4, DataField = "Order", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 5, DataField = "MonthlyPrice", ColSpan = 2, EditorType2 = EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 6, DataField = "YearlyPrice", ColSpan = 2, EditorType2 = EditorTypes.dxNumberBox }, + new EditingFormItemDto { Order = 5, DataField = "MonthlyPrice", ColSpan = 2, EditorType2 = EditorTypes.dxNumberBox, EditorOptions=EditorOptionValues.NumberStandartFormat }, + new EditingFormItemDto { Order = 6, DataField = "YearlyPrice", ColSpan = 2, EditorType2 = EditorTypes.dxNumberBox, EditorOptions=EditorOptionValues.NumberStandartFormat }, new EditingFormItemDto { Order = 7, DataField = "IsQuantityBased", ColSpan = 2, EditorType2 = EditorTypes.dxCheckBox }, new EditingFormItemDto { Order = 8, DataField = "ImageUrl", ColSpan = 2, EditorType2 = EditorTypes.dxTextBox }, ] @@ -2487,7 +2488,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep Items = [ new EditingFormItemDto { Order = 1, DataField = "Name", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 2, DataField = "Commission", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox }, + new EditingFormItemDto { Order = 2, DataField = "Commission", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox, EditorOptions=EditorOptionValues.NumberStandartFormat }, new EditingFormItemDto { Order = 3, DataField = "Logo", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, ] } @@ -2621,7 +2622,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep [ new EditingFormItemDto { Order = 1, DataField = "Installment", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 2, DataField = "Name", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 3, DataField = "Commission", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox }, + new EditingFormItemDto { Order = 3, DataField = "Commission", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox, EditorOptions=EditorOptionValues.NumberStandartFormat }, ] } }), @@ -2768,14 +2769,14 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep }, new() { Order=2, ColCount=1, ColSpan=1, ItemType="group", Items = [ - new EditingFormItemDto { Order = 11, DataField = "Phone", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, - new EditingFormItemDto { Order = 12, DataField = "Mobile", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, - new EditingFormItemDto { Order = 13, DataField = "Fax", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, + new EditingFormItemDto { Order = 11, DataField = "PhoneNumber", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, + new EditingFormItemDto { Order = 12, DataField = "MobileNumber", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, + new EditingFormItemDto { Order = 13, DataField = "FaxNumber", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, new EditingFormItemDto { Order = 14, DataField = "Email", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 15, DataField = "Website", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 16, DataField = "Subtotal", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 17, DataField = "Commission", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 18, DataField = "Total", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox }, + new EditingFormItemDto { Order = 16, DataField = "Subtotal", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox, EditorOptions=EditorOptionValues.NumberStandartFormat }, + new EditingFormItemDto { Order = 17, DataField = "Commission", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox, EditorOptions=EditorOptionValues.NumberStandartFormat }, + new EditingFormItemDto { Order = 18, DataField = "Total", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox, EditorOptions=EditorOptionValues.NumberStandartFormat }, new EditingFormItemDto { Order = 19, DataField = "PaymentMethodId", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order = 20, DataField = "Installment", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, ] @@ -2979,13 +2980,14 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep ListFormCode = listFormPurchaseOrder.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.Int64, - FieldName = "Phone", + FieldName = "PhoneNumber", Width = 100, ListOrderNo = 11, Visible = true, IsActive = true, IsDeleted = false, AllowSearch = true, + EditorOptions = EditorOptionValues.PhoneEditorOptions, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AppCodes.Orders.PurchaseOrders), }, @@ -2994,13 +2996,14 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep ListFormCode = listFormPurchaseOrder.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.Int64, - FieldName = "Mobile", + FieldName = "MobileNumber", Width = 100, ListOrderNo = 12, Visible = true, IsActive = true, IsDeleted = false, AllowSearch = true, + EditorOptions = EditorOptionValues.PhoneEditorOptions, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AppCodes.Orders.PurchaseOrders), }, @@ -3009,13 +3012,14 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep ListFormCode = listFormPurchaseOrder.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.Int64, - FieldName = "Fax", + FieldName = "FaxNumber", Width = 100, ListOrderNo = 13, Visible = true, IsActive = true, IsDeleted = false, AllowSearch = true, + EditorOptions = EditorOptionValues.PhoneEditorOptions, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AppCodes.Orders.PurchaseOrders), }, @@ -3398,9 +3402,9 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep new EditingFormItemDto { Order = 4, DataField = "CoverImage", ColSpan = 2, IsRequired = false, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 5, DataField = "ReadTime", ColSpan = 2, IsRequired = false, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 6, DataField = "CategoryId", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 7, DataField = "ViewCount", ColSpan = 2, IsRequired = false, EditorType2 = EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 8, DataField = "LikeCount", ColSpan = 2, IsRequired = false, EditorType2 = EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 9, DataField = "CommentCount", ColSpan = 2, IsRequired = false, EditorType2 = EditorTypes.dxNumberBox }, + new EditingFormItemDto { Order = 7, DataField = "ViewCount", ColSpan = 2, IsRequired = false, EditorType2 = EditorTypes.dxNumberBox, EditorOptions=EditorOptionValues.NumberStandartFormat }, + new EditingFormItemDto { Order = 8, DataField = "LikeCount", ColSpan = 2, IsRequired = false, EditorType2 = EditorTypes.dxNumberBox, EditorOptions=EditorOptionValues.NumberStandartFormat }, + new EditingFormItemDto { Order = 9, DataField = "CommentCount", ColSpan = 2, IsRequired = false, EditorType2 = EditorTypes.dxNumberBox, EditorOptions=EditorOptionValues.NumberStandartFormat }, new EditingFormItemDto { Order = 10, DataField = "IsPublished", ColSpan = 2, IsRequired = false, EditorType2 = EditorTypes.dxCheckBox }, new EditingFormItemDto { Order = 11, DataField = "PublishedAt", ColSpan = 2, IsRequired = false, EditorType2 = EditorTypes.dxDateBox }, new EditingFormItemDto { Order = 12, DataField = "ContentTr", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxHtmlEditor, EditorOptions=EditorOptionValues.HtmlEditorOptions }, @@ -3712,7 +3716,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep new EditingFormItemDto { Order = 1, DataField = "OrganizationName", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 2, DataField = "FullName", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 3, DataField = "Email", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 4, DataField = "Phone", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, + new EditingFormItemDto { Order = 4, DataField = "PhoneNumber", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, new EditingFormItemDto { Order = 5, DataField = "Address", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxTextArea }, new EditingFormItemDto { Order = 6, DataField = "NumberOfBranches", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox }, new EditingFormItemDto { Order = 7, DataField = "NumberOfUsers", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox }, @@ -3805,13 +3809,14 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep ListFormCode = listFormDemo.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.Int64, - FieldName = "Phone", + FieldName = "PhoneNumber", Width = 100, ListOrderNo = 5, Visible = true, IsActive = true, IsDeleted = false, AllowSearch = true, + EditorOptions = EditorOptionValues.PhoneEditorOptions, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AppCodes.Demos), }, @@ -3931,7 +3936,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep Items = [ new EditingFormItemDto { Order = 1, DataField = "Address", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order = 2, DataField = "Phone", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, + new EditingFormItemDto { Order = 2, DataField = "PhoneNumber", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, new EditingFormItemDto { Order = 3, DataField = "Email", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 4, DataField = "Location", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 5, DataField = "TaxNumber", ColSpan = 2, IsRequired = true, EditorType2=EditorTypes.dxTextBox }, @@ -3997,13 +4002,14 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep ListFormCode = listFormContact.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.Int64, - FieldName = "Phone", + FieldName = "PhoneNumber", Width = 150, ListOrderNo = 3, Visible = true, IsActive = true, IsDeleted = false, AllowSearch = true, + EditorOptions = EditorOptionValues.PhoneEditorOptions, ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AppCodes.Contact), @@ -5752,12 +5758,12 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep new EditingFormItemDto { Order = 3, DataField = "ModelYear", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox }, new EditingFormItemDto { Order = 4, DataField = "DriverNationalId", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 5, DataField = "DriverName", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 6, DataField = "DriverPhone1", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 7, DataField = "DriverPhone2", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 6, DataField = "DriverPhone1", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, + new EditingFormItemDto { Order = 7, DataField = "DriverPhone2", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, new EditingFormItemDto { Order = 8, DataField = "AssistantDriverNationalId", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 9, DataField = "AssistantDriverName", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 10, DataField = "AssistantDriverPhone1", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 11, DataField = "AssistantDriverPhone2", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 10, DataField = "AssistantDriverPhone1", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, + new EditingFormItemDto { Order = 11, DataField = "AssistantDriverPhone2", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, new EditingFormItemDto { Order = 12, DataField = "Status", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, ]} }), @@ -5875,6 +5881,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep Visible = true, IsActive = true, IsDeleted = false, + EditorOptions = EditorOptionValues.PhoneEditorOptions, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AppCodes.Definitions.Vehicle), PivotSettingsJson = DefaultPivotSettingsJson @@ -5889,6 +5896,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep Visible = true, IsActive = true, IsDeleted = false, + EditorOptions = EditorOptionValues.PhoneEditorOptions, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AppCodes.Definitions.Vehicle), PivotSettingsJson = DefaultPivotSettingsJson @@ -5933,6 +5941,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep Visible = true, IsActive = true, IsDeleted = false, + EditorOptions = EditorOptionValues.PhoneEditorOptions, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AppCodes.Definitions.Vehicle), PivotSettingsJson = DefaultPivotSettingsJson @@ -5947,6 +5956,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep Visible = true, IsActive = true, IsDeleted = false, + EditorOptions = EditorOptionValues.PhoneEditorOptions, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AppCodes.Definitions.Vehicle), PivotSettingsJson = DefaultPivotSettingsJson @@ -6034,7 +6044,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep ItemType = "group", Items =[ new EditingFormItemDto { Order = 1, DataField = "Name", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 2, DataField = "Phone", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, + new EditingFormItemDto { Order = 2, DataField = "PhoneNumber", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, new EditingFormItemDto { Order = 3, DataField = "Email", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 4, DataField = "Address", ColSpan = 2, EditorType2 = EditorTypes.dxTextArea }, new EditingFormItemDto { Order = 5, DataField = "Status", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, @@ -6092,18 +6102,19 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep PermissionJson = DefaultFieldPermissionJson(AppCodes.Definitions.Psychologist), PivotSettingsJson = DefaultPivotSettingsJson }, - // Phone + // PhoneNumber new() { ListFormCode = listFormPsychologist.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.Int64, - FieldName = "Phone", + FieldName = "PhoneNumber", Width = 150, ListOrderNo = 3, Visible = true, IsActive = true, IsDeleted = false, + EditorOptions = EditorOptionValues.PhoneEditorOptions, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AppCodes.Definitions.Psychologist), PivotSettingsJson = DefaultPivotSettingsJson @@ -6211,7 +6222,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep PagerOptionJson = DefaultPagerOptionJson, EditingOptionJson = JsonSerializer.Serialize(new GridEditingDto { - Popup = new GridEditingPopupDto() { Title = ListFormCodes.Lists.Lawyer, Width = 700, Height = 700 }, + Popup = new GridEditingPopupDto() { Title = ListFormCodes.Lists.Lawyer, Width = 700, Height = 500 }, AllowDeleting = true, AllowAdding = true, AllowUpdating = true, @@ -6225,19 +6236,16 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep ColSpan = 2, ItemType = "group", Items =[ - new EditingFormItemDto { Order = 1, DataField = "Name", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 2, DataField = "ContactPerson", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 3, DataField = "Email", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 4, DataField = "Address", ColSpan = 2, EditorType2 = EditorTypes.dxTextArea }, - new EditingFormItemDto { Order = 5, DataField = "TaxOffice", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 6, DataField = "TaxNumber", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 7, DataField = "Phone1", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 8, DataField = "Phone2", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 9, DataField = "Phone3", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 10, DataField = "Phone4", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 11, DataField = "Fax", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 12, DataField = "Description", ColSpan = 1, EditorType2 = EditorTypes.dxTextArea }, - new EditingFormItemDto { Order = 13, DataField = "Status", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, + new EditingFormItemDto { Order = 1, DataField = "FullName", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 2, DataField = "Email", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 3, DataField = "MobileNumber", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, + new EditingFormItemDto { Order = 4, DataField = "PhoneNumber", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, + new EditingFormItemDto { Order = 5, DataField = "FaxNumber", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, + new EditingFormItemDto { Order = 6, DataField = "Address", ColSpan = 2, EditorType2 = EditorTypes.dxTextArea }, + new EditingFormItemDto { Order = 7, DataField = "TaxOffice", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 8, DataField = "TaxNumber", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 9, DataField = "Description", ColSpan = 1, EditorType2 = EditorTypes.dxTextArea }, + new EditingFormItemDto { Order = 10, DataField = "Status", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, ]} }), InsertFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] @@ -6278,7 +6286,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep ListFormCode = listFormLawyer.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.String, - FieldName = "Name", + FieldName = "FullName", Width = 200, ListOrderNo = 2, Visible = true, @@ -6293,28 +6301,13 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep PivotSettingsJson = DefaultPivotSettingsJson }, new() - { - ListFormCode = listFormLawyer.ListFormCode, - CultureName = LanguageCodes.En, - SourceDbType = DbType.String, - FieldName = "ContactPerson", - Width = 200, - ListOrderNo = 3, - Visible = true, - IsActive = true, - IsDeleted = false, - ColumnCustomizationJson = DefaultColumnCustomizationJson, - PermissionJson = DefaultFieldPermissionJson(AppCodes.Definitions.Lawyer), - PivotSettingsJson = DefaultPivotSettingsJson - }, - new() { ListFormCode = listFormLawyer.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Email", Width = 200, - ListOrderNo = 4, + ListOrderNo = 3, Visible = true, IsActive = true, IsDeleted = false, @@ -6324,13 +6317,61 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep PivotSettingsJson = DefaultPivotSettingsJson }, new() + { + ListFormCode = listFormLawyer.ListFormCode, + CultureName = LanguageCodes.En, + SourceDbType = DbType.Int64, + FieldName = "MobileNumber", + Width = 150, + ListOrderNo = 4, + Visible = true, + IsActive = true, + IsDeleted = false, + EditorOptions = EditorOptionValues.PhoneEditorOptions, + ColumnCustomizationJson = DefaultColumnCustomizationJson, + PermissionJson = DefaultFieldPermissionJson(AppCodes.Definitions.Lawyer), + PivotSettingsJson = DefaultPivotSettingsJson + }, + new() + { + ListFormCode = listFormLawyer.ListFormCode, + CultureName = LanguageCodes.En, + SourceDbType = DbType.Int64, + FieldName = "PhoneNumber", + Width = 150, + ListOrderNo = 5, + Visible = true, + IsActive = true, + IsDeleted = false, + EditorOptions = EditorOptionValues.PhoneEditorOptions, + ColumnCustomizationJson = DefaultColumnCustomizationJson, + PermissionJson = DefaultFieldPermissionJson(AppCodes.Definitions.Lawyer), + PivotSettingsJson = DefaultPivotSettingsJson + }, + new() + { + ListFormCode = listFormLawyer.ListFormCode, + CultureName = LanguageCodes.En, + SourceDbType = DbType.Int64, + FieldName = "FaxNumber", + Width = 150, + ListOrderNo = 6, + Visible = true, + IsActive = true, + IsDeleted = false, + EditorOptions = EditorOptionValues.PhoneEditorOptions, + ColumnCustomizationJson = DefaultColumnCustomizationJson, + PermissionJson = DefaultFieldPermissionJson(AppCodes.Definitions.Lawyer), + PivotSettingsJson = DefaultPivotSettingsJson + }, + new() { ListFormCode = listFormLawyer.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Address", Width = 300, - ListOrderNo = 5, + ListOrderNo = 7, Visible = true, IsActive = true, IsDeleted = false, @@ -6345,7 +6386,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep SourceDbType = DbType.String, FieldName = "TaxOffice", Width = 150, - ListOrderNo = 6, + ListOrderNo = 8, Visible = true, IsActive = true, IsDeleted = false, @@ -6360,37 +6401,6 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep SourceDbType = DbType.String, FieldName = "TaxNumber", Width = 150, - ListOrderNo = 7, - Visible = true, - IsActive = true, - IsDeleted = false, - ColumnCustomizationJson = DefaultColumnCustomizationJson, - PermissionJson = DefaultFieldPermissionJson(AppCodes.Definitions.Lawyer), - PivotSettingsJson = DefaultPivotSettingsJson - }, - // Telefon ve Fax alanları - new() - { - ListFormCode = listFormLawyer.ListFormCode, - CultureName = LanguageCodes.En, - SourceDbType = DbType.Int64, - FieldName = "Phone1", - Width = 150, - ListOrderNo = 8, - Visible = true, - IsActive = true, - IsDeleted = false, - ColumnCustomizationJson = DefaultColumnCustomizationJson, - PermissionJson = DefaultFieldPermissionJson(AppCodes.Definitions.Lawyer), - PivotSettingsJson = DefaultPivotSettingsJson - }, - new() - { - ListFormCode = listFormLawyer.ListFormCode, - CultureName = LanguageCodes.En, - SourceDbType = DbType.Int64, - FieldName = "Phone2", - Width = 150, ListOrderNo = 9, Visible = true, IsActive = true, @@ -6399,51 +6409,6 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep PermissionJson = DefaultFieldPermissionJson(AppCodes.Definitions.Lawyer), PivotSettingsJson = DefaultPivotSettingsJson }, - new() - { - ListFormCode = listFormLawyer.ListFormCode, - CultureName = LanguageCodes.En, - SourceDbType = DbType.Int64, - FieldName = "Phone3", - Width = 150, - ListOrderNo = 10, - Visible = true, - IsActive = true, - IsDeleted = false, - ColumnCustomizationJson = DefaultColumnCustomizationJson, - PermissionJson = DefaultFieldPermissionJson(AppCodes.Definitions.Lawyer), - PivotSettingsJson = DefaultPivotSettingsJson - }, - new() - { - ListFormCode = listFormLawyer.ListFormCode, - CultureName = LanguageCodes.En, - SourceDbType = DbType.Int64, - FieldName = "Phone4", - Width = 150, - ListOrderNo = 11, - Visible = true, - IsActive = true, - IsDeleted = false, - ColumnCustomizationJson = DefaultColumnCustomizationJson, - PermissionJson = DefaultFieldPermissionJson(AppCodes.Definitions.Lawyer), - PivotSettingsJson = DefaultPivotSettingsJson - }, - new() - { - ListFormCode = listFormLawyer.ListFormCode, - CultureName = LanguageCodes.En, - SourceDbType = DbType.Int64, - FieldName = "Fax", - Width = 150, - ListOrderNo = 12, - Visible = true, - IsActive = true, - IsDeleted = false, - ColumnCustomizationJson = DefaultColumnCustomizationJson, - PermissionJson = DefaultFieldPermissionJson(AppCodes.Definitions.Lawyer), - PivotSettingsJson = DefaultPivotSettingsJson - }, // Description ve Status new() { @@ -6452,7 +6417,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep SourceDbType = DbType.String, FieldName = "Description", Width = 300, - ListOrderNo = 13, + ListOrderNo = 10, Visible = true, IsActive = true, IsDeleted = false, @@ -6466,7 +6431,7 @@ public class ListFormSeeder_Administration : IDataSeedContributor, ITransientDep SourceDbType = DbType.String, FieldName = "Status", Width = 120, - ListOrderNo = 14, + ListOrderNo = 11, Visible = true, IsActive = true, IsDeleted = false, diff --git a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Hr.cs b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Hr.cs index 2f039dab..77432bdb 100644 --- a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Hr.cs +++ b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Hr.cs @@ -420,8 +420,8 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency new EditingFormItemDto { Order = 3, DataField="Description", ColSpan = 2, EditorType2 = EditorTypes.dxTextArea }, new EditingFormItemDto { Order = 4, DataField="DepartmentId", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, new EditingFormItemDto { Order = 5, DataField="Level", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, - new EditingFormItemDto { Order = 6, DataField="MinSalary", ColSpan = 2, EditorType2 = EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 7, DataField="MaxSalary", ColSpan = 2, EditorType2 = EditorTypes.dxNumberBox }, + new EditingFormItemDto { Order = 6, DataField="MinSalary", ColSpan = 2, EditorType2 = EditorTypes.dxNumberBox, EditorOptions=EditorOptionValues.NumberStandartFormat }, + new EditingFormItemDto { Order = 7, DataField="MaxSalary", ColSpan = 2, EditorType2 = EditorTypes.dxNumberBox, EditorOptions=EditorOptionValues.NumberStandartFormat }, new EditingFormItemDto { Order = 8, DataField="CurrencyId", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, new EditingFormItemDto { Order = 9, DataField="RequiredSkills", ColSpan = 2, EditorType2 = EditorTypes.dxTextArea }, new EditingFormItemDto { Order = 10, DataField="Responsibilities", ColSpan = 2, EditorType2 = EditorTypes.dxTextArea }, @@ -743,7 +743,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency new EditingFormItemDto { Order = 4, DataField="ParentDepartmentId", ColSpan = 2, EditorType2 = EditorTypes.dxSelectBox }, new EditingFormItemDto { Order = 5, DataField="ManagerId", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, new EditingFormItemDto { Order = 6, DataField="CostCenterId", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, - new EditingFormItemDto { Order = 7, DataField="Budget", ColSpan = 2, EditorType2 = EditorTypes.dxNumberBox }, + new EditingFormItemDto { Order = 7, DataField="Budget", ColSpan = 2, EditorType2 = EditorTypes.dxNumberBox, EditorOptions=EditorOptionValues.NumberStandartFormat }, new EditingFormItemDto { Order = 8, DataField="IsActive", ColSpan = 2, EditorType2 = EditorTypes.dxCheckBox} ]} }), @@ -1311,8 +1311,8 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency new EditingFormItemDto { Order = 5, DataField="ResponsibleEmployeeId", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, new EditingFormItemDto { Order = 6, DataField="DepartmentId", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, new EditingFormItemDto { Order = 7, DataField="CostCenterType", ColSpan = 2, EditorType2 = EditorTypes.dxSelectBox }, - new EditingFormItemDto { Order = 8, DataField="BudgetedAmount", ColSpan = 2, EditorType2 = EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 9, DataField="ActualAmount", ColSpan = 2, EditorType2 = EditorTypes.dxNumberBox }, + new EditingFormItemDto { Order = 8, DataField="BudgetedAmount", ColSpan = 2, EditorType2 = EditorTypes.dxNumberBox, EditorOptions=EditorOptionValues.NumberStandartFormat }, + new EditingFormItemDto { Order = 9, DataField="ActualAmount", ColSpan = 2, EditorType2 = EditorTypes.dxNumberBox, EditorOptions=EditorOptionValues.NumberStandartFormat }, new EditingFormItemDto { Order = 10, DataField="CurrencyId", ColSpan = 2, EditorType2 = EditorTypes.dxSelectBox }, new EditingFormItemDto { Order = 11, DataField="FiscalYear", ColSpan = 2, EditorType2 = EditorTypes.dxNumberBox }, new EditingFormItemDto { Order = 12, DataField="IsActive", ColSpan = 2, EditorType2 = EditorTypes.dxCheckBox} @@ -1650,8 +1650,8 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency new EditingFormItemDto { Order = 3, DataField="District", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, new EditingFormItemDto { Order = 4, DataField="Street", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, new EditingFormItemDto { Order = 5, DataField="PostalCode", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox }, - new EditingFormItemDto { Order = 6, DataField="Phone", ColSpan = 1, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, - new EditingFormItemDto { Order = 7, DataField="PersonalPhone", ColSpan = 1, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, + new EditingFormItemDto { Order = 6, DataField="PhoneNumber", ColSpan = 1, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, + new EditingFormItemDto { Order = 7, DataField="MobileNumber", ColSpan = 1, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, new EditingFormItemDto { Order = 8, DataField="Email", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 9, DataField="Address1", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 10, DataField="Address2", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, @@ -1675,7 +1675,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency Order=4, Caption="Emergency", ColCount=1, ColSpan=1, ItemType="group", Items =[ new EditingFormItemDto { Order = 1, DataField="EmergencyContactName", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 2, DataField="EmergencyContactRelationship", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 3, DataField="EmergencyContactPhone", ColSpan = 1, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, + new EditingFormItemDto { Order = 3, DataField="EmergencyContactPhoneNumber", ColSpan = 1, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, ]}, }), FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { @@ -1987,13 +1987,14 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency ListFormCode = listFormEmployee.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.Int64, - FieldName = "Phone", + FieldName = "PhoneNumber", Width = 100, ListOrderNo = 16, Visible = true, IsActive = true, IsDeleted = false, AllowSearch = true, + EditorOptions = EditorOptionValues.PhoneEditorOptions, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AppCodes.Hr.Employee), PivotSettingsJson = DefaultPivotSettingsJson @@ -2002,13 +2003,14 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency ListFormCode = listFormEmployee.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.String, - FieldName = "PersonalPhone", + FieldName = "MobileNumber", Width = 100, ListOrderNo = 17, Visible = true, IsActive = true, IsDeleted = false, AllowSearch = true, + EditorOptions = EditorOptionValues.PhoneEditorOptions, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AppCodes.Hr.Employee), PivotSettingsJson = DefaultPivotSettingsJson @@ -2064,13 +2066,14 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency ListFormCode = listFormEmployee.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.String, - FieldName = "EmergencyContactPhone", + FieldName = "EmergencyContactPhoneNumber", Width = 150, ListOrderNo = 21, Visible = true, IsActive = true, IsDeleted = false, AllowSearch = true, + EditorOptions = EditorOptionValues.PhoneEditorOptions, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AppCodes.Hr.Employee), PivotSettingsJson = DefaultPivotSettingsJson @@ -2735,7 +2738,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency new EditingFormItemDto { Order = 6, DataField = "TotalHours", ColSpan = 2, EditorType2 = EditorTypes.dxNumberBox, EditorOptions = EditorOptionValues.Disabled}, new EditingFormItemDto { Order = 7, DataField = "Reason", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxTextArea}, new EditingFormItemDto { Order = 8, DataField = "Rate", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox}, - new EditingFormItemDto { Order = 9, DataField = "Amount", ColSpan = 2, EditorType2 = EditorTypes.dxNumberBox, EditorOptions = EditorOptionValues.Disabled}, + new EditingFormItemDto { Order = 9, DataField = "Amount", ColSpan = 2, EditorType2 = EditorTypes.dxNumberBox, EditorOptions = "{ \"disabled\" : true, \"format\" : { \"type\" : \"fixedPoint\", \"precision\" : 2 } }"}, new EditingFormItemDto { Order = 10, DataField = "Status", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox}, ]} }), @@ -3078,7 +3081,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency Order=1, ColCount=1, ColSpan=2, ItemType="group", Items =[ new EditingFormItemDto { Order = 1, DataField = "EmployeeId", IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, new EditingFormItemDto { Order = 2, DataField = "Category", IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, - new EditingFormItemDto { Order = 3, DataField = "Amount", IsRequired = true, EditorType2 = EditorTypes.dxNumberBox }, + new EditingFormItemDto { Order = 3, DataField = "Amount", IsRequired = true, EditorType2 = EditorTypes.dxNumberBox, EditorOptions=EditorOptionValues.NumberStandartFormat }, new EditingFormItemDto { Order = 4, DataField = "CurrencyId", IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, new EditingFormItemDto { Order = 5, DataField = "RequestDate", IsRequired = true, EditorType2 = EditorTypes.dxDateBox }, new EditingFormItemDto { Order = 6, DataField = "Description", EditorType2 = EditorTypes.dxTextArea }, @@ -3183,6 +3186,8 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency CultureName = LanguageCodes.En, SourceDbType = DbType.Decimal, FieldName = "Amount", + Format = "fixedPoint", + Alignment = "right", Width = 100, ListOrderNo = 4, Visible = true, @@ -3388,7 +3393,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency new EditingFormItemDto { Order = 7, DataField = "Bonus", ColSpan = 2, EditorType2 = EditorTypes.dxNumberBox, EditorOptions = EditorOptionValues.NumberStandartFormat }, new EditingFormItemDto { Order = 8, DataField = "GrossSalary", ColSpan = 2, EditorType2 = EditorTypes.dxNumberBox, EditorOptions = EditorOptionValues.NumberStandartFormat }, new EditingFormItemDto { Order = 9, DataField = "NetSalary", ColSpan = 2, EditorType2 = EditorTypes.dxNumberBox, EditorOptions = EditorOptionValues.NumberStandartFormat }, - new EditingFormItemDto { Order = 10, DataField = "Tax", ColSpan = 2, EditorType2 = EditorTypes.dxNumberBox, EditorOptions = EditorOptionValues.NumberStandartFormat }, + new EditingFormItemDto { Order = 10, DataField = "TaxNumber", ColSpan = 2, EditorType2 = EditorTypes.dxNumberBox, EditorOptions = EditorOptionValues.NumberStandartFormat }, new EditingFormItemDto { Order = 11, DataField = "SocialSecurity", ColSpan = 2, EditorType2 = EditorTypes.dxNumberBox, EditorOptions = EditorOptionValues.NumberStandartFormat }, new EditingFormItemDto { Order = 12, DataField = "Status", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox}, ]} @@ -3403,7 +3408,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency new() { FieldName = "Bonus", FieldDbType = DbType.Decimal, Value = "0", CustomValueType = FieldCustomValueTypeEnum.Value }, new() { FieldName = "GrossSalary", FieldDbType = DbType.Decimal, Value = "0", CustomValueType = FieldCustomValueTypeEnum.Value }, new() { FieldName = "NetSalary", FieldDbType = DbType.Decimal, Value = "0", CustomValueType = FieldCustomValueTypeEnum.Value }, - new() { FieldName = "Tax", FieldDbType = DbType.Decimal, Value = "0", CustomValueType = FieldCustomValueTypeEnum.Value }, + new() { FieldName = "TaxNumber", FieldDbType = DbType.Decimal, Value = "0", CustomValueType = FieldCustomValueTypeEnum.Value }, new() { FieldName = "SocialSecurity", FieldDbType = DbType.Decimal, Value = "0", CustomValueType = FieldCustomValueTypeEnum.Value }, }), CommandColumnJson = JsonSerializer.Serialize(new CommandColumnDto[] { @@ -3640,8 +3645,8 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency new() { ListFormCode = listFormPayroll.ListFormCode, CultureName = LanguageCodes.En, - SourceDbType = DbType.Decimal, - FieldName = "Tax", + SourceDbType = DbType.Int64, + FieldName = "TaxNumber", Format = "fixedPoint", Alignment = "right", Width = 100, diff --git a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Intranet.cs b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Intranet.cs index 078a6504..8957839a 100644 --- a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Intranet.cs +++ b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Intranet.cs @@ -1052,7 +1052,7 @@ public class ListFormSeeder_Intranet : IDataSeedContributor, ITransientDependenc new EditingFormItemDto { Order = 2, DataField = "Type", IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, new EditingFormItemDto { Order = 3, DataField = "DepartureTime", IsRequired = true, EditorType2 = EditorTypes.dxTextBox, EditorOptions = EditorOptionValues.TimeSpanOptions }, new EditingFormItemDto { Order = 4, DataField = "ArrivalTime", IsRequired = true, EditorType2 = EditorTypes.dxTextBox, EditorOptions = EditorOptionValues.TimeSpanOptions }, - new EditingFormItemDto { Order = 5, DataField = "Capacity", EditorType2 = EditorTypes.dxNumberBox }, + new EditingFormItemDto { Order = 5, DataField = "Capacity", EditorType2 = EditorTypes.dxNumberBox, EditorOptions=EditorOptionValues.NumberStandartFormat }, new EditingFormItemDto { Order = 6, DataField = "Route", IsRequired = true, EditorType2 = EditorTypes.dxTagBox } ] } @@ -1162,6 +1162,8 @@ public class ListFormSeeder_Intranet : IDataSeedContributor, ITransientDependenc CultureName = LanguageCodes.En, SourceDbType = DbType.Int32, FieldName = "Capacity", + Format = "fixedPoint", + Alignment = "right", Width = 100, ListOrderNo = 6, Visible = true, @@ -1576,7 +1578,7 @@ public class ListFormSeeder_Intranet : IDataSeedContributor, ITransientDependenc new EditingFormItemDto { Order = 1, DataField = "FullName", IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 2, DataField = "CompanyName", IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 3, DataField = "Email", EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 4, DataField = "Phone", IsRequired = true, EditorType2 = EditorTypes.dxTextBox, EditorOptions = EditorOptionValues.PhoneEditorOptions }, + new EditingFormItemDto { Order = 4, DataField = "PhoneNumber", IsRequired = true, EditorType2 = EditorTypes.dxTextBox, EditorOptions = EditorOptionValues.PhoneEditorOptions }, new EditingFormItemDto { Order = 5, DataField = "Purpose", IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 6, DataField = "VisitDate", IsRequired = true, EditorType2 = EditorTypes.dxDateBox }, new EditingFormItemDto { Order = 7, DataField = "CheckIn", EditorType2 = EditorTypes.dxDateBox }, @@ -1664,13 +1666,14 @@ public class ListFormSeeder_Intranet : IDataSeedContributor, ITransientDependenc ListFormCode = listFormVisitor.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.Int64, - FieldName = "Phone", + FieldName = "PhoneNumber", Width = 100, ListOrderNo = 5, Visible = true, IsActive = true, IsDeleted = false, AllowSearch = true, + EditorOptions = EditorOptionValues.PhoneEditorOptions, ValidationRuleJson = DefaultValidationRuleEmailJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AppCodes.Intranet.Visitor), diff --git a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Saas.cs b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Saas.cs index c2e076de..4393d166 100644 --- a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Saas.cs +++ b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormSeeder_Saas.cs @@ -108,9 +108,9 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency new EditingFormItemDto { Order=3, DataField = "Founder", ColSpan=1, IsRequired=true, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=4, DataField = "VknTckn", ColSpan=1, IsRequired=true, EditorType2=EditorTypes.dxNumberBox }, new EditingFormItemDto { Order=5, DataField = "TaxOffice", ColSpan=1, IsRequired=true, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order=6, DataField = "Mobile", ColSpan=1, IsRequired=true, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, - new EditingFormItemDto { Order=7, DataField = "Phone", ColSpan=1, IsRequired=false, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, - new EditingFormItemDto { Order=8, DataField = "Fax", ColSpan=1, IsRequired=false, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, + new EditingFormItemDto { Order=6, DataField = "MobileNumber", ColSpan=1, IsRequired=true, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, + new EditingFormItemDto { Order=7, DataField = "PhoneNumber", ColSpan=1, IsRequired=false, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, + new EditingFormItemDto { Order=8, DataField = "FaxNumber", ColSpan=1, IsRequired=false, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, new EditingFormItemDto { Order=9, DataField = "IsActive", ColSpan=1, IsRequired=false, EditorType2=EditorTypes.dxCheckBox }, ]}, new() { Order=2, ColCount=2, ColSpan=1, ItemType="group", Items = [ @@ -442,13 +442,14 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency ListFormCode = formTenant.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.String, - FieldName = "Mobile", + FieldName = "MobileNumber", Width = 100, ListOrderNo = 16, Visible = true, IsActive = true, IsDeleted = false, AllowSearch = true, + EditorOptions = EditorOptionValues.PhoneEditorOptions, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Default), PivotSettingsJson = DefaultPivotSettingsJson, @@ -458,13 +459,14 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency ListFormCode = formTenant.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.Int64, - FieldName = "Phone", + FieldName = "PhoneNumber", Width = 100, ListOrderNo = 17, Visible = true, IsActive = true, IsDeleted = false, AllowSearch = true, + EditorOptions = EditorOptionValues.PhoneEditorOptions, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Default), PivotSettingsJson = DefaultPivotSettingsJson, @@ -474,13 +476,14 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency ListFormCode = formTenant.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.Int64, - FieldName = "Fax", + FieldName = "FaxNumber", Width = 100, ListOrderNo = 18, Visible = true, IsActive = true, IsDeleted = false, AllowSearch = true, + EditorOptions = EditorOptionValues.PhoneEditorOptions, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Default), PivotSettingsJson = DefaultPivotSettingsJson, @@ -721,9 +724,9 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency new EditingFormItemDto { Order=3, DataField = "Founder", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=4, DataField = "VknTckn", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxNumberBox }, new EditingFormItemDto { Order=5, DataField = "TaxOffice", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order=6, DataField = "Mobile", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, - new EditingFormItemDto { Order=7, DataField = "Phone", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, - new EditingFormItemDto { Order=8, DataField = "Fax", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, + new EditingFormItemDto { Order=6, DataField = "MobileNumber", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, + new EditingFormItemDto { Order=7, DataField = "PhoneNumber", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, + new EditingFormItemDto { Order=8, DataField = "FaxNumber", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, new EditingFormItemDto { Order=9, DataField = "IsActive", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxCheckBox }, ] }, @@ -1062,13 +1065,14 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency ListFormCode = listFormTenants.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.String, - FieldName = "Mobile", + FieldName = "MobileNumber", Width = 100, ListOrderNo = 16, Visible = true, IsActive = true, IsDeleted = false, AllowSearch = true, + EditorOptions = EditorOptionValues.PhoneEditorOptions, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), PivotSettingsJson = DefaultPivotSettingsJson @@ -1078,13 +1082,14 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency ListFormCode = listFormTenants.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.Int64, - FieldName = "Phone", + FieldName = "PhoneNumber", Width = 100, ListOrderNo = 17, Visible = true, IsActive = true, IsDeleted = false, AllowSearch = true, + EditorOptions = EditorOptionValues.PhoneEditorOptions, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), PivotSettingsJson = DefaultPivotSettingsJson @@ -1094,13 +1099,14 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency ListFormCode = listFormTenants.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.Int64, - FieldName = "Fax", + FieldName = "FaxNumber", Width = 100, ListOrderNo = 18, Visible = true, IsActive = true, IsDeleted = false, AllowSearch = true, + EditorOptions = EditorOptionValues.PhoneEditorOptions, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), PivotSettingsJson = DefaultPivotSettingsJson @@ -1199,9 +1205,9 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency new EditingFormItemDto { Order=3, DataField = "Name", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=4, DataField = "VknTckn", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxNumberBox }, new EditingFormItemDto { Order=5, DataField = "TaxOffice", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order=6, DataField = "Mobile", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, - new EditingFormItemDto { Order=7, DataField = "Phone", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, - new EditingFormItemDto { Order=8, DataField = "Fax", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, + new EditingFormItemDto { Order=6, DataField = "MobileNumber", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, + new EditingFormItemDto { Order=7, DataField = "PhoneNumber", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, + new EditingFormItemDto { Order=8, DataField = "FaxNumber", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions }, new EditingFormItemDto { Order=9, DataField = "IsActive", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxCheckBox }, ] }, @@ -1539,13 +1545,14 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency ListFormCode = listFormBranches.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.String, - FieldName = "Mobile", + FieldName = "MobileNumber", Width = 100, ListOrderNo = 15, Visible = true, IsActive = true, IsDeleted = false, AllowSearch = true, + EditorOptions = EditorOptionValues.PhoneEditorOptions, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AppCodes.Branches), PivotSettingsJson = DefaultPivotSettingsJson @@ -1555,13 +1562,14 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency ListFormCode = listFormBranches.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.Int64, - FieldName = "Phone", + FieldName = "PhoneNumber", Width = 100, ListOrderNo = 16, Visible = true, IsActive = true, IsDeleted = false, AllowSearch = true, + EditorOptions = EditorOptionValues.PhoneEditorOptions, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AppCodes.Branches), PivotSettingsJson = DefaultPivotSettingsJson @@ -1571,13 +1579,14 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency ListFormCode = listFormBranches.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.Int64, - FieldName = "Fax", + FieldName = "FaxNumber", Width = 100, ListOrderNo = 17, Visible = true, IsActive = true, IsDeleted = false, AllowSearch = true, + EditorOptions = EditorOptionValues.PhoneEditorOptions, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AppCodes.Branches), PivotSettingsJson = DefaultPivotSettingsJson @@ -2032,7 +2041,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency new EditingFormItemDto { Order=2, DataField="Group", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=3, DataField="Term", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=4, DataField="Url", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxTextBox }, - new EditingFormItemDto { Order=5, DataField="Weight", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxNumberBox }, + new EditingFormItemDto { Order=5, DataField="Weight", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxNumberBox, EditorOptions=EditorOptionValues.NumberStandartFormat }, ]} }), FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { @@ -4666,46 +4675,11 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency ItemType = "group", Items = [ - new EditingFormItemDto - { - Order = 1, - DataField = "Code", - ColSpan = 2, - IsRequired = true, - EditorType2 = EditorTypes.dxTextBox - }, - new EditingFormItemDto - { - Order = 2, - DataField = "Symbol", - ColSpan = 2, - IsRequired = false, - EditorType2 = EditorTypes.dxTextBox - }, - new EditingFormItemDto - { - Order = 3, - DataField = "Name", - ColSpan = 2, - IsRequired = true, - EditorType2 = EditorTypes.dxTextBox - }, - new EditingFormItemDto - { - Order = 4, - DataField = "Rate", - ColSpan = 2, - IsRequired = true, - EditorType2 = EditorTypes.dxNumberBox - }, - new EditingFormItemDto - { - Order = 5, - DataField = "IsActive", - ColSpan = 2, - IsRequired = false, - EditorType2 = EditorTypes.dxCheckBox - } + new EditingFormItemDto { Order = 1, DataField = "Code", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 2, DataField = "Symbol", ColSpan = 2, IsRequired = false, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 3, DataField = "Name", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 4, DataField = "Rate", ColSpan = 2, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox }, + new EditingFormItemDto { Order = 5, DataField = "IsActive", ColSpan = 2, IsRequired = false, EditorType2 = EditorTypes.dxCheckBox } ] } }), diff --git a/api/src/Kurs.Platform.Domain.Shared/PlatformConsts.cs b/api/src/Kurs.Platform.Domain.Shared/PlatformConsts.cs index 9963f4ff..90a45cac 100644 --- a/api/src/Kurs.Platform.Domain.Shared/PlatformConsts.cs +++ b/api/src/Kurs.Platform.Domain.Shared/PlatformConsts.cs @@ -24,7 +24,7 @@ public static class PlatformConsts public static string HtmlEditorOptions = "{\"toolbar\": {\"multiline\": true, \"items\": [{\"name\": \"undo\"},{\"name\": \"redo\"},{\"name\": \"separator\"},{\"name\": \"size\",\"acceptedValues\": [\"8pt\",\"10pt\",\"12pt\",\"14pt\",\"18pt\",\"24pt\",\"36pt\"],\"options\": {\"inputAttr\": {\"aria-label\": \"Font size\"}}},{\"name\": \"font\",\"acceptedValues\": [\"Arial\",\"Courier New\",\"Georgia\",\"Impact\",\"Lucida Console\",\"Tahoma\",\"Times New Roman\",\"Verdana\"],\"options\": {\"inputAttr\": {\"aria-label\": \"Font family\"}}},{\"name\": \"separator\"},{\"name\": \"bold\"},{\"name\": \"italic\"},{\"name\": \"strike\"},{\"name\": \"underline\"},{\"name\": \"separator\"},{\"name\": \"alignLeft\"},{\"name\": \"alignCenter\"},{\"name\": \"alignRight\"},{\"name\": \"alignJustify\"},{\"name\": \"separator\"},{\"name\": \"orderedList\"},{\"name\": \"bulletList\"},{\"name\": \"separator\"},{\"name\": \"header\",\"acceptedValues\": [false,1,2,3,4,5],\"options\": {\"inputAttr\": {\"aria-label\": \"Font family\"}}},{\"name\": \"separator\"},{\"name\": \"color\"},{\"name\": \"background\"},{\"name\": \"separator\"},{\"name\": \"link\"},{\"name\": \"image\"},{\"name\": \"separator\"},{\"name\": \"clear\"},{\"name\": \"codeBlock\"},{\"name\": \"blockquote\"},{\"name\": \"separator\"},{\"name\": \"insertTable\"},{\"name\": \"deleteTable\"},{\"name\": \"insertRowAbove\"},{\"name\": \"insertRowBelow\"},{\"name\": \"deleteRow\"},{\"name\": \"insertColumnLeft\"},{\"name\": \"insertColumnRight\"},{\"name\": \"deleteColumn\"}]}}"; public static string PhoneEditorOptions = "{\"format\": \"phoneGlobal\", \"mask\":\"(000) 000-0000\", \"maskInvalidMessage\":\"Lütfen geçerli bir telefon numarası girin\", \"useMaskedValue\":false, \"maskRules\": { \"X\": \"[1-9]\" }, \"placeholder\": \"(555) 123-4567\" }"; public static string TimeSpanOptions = "{\"type\":\"time\",\"pickerType\":\"list\",\"displayFormat\":\"HH:mm\",\"dateSerializationFormat\":\"yyyy-MM-ddTHH:mm:ss\",\"interval\":30,\"width\":\"100%\"}"; - public static string NumberStandartFormat = "{ \"format\": \",##0.###\" }"; + public static string NumberStandartFormat = "{ \"format\": \"fixedPoint\", \"precision\": 2 }"; public static string NumberPercentFormat = "{ \"format\": \"#0.##'%'\" }"; public static string DateFormat = "{ \"format\": \"dd/MM/yyyy\", \"displayFormat\" : \"dd/MM/yyyy\" }"; public static string DateTimeFormat = "{ \"format\": \"dd/MM/yyyy HH:mm\", \"displayFormat\" : \"dd/MM/yyyy HH:mm\" }"; @@ -62,9 +62,9 @@ public static class PlatformConsts public const string Address1 = "Address1"; public const string Address2 = "Address2"; public const string PostalCode = "PostalCode"; - public const string Phone = "Phone"; - public const string Mobile = "Mobile"; - public const string Fax = "Fax"; + public const string PhoneNumber = "PhoneNumber"; + public const string MobileNumber = "MobileNumber"; + public const string FaxNumber = "FaxNumber"; public const string Email = "Email"; public const string Website = "Website"; public const string MenuGroup = "MenuGroup"; diff --git a/api/src/Kurs.Platform.Domain/Entities/Branch/Accounting/Bank.cs b/api/src/Kurs.Platform.Domain/Entities/Branch/Accounting/Bank.cs index 3e0b2e0d..f4844a81 100644 --- a/api/src/Kurs.Platform.Domain/Entities/Branch/Accounting/Bank.cs +++ b/api/src/Kurs.Platform.Domain/Entities/Branch/Accounting/Bank.cs @@ -17,7 +17,7 @@ public class Bank : FullAuditedEntity, IMultiTenant public string City { get; set; } public string District { get; set; } public string PostalCode { get; set; } - public string Phone { get; set; } + public long? PhoneNumber { get; set; } public string Email { get; set; } Guid? IMultiTenant.TenantId => TenantId; diff --git a/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Contact.cs b/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Contact.cs index d7b9ba24..d3b9f4bd 100644 --- a/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Contact.cs +++ b/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Contact.cs @@ -9,7 +9,7 @@ public class Contact : FullAuditedEntity, IMultiTenant public Guid? TenantId { get; set; } public string Address { get; set; } - public string Phone { get; set; } + public long PhoneNumber { get; set; } public string Email { get; set; } public string Location { get; set; } public string TaxNumber { get; set; } diff --git a/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Demo.cs b/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Demo.cs index 75099357..a97d5afc 100644 --- a/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Demo.cs +++ b/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Demo.cs @@ -11,7 +11,7 @@ public class Demo : FullAuditedEntity, IMultiTenant public string OrganizationName { get; set; } public string FullName { get; set; } public string Email { get; set; } - public string Phone { get; set; } + public long PhoneNumber { get; set; } public string Address { get; set; } public int NumberOfBranches { get; set; } public int NumberOfUsers { get; set; } diff --git a/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Lawyer.cs b/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Lawyer.cs index 84f63690..2825b1e7 100644 --- a/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Lawyer.cs +++ b/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Lawyer.cs @@ -8,18 +8,15 @@ public class Lawyer : FullAuditedEntity, IMultiTenant { public Guid? TenantId { get; set; } - public string Name { get; set; } - public string ContactPerson { get; set; } + public string FullName { get; set; } public string Email { get; set; } public string Address { get; set; } public string TaxOffice { get; set; } public string TaxNumber { get; set; } - public long Phone1 { get; set; } - public long Phone2 { get; set; } - public long Phone3 { get; set; } - public long Phone4 { get; set; } - public long Fax { get; set; } + public long MobileNumber { get; set; } + public long? PhoneNumber { get; set; } + public long? FaxNumber { get; set; } public string Description { get; set; } public string Status { get; set; } diff --git a/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Order.cs b/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Order.cs index 796617b2..7ff38d8d 100644 --- a/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Order.cs +++ b/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Order.cs @@ -22,9 +22,9 @@ public class Order : FullAuditedEntity, IMultiTenant public string Country { get; set; } public string City { get; set; } public string PostalCode { get; set; } - public long Phone { get; set; } - public long Mobile { get; set; } - public long Fax { get; set; } + public long MobileNumber { get; set; } + public long? PhoneNumber { get; set; } + public long? FaxNumber { get; set; } public string Email { get; set; } public string Website { get; set; } public string MenuGroup { get; set; } diff --git a/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Psychologist.cs b/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Psychologist.cs index 1e8900bf..9f1b6b4b 100644 --- a/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Psychologist.cs +++ b/api/src/Kurs.Platform.Domain/Entities/Tenant/Administration/Psychologist.cs @@ -9,7 +9,7 @@ public class Psychologist : FullAuditedEntity, IMultiTenant public Guid? TenantId { get; set; } public string Name { get; set; } // AdSoyad - public string Phone { get; set; } // Telefon + public long PhoneNumber { get; set; } // Telefon public string Email { get; set; } // Eposta public string Address { get; set; } // Adres public string Status { get; set; } // Durum diff --git a/api/src/Kurs.Platform.Domain/Entities/Tenant/Hr/Employee.cs b/api/src/Kurs.Platform.Domain/Entities/Tenant/Hr/Employee.cs index c6b47ef5..a4facff3 100644 --- a/api/src/Kurs.Platform.Domain/Entities/Tenant/Hr/Employee.cs +++ b/api/src/Kurs.Platform.Domain/Entities/Tenant/Hr/Employee.cs @@ -23,8 +23,8 @@ public class Employee : FullAuditedEntity, IMultiTenant public string District { get; set; } public string Street { get; set; } public string PostalCode { get; set; } - public string Phone { get; set; } - public string PersonalPhone { get; set; } + public long MobileNumber { get; set; } + public long? PhoneNumber { get; set; } public string Email { get; set; } public string Address1 { get; set; } public string Address2 { get; set; } @@ -32,7 +32,7 @@ public class Employee : FullAuditedEntity, IMultiTenant // Emergency contact public string EmergencyContactName { get; set; } public string EmergencyContactRelationship { get; set; } - public string EmergencyContactPhone { get; set; } + public string EmergencyContactPhoneNumber { get; set; } public DateTime HireDate { get; set; } public DateTime? TerminationDate { get; set; } diff --git a/api/src/Kurs.Platform.Domain/Entities/Tenant/Hr/Payroll.cs b/api/src/Kurs.Platform.Domain/Entities/Tenant/Hr/Payroll.cs index 01aaa5ed..5bcb099f 100644 --- a/api/src/Kurs.Platform.Domain/Entities/Tenant/Hr/Payroll.cs +++ b/api/src/Kurs.Platform.Domain/Entities/Tenant/Hr/Payroll.cs @@ -17,7 +17,7 @@ public class Payroll : FullAuditedEntity, IMultiTenant public decimal? Bonus { get; set; } public decimal? GrossSalary { get; set; } public decimal? NetSalary { get; set; } - public decimal? Tax { get; set; } + public long? TaxNumber { get; set; } public decimal? SocialSecurity { get; set; } public string Status { get; set; } public DateTime? PaymentDate { get; set; } diff --git a/api/src/Kurs.Platform.Domain/Entities/Tenant/Intranet/Visitor.cs b/api/src/Kurs.Platform.Domain/Entities/Tenant/Intranet/Visitor.cs index f2223ba6..c16f045e 100644 --- a/api/src/Kurs.Platform.Domain/Entities/Tenant/Intranet/Visitor.cs +++ b/api/src/Kurs.Platform.Domain/Entities/Tenant/Intranet/Visitor.cs @@ -11,7 +11,7 @@ public class Visitor : FullAuditedEntity, IMultiTenant public string FullName { get; set; } public string CompanyName { get; set; } public string Email { get; set; } - public string Phone { get; set; } + public long PhoneNumber { get; set; } public string Purpose { get; set; } public DateTime VisitDate { get; set; } public DateTime? CheckIn { get; set; } diff --git a/api/src/Kurs.Platform.Domain/Entities/Tenant/Saas/Branch.cs b/api/src/Kurs.Platform.Domain/Entities/Tenant/Saas/Branch.cs index 7cbf14d1..796f9f51 100644 --- a/api/src/Kurs.Platform.Domain/Entities/Tenant/Saas/Branch.cs +++ b/api/src/Kurs.Platform.Domain/Entities/Tenant/Saas/Branch.cs @@ -18,9 +18,9 @@ public class Branch : FullAuditedEntity public string Address1 { get; set; } public string Address2 { get; set; } public string PostalCode { get; set; } - public long Phone { get; set; } - public long Mobile { get; set; } - public long Fax { get; set; } + public long MobileNumber { get; set; } + public long? PhoneNumber { get; set; } + public long? FaxNumber { get; set; } public string Email { get; set; } public string Website { get; set; } public bool? IsActive { get; set; } diff --git a/api/src/Kurs.Platform.Domain/Entities/Tenant/SupplyChain/Partner.cs b/api/src/Kurs.Platform.Domain/Entities/Tenant/SupplyChain/Partner.cs index f9bb6d7e..88e6cb5f 100644 --- a/api/src/Kurs.Platform.Domain/Entities/Tenant/SupplyChain/Partner.cs +++ b/api/src/Kurs.Platform.Domain/Entities/Tenant/SupplyChain/Partner.cs @@ -29,9 +29,9 @@ public class Partner : FullAuditedEntity, IMultiTenant public string Address1 { get; set; } public string Address2 { get; set; } public string PostalCode { get; set; } - public string Phone { get; set; } - public string Mobile { get; set; } - public string Fax { get; set; } + public long MobileNumber { get; set; } + public long? PhoneNumber { get; set; } + public long? FaxNumber { get; set; } public string Email { get; set; } public string Website { get; set; } diff --git a/api/src/Kurs.Platform.Domain/Entities/Tenant/SupplyChain/PartnerContact.cs b/api/src/Kurs.Platform.Domain/Entities/Tenant/SupplyChain/PartnerContact.cs index 6bb4b1e9..8ccc8c03 100644 --- a/api/src/Kurs.Platform.Domain/Entities/Tenant/SupplyChain/PartnerContact.cs +++ b/api/src/Kurs.Platform.Domain/Entities/Tenant/SupplyChain/PartnerContact.cs @@ -14,8 +14,8 @@ public class PartnerContact : FullAuditedEntity, IMultiTenant public string Title { get; set; } public string Department { get; set; } public string Email { get; set; } - public string Phone { get; set; } - public string Mobile { get; set; } + public long MobileNumber { get; set; } + public long? PhoneNumber { get; set; } public bool IsPrimary { get; set; } public bool IsActive { get; set; } } \ No newline at end of file diff --git a/api/src/Kurs.Platform.Domain/Extensions/AbpTenantExtensions.cs b/api/src/Kurs.Platform.Domain/Extensions/AbpTenantExtensions.cs index 6c194161..26f232cd 100644 --- a/api/src/Kurs.Platform.Domain/Extensions/AbpTenantExtensions.cs +++ b/api/src/Kurs.Platform.Domain/Extensions/AbpTenantExtensions.cs @@ -112,31 +112,31 @@ public static class AbpTenantExtensions return tenant.GetProperty(PlatformConsts.Tenants.PostalCode); } - public static void SetPhone(this Tenant tenant, long phone) + public static void SetPhoneNumber(this Tenant tenant, long? phoneNumber) { - tenant.SetProperty(PlatformConsts.Tenants.Phone, phone); + tenant.SetProperty(PlatformConsts.Tenants.PhoneNumber, phoneNumber); } - public static long GetPhone(this Tenant tenant) + public static long GetPhoneNumber(this Tenant tenant) { - return tenant.GetProperty(PlatformConsts.Tenants.Phone); + return tenant.GetProperty(PlatformConsts.Tenants.PhoneNumber); } - public static void SetMobile(this Tenant tenant, long mobile) + public static void SetMobileNumber(this Tenant tenant, long? mobileNumber) { - tenant.SetProperty(PlatformConsts.Tenants.Mobile, mobile); + tenant.SetProperty(PlatformConsts.Tenants.MobileNumber, mobileNumber); } - public static long GetMobile(this Tenant tenant) + public static long GetMobileNumber(this Tenant tenant) { - return tenant.GetProperty(PlatformConsts.Tenants.Mobile); + return tenant.GetProperty(PlatformConsts.Tenants.MobileNumber); } - public static void SetFax(this Tenant tenant, long fax) + public static void SetFaxNumber(this Tenant tenant, long? faxNumber) { - tenant.SetProperty(PlatformConsts.Tenants.Fax, fax); + tenant.SetProperty(PlatformConsts.Tenants.FaxNumber, faxNumber); } - public static long GetFax(this Tenant tenant) + public static long GetFaxNumber(this Tenant tenant) { - return tenant.GetProperty(PlatformConsts.Tenants.Fax); + return tenant.GetProperty(PlatformConsts.Tenants.FaxNumber); } public static void SetEmail(this Tenant tenant, string email) diff --git a/api/src/Kurs.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformDbContext.cs b/api/src/Kurs.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformDbContext.cs index a7875ab3..741810fa 100644 --- a/api/src/Kurs.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformDbContext.cs +++ b/api/src/Kurs.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformDbContext.cs @@ -275,9 +275,9 @@ public class PlatformDbContext : b.Property(a => a.Address1).HasMaxLength(512); b.Property(a => a.Address2).HasMaxLength(512); b.Property(a => a.PostalCode).HasMaxLength(16); - b.Property(a => a.Phone).HasMaxLength(20); - b.Property(a => a.Mobile).IsRequired().HasMaxLength(20); - b.Property(a => a.Fax).HasMaxLength(20); + b.Property(a => a.PhoneNumber).HasMaxLength(20); + b.Property(a => a.MobileNumber).IsRequired().HasMaxLength(20); + b.Property(a => a.FaxNumber).HasMaxLength(20); b.Property(a => a.Email).HasMaxLength(128); b.Property(a => a.Website).HasMaxLength(128); b.Property(a => a.IsActive).HasDefaultValue(true); @@ -1235,7 +1235,7 @@ public class PlatformDbContext : b.ConfigureByConvention(); b.Property(x => x.Name).HasMaxLength(100).IsRequired(); - b.Property(x => x.Phone).HasMaxLength(20); + b.Property(x => x.PhoneNumber).HasMaxLength(20); b.Property(x => x.Email).HasMaxLength(100); b.Property(x => x.Address).HasMaxLength(250); b.Property(x => x.Status).HasMaxLength(10); @@ -1254,18 +1254,15 @@ public class PlatformDbContext : b.ToTable(TableNameResolver.GetFullTableName(nameof(TableNameEnum.Lawyer)), Prefix.DbSchema); b.ConfigureByConvention(); - b.Property(x => x.Name).HasMaxLength(100).IsRequired(); - b.Property(x => x.ContactPerson).HasMaxLength(50); + b.Property(x => x.FullName).HasMaxLength(100).IsRequired(); b.Property(x => x.Email).HasMaxLength(100); b.Property(x => x.Address).HasMaxLength(250); b.Property(x => x.TaxOffice).HasMaxLength(50); b.Property(x => x.TaxNumber).HasMaxLength(20); - b.Property(x => x.Phone1).HasMaxLength(20); - b.Property(x => x.Phone2).HasMaxLength(20); - b.Property(x => x.Phone3).HasMaxLength(20); - b.Property(x => x.Phone4).HasMaxLength(20); - b.Property(x => x.Fax).HasMaxLength(20); + b.Property(x => x.PhoneNumber).HasMaxLength(20); + b.Property(x => x.MobileNumber).HasMaxLength(20); + b.Property(x => x.FaxNumber).HasMaxLength(20); b.Property(x => x.Description).HasMaxLength(1000); b.Property(x => x.Status).HasMaxLength(10); @@ -1484,7 +1481,7 @@ public class PlatformDbContext : b.Property(x => x.OrganizationName).IsRequired().HasMaxLength(256); b.Property(x => x.FullName).IsRequired().HasMaxLength(256); b.Property(x => x.Email).IsRequired().HasMaxLength(256); - b.Property(x => x.Phone).IsRequired().HasMaxLength(20); + b.Property(x => x.PhoneNumber).IsRequired().HasMaxLength(20); b.Property(x => x.Address).IsRequired().HasMaxLength(512); b.Property(x => x.NumberOfBranches).IsRequired(); b.Property(x => x.NumberOfUsers).IsRequired(); @@ -1497,7 +1494,7 @@ public class PlatformDbContext : b.ConfigureByConvention(); b.Property(x => x.Address).HasMaxLength(500); - b.Property(x => x.Phone).HasMaxLength(50); + b.Property(x => x.PhoneNumber).HasMaxLength(50); b.Property(x => x.Email).HasMaxLength(150); b.Property(x => x.Location).HasMaxLength(150); b.Property(x => x.TaxNumber).HasMaxLength(50); @@ -1637,7 +1634,7 @@ public class PlatformDbContext : b.Property(x => x.City).HasMaxLength(128); b.Property(x => x.PostalCode).HasMaxLength(16); b.Property(x => x.Country).HasMaxLength(128); - b.Property(x => x.Phone).HasMaxLength(64); + b.Property(x => x.PhoneNumber).HasMaxLength(64); b.Property(x => x.Email).HasMaxLength(128); }); @@ -1763,8 +1760,8 @@ public class PlatformDbContext : b.Property(x => x.Code).IsRequired().HasMaxLength(50); b.Property(x => x.FullName).HasMaxLength(200); b.Property(x => x.Email).HasMaxLength(150); - b.Property(x => x.Phone).HasMaxLength(50); - b.Property(x => x.PersonalPhone).HasMaxLength(50); + b.Property(x => x.PhoneNumber).HasMaxLength(50); + b.Property(x => x.MobileNumber).HasMaxLength(50); b.Property(x => x.Avatar).HasMaxLength(250); b.Property(x => x.NationalId).HasMaxLength(20); b.Property(x => x.PayrollGroup).HasMaxLength(50); @@ -1847,7 +1844,7 @@ public class PlatformDbContext : b.Property(x => x.Bonus).HasPrecision(18, 2); b.Property(x => x.GrossSalary).HasPrecision(18, 2); b.Property(x => x.NetSalary).HasPrecision(18, 2); - b.Property(x => x.Tax).HasPrecision(18, 2); + b.Property(x => x.TaxNumber).HasPrecision(18, 2); b.Property(x => x.SocialSecurity).HasPrecision(18, 2); }); @@ -2007,7 +2004,7 @@ public class PlatformDbContext : b.Property(x => x.FullName).IsRequired().HasMaxLength(100); b.Property(x => x.CompanyName).HasMaxLength(150); - b.Property(a => a.Phone).IsRequired().HasMaxLength(20); + b.Property(a => a.PhoneNumber).IsRequired().HasMaxLength(20); b.Property(x => x.Email).HasMaxLength(150); b.Property(x => x.Purpose).HasMaxLength(250); b.Property(x => x.Status).IsRequired().HasMaxLength(20); @@ -2287,9 +2284,9 @@ public class PlatformDbContext : b.Property(p => p.Address1).HasMaxLength(256); b.Property(p => p.Address2).HasMaxLength(256); b.Property(p => p.PostalCode).HasMaxLength(16); - b.Property(p => p.Phone).HasMaxLength(32); - b.Property(p => p.Mobile).HasMaxLength(32); - b.Property(p => p.Fax).HasMaxLength(32); + b.Property(p => p.PhoneNumber).HasMaxLength(32); + b.Property(p => p.MobileNumber).HasMaxLength(32); + b.Property(p => p.FaxNumber).HasMaxLength(32); b.Property(p => p.Email).HasMaxLength(128); b.Property(p => p.Website).HasMaxLength(128); b.Property(p => p.Status).IsRequired(); @@ -2381,8 +2378,8 @@ public class PlatformDbContext : b.Property(x => x.Title).HasMaxLength(64); b.Property(x => x.Department).HasMaxLength(64); b.Property(x => x.Email).HasMaxLength(128); - b.Property(x => x.Phone).HasMaxLength(32); - b.Property(x => x.Mobile).HasMaxLength(32); + b.Property(x => x.PhoneNumber).HasMaxLength(32); + b.Property(x => x.MobileNumber).HasMaxLength(32); b.Property(x => x.IsPrimary).HasDefaultValue(false); b.Property(x => x.IsActive).HasDefaultValue(true); diff --git a/api/src/Kurs.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformEfCoreEntityExtensionMappings.cs b/api/src/Kurs.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformEfCoreEntityExtensionMappings.cs index 531ad9a9..5d391a54 100644 --- a/api/src/Kurs.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformEfCoreEntityExtensionMappings.cs +++ b/api/src/Kurs.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformEfCoreEntityExtensionMappings.cs @@ -156,7 +156,7 @@ public static class PlatformEfCoreEntityExtensionMappings ObjectExtensionManager.Instance .MapEfCoreProperty( - PlatformConsts.Tenants.Phone, + PlatformConsts.Tenants.PhoneNumber, (entityBuilder, propertyBuilder) => { propertyBuilder.HasDefaultValue(null); @@ -165,7 +165,7 @@ public static class PlatformEfCoreEntityExtensionMappings ObjectExtensionManager.Instance .MapEfCoreProperty( - PlatformConsts.Tenants.Mobile, + PlatformConsts.Tenants.MobileNumber, (entityBuilder, propertyBuilder) => { propertyBuilder.HasDefaultValue(null); @@ -174,7 +174,7 @@ public static class PlatformEfCoreEntityExtensionMappings ObjectExtensionManager.Instance .MapEfCoreProperty( - PlatformConsts.Tenants.Fax, + PlatformConsts.Tenants.FaxNumber, (entityBuilder, propertyBuilder) => { propertyBuilder.HasDefaultValue(null); diff --git a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251103145000_Initial.Designer.cs b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251103202730_Initial.Designer.cs similarity index 99% rename from api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251103145000_Initial.Designer.cs rename to api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251103202730_Initial.Designer.cs index 35a2eadf..fe7f6455 100644 --- a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251103145000_Initial.Designer.cs +++ b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251103202730_Initial.Designer.cs @@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore; namespace Kurs.Platform.Migrations { [DbContext(typeof(PlatformDbContext))] - [Migration("20251103145000_Initial")] + [Migration("20251103202730_Initial")] partial class Initial { /// @@ -1173,9 +1173,9 @@ namespace Kurs.Platform.Migrations .HasMaxLength(128) .HasColumnType("nvarchar(128)"); - b.Property("Phone") + b.Property("PhoneNumber") .HasMaxLength(64) - .HasColumnType("nvarchar(64)"); + .HasColumnType("bigint"); b.Property("PostalCode") .HasMaxLength(16) @@ -1537,7 +1537,7 @@ namespace Kurs.Platform.Migrations .HasMaxLength(128) .HasColumnType("nvarchar(128)"); - b.Property("Fax") + b.Property("FaxNumber") .HasMaxLength(20) .HasColumnType("bigint"); @@ -1560,7 +1560,7 @@ namespace Kurs.Platform.Migrations .HasColumnType("uniqueidentifier") .HasColumnName("LastModifierId"); - b.Property("Mobile") + b.Property("MobileNumber") .HasMaxLength(20) .HasColumnType("bigint"); @@ -1569,7 +1569,7 @@ namespace Kurs.Platform.Migrations .HasMaxLength(128) .HasColumnType("nvarchar(128)"); - b.Property("Phone") + b.Property("PhoneNumber") .HasMaxLength(20) .HasColumnType("bigint"); @@ -2336,9 +2336,9 @@ namespace Kurs.Platform.Migrations b.Property("MapJson") .HasColumnType("text"); - b.Property("Phone") + b.Property("PhoneNumber") .HasMaxLength(50) - .HasColumnType("nvarchar(50)"); + .HasColumnType("bigint"); b.Property("TaxNumber") .HasMaxLength(50) @@ -3279,10 +3279,9 @@ namespace Kurs.Platform.Migrations .HasMaxLength(256) .HasColumnType("nvarchar(256)"); - b.Property("Phone") - .IsRequired() + b.Property("PhoneNumber") .HasMaxLength(20) - .HasColumnType("nvarchar(20)"); + .HasColumnType("bigint"); b.Property("TenantId") .HasColumnType("uniqueidentifier") @@ -3673,7 +3672,7 @@ namespace Kurs.Platform.Migrations b.Property("EmergencyContactName") .HasColumnType("nvarchar(max)"); - b.Property("EmergencyContactPhone") + b.Property("EmergencyContactPhoneNumber") .HasColumnType("nvarchar(max)"); b.Property("EmergencyContactRelationship") @@ -3723,6 +3722,10 @@ namespace Kurs.Platform.Migrations b.Property("MaritalStatus") .HasColumnType("nvarchar(max)"); + b.Property("MobileNumber") + .HasMaxLength(50) + .HasColumnType("bigint"); + b.Property("NationalId") .HasMaxLength(20) .HasColumnType("nvarchar(20)"); @@ -3731,13 +3734,9 @@ namespace Kurs.Platform.Migrations .HasMaxLength(50) .HasColumnType("nvarchar(50)"); - b.Property("PersonalPhone") + b.Property("PhoneNumber") .HasMaxLength(50) - .HasColumnType("nvarchar(50)"); - - b.Property("Phone") - .HasMaxLength(50) - .HasColumnType("nvarchar(50)"); + .HasColumnType("bigint"); b.Property("PostalCode") .HasColumnType("nvarchar(max)"); @@ -4523,10 +4522,6 @@ namespace Kurs.Platform.Migrations .HasMaxLength(250) .HasColumnType("nvarchar(250)"); - b.Property("ContactPerson") - .HasMaxLength(50) - .HasColumnType("nvarchar(50)"); - b.Property("CreationTime") .HasColumnType("datetime2") .HasColumnName("CreationTime"); @@ -4551,10 +4546,15 @@ namespace Kurs.Platform.Migrations .HasMaxLength(100) .HasColumnType("nvarchar(100)"); - b.Property("Fax") + b.Property("FaxNumber") .HasMaxLength(20) .HasColumnType("bigint"); + b.Property("FullName") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("nvarchar(100)"); + b.Property("IsDeleted") .ValueGeneratedOnAdd() .HasColumnType("bit") @@ -4569,24 +4569,11 @@ namespace Kurs.Platform.Migrations .HasColumnType("uniqueidentifier") .HasColumnName("LastModifierId"); - b.Property("Name") - .IsRequired() - .HasMaxLength(100) - .HasColumnType("nvarchar(100)"); - - b.Property("Phone1") + b.Property("MobileNumber") .HasMaxLength(20) .HasColumnType("bigint"); - b.Property("Phone2") - .HasMaxLength(20) - .HasColumnType("bigint"); - - b.Property("Phone3") - .HasMaxLength(20) - .HasColumnType("bigint"); - - b.Property("Phone4") + b.Property("PhoneNumber") .HasMaxLength(20) .HasColumnType("bigint"); @@ -6038,7 +6025,7 @@ namespace Kurs.Platform.Migrations .HasMaxLength(128) .HasColumnType("nvarchar(128)"); - b.Property("Fax") + b.Property("FaxNumber") .HasColumnType("bigint"); b.Property("Founder") @@ -6069,7 +6056,7 @@ namespace Kurs.Platform.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("Mobile") + b.Property("MobileNumber") .HasColumnType("bigint"); b.Property("Name") @@ -6087,7 +6074,7 @@ namespace Kurs.Platform.Migrations b.Property("PaymentMethodId") .HasColumnType("uniqueidentifier"); - b.Property("Phone") + b.Property("PhoneNumber") .HasColumnType("bigint"); b.Property("PostalCode") @@ -6368,9 +6355,9 @@ namespace Kurs.Platform.Migrations .HasMaxLength(128) .HasColumnType("nvarchar(128)"); - b.Property("Fax") + b.Property("FaxNumber") .HasMaxLength(32) - .HasColumnType("nvarchar(32)"); + .HasColumnType("bigint"); b.Property("IsDeleted") .ValueGeneratedOnAdd() @@ -6395,9 +6382,9 @@ namespace Kurs.Platform.Migrations .HasColumnType("decimal(18,2)") .HasDefaultValue(0m); - b.Property("Mobile") + b.Property("MobileNumber") .HasMaxLength(32) - .HasColumnType("nvarchar(32)"); + .HasColumnType("bigint"); b.Property("Name") .IsRequired() @@ -6413,9 +6400,9 @@ namespace Kurs.Platform.Migrations b.Property("PerformanceMetricsJson") .HasColumnType("text"); - b.Property("Phone") + b.Property("PhoneNumber") .HasMaxLength(32) - .HasColumnType("nvarchar(32)"); + .HasColumnType("bigint"); b.Property("PostalCode") .HasMaxLength(16) @@ -6725,16 +6712,16 @@ namespace Kurs.Platform.Migrations .HasColumnType("uniqueidentifier") .HasColumnName("LastModifierId"); - b.Property("Mobile") + b.Property("MobileNumber") .HasMaxLength(32) - .HasColumnType("nvarchar(32)"); + .HasColumnType("bigint"); b.Property("PartnerId") .HasColumnType("uniqueidentifier"); - b.Property("Phone") + b.Property("PhoneNumber") .HasMaxLength(32) - .HasColumnType("nvarchar(32)"); + .HasColumnType("bigint"); b.Property("TenantId") .HasColumnType("uniqueidentifier") @@ -6932,9 +6919,9 @@ namespace Kurs.Platform.Migrations b.Property("Status") .HasColumnType("nvarchar(max)"); - b.Property("Tax") + b.Property("TaxNumber") .HasPrecision(18, 2) - .HasColumnType("decimal(18,2)"); + .HasColumnType("bigint"); b.Property("TenantId") .HasColumnType("uniqueidentifier") @@ -7272,9 +7259,9 @@ namespace Kurs.Platform.Migrations .HasMaxLength(100) .HasColumnType("nvarchar(100)"); - b.Property("Phone") + b.Property("PhoneNumber") .HasMaxLength(20) - .HasColumnType("nvarchar(20)"); + .HasColumnType("bigint"); b.Property("Status") .HasMaxLength(10) @@ -10018,10 +10005,9 @@ namespace Kurs.Platform.Migrations .HasColumnType("uniqueidentifier") .HasColumnName("LastModifierId"); - b.Property("Phone") - .IsRequired() + b.Property("PhoneNumber") .HasMaxLength(20) - .HasColumnType("nvarchar(20)"); + .HasColumnType("bigint"); b.Property("Photo") .HasColumnType("nvarchar(max)"); @@ -12212,7 +12198,7 @@ namespace Kurs.Platform.Migrations .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); - b.Property("Fax") + b.Property("FaxNumber") .HasColumnType("bigint"); b.Property("Founder") @@ -12241,7 +12227,7 @@ namespace Kurs.Platform.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("Mobile") + b.Property("MobileNumber") .HasColumnType("bigint"); b.Property("Name") @@ -12258,7 +12244,7 @@ namespace Kurs.Platform.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("Phone") + b.Property("PhoneNumber") .HasColumnType("bigint"); b.Property("PostalCode") diff --git a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251103145000_Initial.cs b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251103202730_Initial.cs similarity index 99% rename from api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251103145000_Initial.cs rename to api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251103202730_Initial.cs index ee48a5ab..99f76116 100644 --- a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251103145000_Initial.cs +++ b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251103202730_Initial.cs @@ -347,13 +347,13 @@ namespace Kurs.Platform.Migrations Country = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: true), District = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: true), Email = table.Column(type: "nvarchar(256)", maxLength: 256, nullable: true), - Fax = table.Column(type: "bigint", nullable: false), + FaxNumber = table.Column(type: "bigint", nullable: false), Founder = table.Column(type: "nvarchar(max)", nullable: true), IsActive = table.Column(type: "bit", nullable: false, defaultValue: true), MenuGroup = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: true), - Mobile = table.Column(type: "bigint", nullable: false), + MobileNumber = table.Column(type: "bigint", nullable: false), OrganizationName = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: true), - Phone = table.Column(type: "bigint", nullable: false), + PhoneNumber = table.Column(type: "bigint", nullable: false), PostalCode = table.Column(type: "nvarchar(10)", maxLength: 10, nullable: true), Street = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: true), TaxOffice = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: true), @@ -449,7 +449,7 @@ namespace Kurs.Platform.Migrations City = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: true), District = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: true), PostalCode = table.Column(type: "nvarchar(16)", maxLength: 16, nullable: true), - Phone = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: true), + PhoneNumber = table.Column(type: "bigint", maxLength: 64, nullable: true), Email = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: true), CreationTime = table.Column(type: "datetime2", nullable: false), CreatorId = table.Column(type: "uniqueidentifier", nullable: true), @@ -539,7 +539,7 @@ namespace Kurs.Platform.Migrations Id = table.Column(type: "uniqueidentifier", nullable: false), TenantId = table.Column(type: "uniqueidentifier", nullable: true), Address = table.Column(type: "nvarchar(500)", maxLength: 500, nullable: true), - Phone = table.Column(type: "nvarchar(50)", maxLength: 50, nullable: true), + PhoneNumber = table.Column(type: "bigint", maxLength: 50, nullable: false), Email = table.Column(type: "nvarchar(150)", maxLength: 150, nullable: true), Location = table.Column(type: "nvarchar(150)", maxLength: 150, nullable: true), TaxNumber = table.Column(type: "nvarchar(50)", maxLength: 50, nullable: true), @@ -568,7 +568,7 @@ namespace Kurs.Platform.Migrations OrganizationName = table.Column(type: "nvarchar(256)", maxLength: 256, nullable: false), FullName = table.Column(type: "nvarchar(256)", maxLength: 256, nullable: false), Email = table.Column(type: "nvarchar(256)", maxLength: 256, nullable: false), - Phone = table.Column(type: "nvarchar(20)", maxLength: 20, nullable: false), + PhoneNumber = table.Column(type: "bigint", maxLength: 20, nullable: false), Address = table.Column(type: "nvarchar(512)", maxLength: 512, nullable: false), NumberOfBranches = table.Column(type: "int", nullable: false), NumberOfUsers = table.Column(type: "int", nullable: false), @@ -675,17 +675,14 @@ namespace Kurs.Platform.Migrations { Id = table.Column(type: "uniqueidentifier", nullable: false), TenantId = table.Column(type: "uniqueidentifier", nullable: true), - Name = table.Column(type: "nvarchar(100)", maxLength: 100, nullable: false), - ContactPerson = table.Column(type: "nvarchar(50)", maxLength: 50, nullable: true), + FullName = table.Column(type: "nvarchar(100)", maxLength: 100, nullable: false), Email = table.Column(type: "nvarchar(100)", maxLength: 100, nullable: true), Address = table.Column(type: "nvarchar(250)", maxLength: 250, nullable: true), TaxOffice = table.Column(type: "nvarchar(50)", maxLength: 50, nullable: true), TaxNumber = table.Column(type: "nvarchar(20)", maxLength: 20, nullable: true), - Phone1 = table.Column(type: "bigint", maxLength: 20, nullable: false), - Phone2 = table.Column(type: "bigint", maxLength: 20, nullable: false), - Phone3 = table.Column(type: "bigint", maxLength: 20, nullable: false), - Phone4 = table.Column(type: "bigint", maxLength: 20, nullable: false), - Fax = table.Column(type: "bigint", maxLength: 20, nullable: false), + MobileNumber = table.Column(type: "bigint", maxLength: 20, nullable: false), + PhoneNumber = table.Column(type: "bigint", maxLength: 20, nullable: true), + FaxNumber = table.Column(type: "bigint", maxLength: 20, nullable: true), Description = table.Column(type: "nvarchar(1000)", maxLength: 1000, nullable: true), Status = table.Column(type: "nvarchar(10)", maxLength: 10, nullable: true), CreationTime = table.Column(type: "datetime2", nullable: false), @@ -719,9 +716,9 @@ namespace Kurs.Platform.Migrations Country = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: true), City = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: true), PostalCode = table.Column(type: "nvarchar(16)", maxLength: 16, nullable: true), - Phone = table.Column(type: "bigint", nullable: false), - Mobile = table.Column(type: "bigint", nullable: false), - Fax = table.Column(type: "bigint", nullable: false), + MobileNumber = table.Column(type: "bigint", nullable: false), + PhoneNumber = table.Column(type: "bigint", nullable: true), + FaxNumber = table.Column(type: "bigint", nullable: true), Email = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: true), Website = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: true), MenuGroup = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: true), @@ -800,7 +797,7 @@ namespace Kurs.Platform.Migrations Id = table.Column(type: "uniqueidentifier", nullable: false), TenantId = table.Column(type: "uniqueidentifier", nullable: true), Name = table.Column(type: "nvarchar(100)", maxLength: 100, nullable: false), - Phone = table.Column(type: "nvarchar(20)", maxLength: 20, nullable: true), + PhoneNumber = table.Column(type: "bigint", maxLength: 20, nullable: false), Email = table.Column(type: "nvarchar(100)", maxLength: 100, nullable: true), Address = table.Column(type: "nvarchar(250)", maxLength: 250, nullable: true), Status = table.Column(type: "nvarchar(10)", maxLength: 10, nullable: true), @@ -1274,7 +1271,7 @@ namespace Kurs.Platform.Migrations Bonus = table.Column(type: "decimal(18,2)", precision: 18, scale: 2, nullable: true), GrossSalary = table.Column(type: "decimal(18,2)", precision: 18, scale: 2, nullable: true), NetSalary = table.Column(type: "decimal(18,2)", precision: 18, scale: 2, nullable: true), - Tax = table.Column(type: "decimal(18,2)", precision: 18, scale: 2, nullable: true), + TaxNumber = table.Column(type: "bigint", precision: 18, scale: 2, nullable: true), SocialSecurity = table.Column(type: "decimal(18,2)", precision: 18, scale: 2, nullable: true), Status = table.Column(type: "nvarchar(max)", nullable: true), PaymentDate = table.Column(type: "datetime2", nullable: true), @@ -2167,9 +2164,9 @@ namespace Kurs.Platform.Migrations Address1 = table.Column(type: "nvarchar(512)", maxLength: 512, nullable: true), Address2 = table.Column(type: "nvarchar(512)", maxLength: 512, nullable: true), PostalCode = table.Column(type: "nvarchar(16)", maxLength: 16, nullable: true), - Phone = table.Column(type: "bigint", maxLength: 20, nullable: false), - Mobile = table.Column(type: "bigint", maxLength: 20, nullable: false), - Fax = table.Column(type: "bigint", maxLength: 20, nullable: false), + MobileNumber = table.Column(type: "bigint", maxLength: 20, nullable: false), + PhoneNumber = table.Column(type: "bigint", maxLength: 20, nullable: true), + FaxNumber = table.Column(type: "bigint", maxLength: 20, nullable: true), Email = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: true), Website = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: true), IsActive = table.Column(type: "bit", nullable: true, defaultValue: true), @@ -4048,9 +4045,9 @@ namespace Kurs.Platform.Migrations Address1 = table.Column(type: "nvarchar(256)", maxLength: 256, nullable: true), Address2 = table.Column(type: "nvarchar(256)", maxLength: 256, nullable: true), PostalCode = table.Column(type: "nvarchar(16)", maxLength: 16, nullable: true), - Phone = table.Column(type: "nvarchar(32)", maxLength: 32, nullable: true), - Mobile = table.Column(type: "nvarchar(32)", maxLength: 32, nullable: true), - Fax = table.Column(type: "nvarchar(32)", maxLength: 32, nullable: true), + MobileNumber = table.Column(type: "bigint", maxLength: 32, nullable: false), + PhoneNumber = table.Column(type: "bigint", maxLength: 32, nullable: true), + FaxNumber = table.Column(type: "bigint", maxLength: 32, nullable: true), Email = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: true), Website = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: true), CurrencyId = table.Column(type: "uniqueidentifier", nullable: true), @@ -4210,8 +4207,8 @@ namespace Kurs.Platform.Migrations Title = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: true), Department = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: true), Email = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: true), - Phone = table.Column(type: "nvarchar(32)", maxLength: 32, nullable: true), - Mobile = table.Column(type: "nvarchar(32)", maxLength: 32, nullable: true), + MobileNumber = table.Column(type: "bigint", maxLength: 32, nullable: false), + PhoneNumber = table.Column(type: "bigint", maxLength: 32, nullable: true), IsPrimary = table.Column(type: "bit", nullable: false, defaultValue: false), IsActive = table.Column(type: "bit", nullable: false, defaultValue: true), CreationTime = table.Column(type: "datetime2", nullable: false), @@ -4401,14 +4398,14 @@ namespace Kurs.Platform.Migrations District = table.Column(type: "nvarchar(max)", nullable: true), Street = table.Column(type: "nvarchar(max)", nullable: true), PostalCode = table.Column(type: "nvarchar(max)", nullable: true), - Phone = table.Column(type: "nvarchar(50)", maxLength: 50, nullable: true), - PersonalPhone = table.Column(type: "nvarchar(50)", maxLength: 50, nullable: true), + MobileNumber = table.Column(type: "bigint", maxLength: 50, nullable: false), + PhoneNumber = table.Column(type: "bigint", maxLength: 50, nullable: true), Email = table.Column(type: "nvarchar(150)", maxLength: 150, nullable: true), Address1 = table.Column(type: "nvarchar(max)", nullable: true), Address2 = table.Column(type: "nvarchar(max)", nullable: true), EmergencyContactName = table.Column(type: "nvarchar(max)", nullable: true), EmergencyContactRelationship = table.Column(type: "nvarchar(max)", nullable: true), - EmergencyContactPhone = table.Column(type: "nvarchar(max)", nullable: true), + EmergencyContactPhoneNumber = table.Column(type: "nvarchar(max)", nullable: true), HireDate = table.Column(type: "datetime2", nullable: false), TerminationDate = table.Column(type: "datetime2", nullable: true), EmploymentTypeId = table.Column(type: "uniqueidentifier", nullable: true), @@ -4812,7 +4809,7 @@ namespace Kurs.Platform.Migrations FullName = table.Column(type: "nvarchar(100)", maxLength: 100, nullable: false), CompanyName = table.Column(type: "nvarchar(150)", maxLength: 150, nullable: true), Email = table.Column(type: "nvarchar(150)", maxLength: 150, nullable: true), - Phone = table.Column(type: "nvarchar(20)", maxLength: 20, nullable: false), + PhoneNumber = table.Column(type: "bigint", maxLength: 20, nullable: false), Purpose = table.Column(type: "nvarchar(250)", maxLength: 250, nullable: true), VisitDate = table.Column(type: "datetime2", nullable: false), CheckIn = table.Column(type: "datetime2", nullable: true), diff --git a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs index 8309002b..9fc80ebd 100644 --- a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs +++ b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs @@ -1170,9 +1170,9 @@ namespace Kurs.Platform.Migrations .HasMaxLength(128) .HasColumnType("nvarchar(128)"); - b.Property("Phone") + b.Property("PhoneNumber") .HasMaxLength(64) - .HasColumnType("nvarchar(64)"); + .HasColumnType("bigint"); b.Property("PostalCode") .HasMaxLength(16) @@ -1534,7 +1534,7 @@ namespace Kurs.Platform.Migrations .HasMaxLength(128) .HasColumnType("nvarchar(128)"); - b.Property("Fax") + b.Property("FaxNumber") .HasMaxLength(20) .HasColumnType("bigint"); @@ -1557,7 +1557,7 @@ namespace Kurs.Platform.Migrations .HasColumnType("uniqueidentifier") .HasColumnName("LastModifierId"); - b.Property("Mobile") + b.Property("MobileNumber") .HasMaxLength(20) .HasColumnType("bigint"); @@ -1566,7 +1566,7 @@ namespace Kurs.Platform.Migrations .HasMaxLength(128) .HasColumnType("nvarchar(128)"); - b.Property("Phone") + b.Property("PhoneNumber") .HasMaxLength(20) .HasColumnType("bigint"); @@ -2333,9 +2333,9 @@ namespace Kurs.Platform.Migrations b.Property("MapJson") .HasColumnType("text"); - b.Property("Phone") + b.Property("PhoneNumber") .HasMaxLength(50) - .HasColumnType("nvarchar(50)"); + .HasColumnType("bigint"); b.Property("TaxNumber") .HasMaxLength(50) @@ -3276,10 +3276,9 @@ namespace Kurs.Platform.Migrations .HasMaxLength(256) .HasColumnType("nvarchar(256)"); - b.Property("Phone") - .IsRequired() + b.Property("PhoneNumber") .HasMaxLength(20) - .HasColumnType("nvarchar(20)"); + .HasColumnType("bigint"); b.Property("TenantId") .HasColumnType("uniqueidentifier") @@ -3670,7 +3669,7 @@ namespace Kurs.Platform.Migrations b.Property("EmergencyContactName") .HasColumnType("nvarchar(max)"); - b.Property("EmergencyContactPhone") + b.Property("EmergencyContactPhoneNumber") .HasColumnType("nvarchar(max)"); b.Property("EmergencyContactRelationship") @@ -3720,6 +3719,10 @@ namespace Kurs.Platform.Migrations b.Property("MaritalStatus") .HasColumnType("nvarchar(max)"); + b.Property("MobileNumber") + .HasMaxLength(50) + .HasColumnType("bigint"); + b.Property("NationalId") .HasMaxLength(20) .HasColumnType("nvarchar(20)"); @@ -3728,13 +3731,9 @@ namespace Kurs.Platform.Migrations .HasMaxLength(50) .HasColumnType("nvarchar(50)"); - b.Property("PersonalPhone") + b.Property("PhoneNumber") .HasMaxLength(50) - .HasColumnType("nvarchar(50)"); - - b.Property("Phone") - .HasMaxLength(50) - .HasColumnType("nvarchar(50)"); + .HasColumnType("bigint"); b.Property("PostalCode") .HasColumnType("nvarchar(max)"); @@ -4520,10 +4519,6 @@ namespace Kurs.Platform.Migrations .HasMaxLength(250) .HasColumnType("nvarchar(250)"); - b.Property("ContactPerson") - .HasMaxLength(50) - .HasColumnType("nvarchar(50)"); - b.Property("CreationTime") .HasColumnType("datetime2") .HasColumnName("CreationTime"); @@ -4548,10 +4543,15 @@ namespace Kurs.Platform.Migrations .HasMaxLength(100) .HasColumnType("nvarchar(100)"); - b.Property("Fax") + b.Property("FaxNumber") .HasMaxLength(20) .HasColumnType("bigint"); + b.Property("FullName") + .IsRequired() + .HasMaxLength(100) + .HasColumnType("nvarchar(100)"); + b.Property("IsDeleted") .ValueGeneratedOnAdd() .HasColumnType("bit") @@ -4566,24 +4566,11 @@ namespace Kurs.Platform.Migrations .HasColumnType("uniqueidentifier") .HasColumnName("LastModifierId"); - b.Property("Name") - .IsRequired() - .HasMaxLength(100) - .HasColumnType("nvarchar(100)"); - - b.Property("Phone1") + b.Property("MobileNumber") .HasMaxLength(20) .HasColumnType("bigint"); - b.Property("Phone2") - .HasMaxLength(20) - .HasColumnType("bigint"); - - b.Property("Phone3") - .HasMaxLength(20) - .HasColumnType("bigint"); - - b.Property("Phone4") + b.Property("PhoneNumber") .HasMaxLength(20) .HasColumnType("bigint"); @@ -6035,7 +6022,7 @@ namespace Kurs.Platform.Migrations .HasMaxLength(128) .HasColumnType("nvarchar(128)"); - b.Property("Fax") + b.Property("FaxNumber") .HasColumnType("bigint"); b.Property("Founder") @@ -6066,7 +6053,7 @@ namespace Kurs.Platform.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("Mobile") + b.Property("MobileNumber") .HasColumnType("bigint"); b.Property("Name") @@ -6084,7 +6071,7 @@ namespace Kurs.Platform.Migrations b.Property("PaymentMethodId") .HasColumnType("uniqueidentifier"); - b.Property("Phone") + b.Property("PhoneNumber") .HasColumnType("bigint"); b.Property("PostalCode") @@ -6365,9 +6352,9 @@ namespace Kurs.Platform.Migrations .HasMaxLength(128) .HasColumnType("nvarchar(128)"); - b.Property("Fax") + b.Property("FaxNumber") .HasMaxLength(32) - .HasColumnType("nvarchar(32)"); + .HasColumnType("bigint"); b.Property("IsDeleted") .ValueGeneratedOnAdd() @@ -6392,9 +6379,9 @@ namespace Kurs.Platform.Migrations .HasColumnType("decimal(18,2)") .HasDefaultValue(0m); - b.Property("Mobile") + b.Property("MobileNumber") .HasMaxLength(32) - .HasColumnType("nvarchar(32)"); + .HasColumnType("bigint"); b.Property("Name") .IsRequired() @@ -6410,9 +6397,9 @@ namespace Kurs.Platform.Migrations b.Property("PerformanceMetricsJson") .HasColumnType("text"); - b.Property("Phone") + b.Property("PhoneNumber") .HasMaxLength(32) - .HasColumnType("nvarchar(32)"); + .HasColumnType("bigint"); b.Property("PostalCode") .HasMaxLength(16) @@ -6722,16 +6709,16 @@ namespace Kurs.Platform.Migrations .HasColumnType("uniqueidentifier") .HasColumnName("LastModifierId"); - b.Property("Mobile") + b.Property("MobileNumber") .HasMaxLength(32) - .HasColumnType("nvarchar(32)"); + .HasColumnType("bigint"); b.Property("PartnerId") .HasColumnType("uniqueidentifier"); - b.Property("Phone") + b.Property("PhoneNumber") .HasMaxLength(32) - .HasColumnType("nvarchar(32)"); + .HasColumnType("bigint"); b.Property("TenantId") .HasColumnType("uniqueidentifier") @@ -6929,9 +6916,9 @@ namespace Kurs.Platform.Migrations b.Property("Status") .HasColumnType("nvarchar(max)"); - b.Property("Tax") + b.Property("TaxNumber") .HasPrecision(18, 2) - .HasColumnType("decimal(18,2)"); + .HasColumnType("bigint"); b.Property("TenantId") .HasColumnType("uniqueidentifier") @@ -7269,9 +7256,9 @@ namespace Kurs.Platform.Migrations .HasMaxLength(100) .HasColumnType("nvarchar(100)"); - b.Property("Phone") + b.Property("PhoneNumber") .HasMaxLength(20) - .HasColumnType("nvarchar(20)"); + .HasColumnType("bigint"); b.Property("Status") .HasMaxLength(10) @@ -10015,10 +10002,9 @@ namespace Kurs.Platform.Migrations .HasColumnType("uniqueidentifier") .HasColumnName("LastModifierId"); - b.Property("Phone") - .IsRequired() + b.Property("PhoneNumber") .HasMaxLength(20) - .HasColumnType("nvarchar(20)"); + .HasColumnType("bigint"); b.Property("Photo") .HasColumnType("nvarchar(max)"); @@ -12209,7 +12195,7 @@ namespace Kurs.Platform.Migrations .HasColumnType("nvarchar(max)") .HasColumnName("ExtraProperties"); - b.Property("Fax") + b.Property("FaxNumber") .HasColumnType("bigint"); b.Property("Founder") @@ -12238,7 +12224,7 @@ namespace Kurs.Platform.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("Mobile") + b.Property("MobileNumber") .HasColumnType("bigint"); b.Property("Name") @@ -12255,7 +12241,7 @@ namespace Kurs.Platform.Migrations .HasMaxLength(64) .HasColumnType("nvarchar(64)"); - b.Property("Phone") + b.Property("PhoneNumber") .HasColumnType("bigint"); b.Property("PostalCode") diff --git a/api/src/Kurs.Platform.EntityFrameworkCore/Tenants/Seeds/TenantData.json b/api/src/Kurs.Platform.EntityFrameworkCore/Tenants/Seeds/TenantData.json index bfead27e..78a51588 100644 --- a/api/src/Kurs.Platform.EntityFrameworkCore/Tenants/Seeds/TenantData.json +++ b/api/src/Kurs.Platform.EntityFrameworkCore/Tenants/Seeds/TenantData.json @@ -594,7 +594,7 @@ "Contacts": [ { "address": "Public.contact.address.full", - "phone": "+90 (544) 769 7 638", + "phoneNumber": "5447697638", "email": "destek@sozsoft.com", "location": "Sarıgazi", "taxNumber": "32374982750", @@ -2859,14 +2859,14 @@ "district": "Ümraniye", "street": "Fatih sultan mehmet mah.", "postalCode": "34771", - "phone": "2125550100", - "personalPhone": "5325550101", + "phoneNumber": "2125550100", + "mobileNumber": "5325550101", "email": "ali.ozturk@company.com", "address1": "", "address2": "", "emergencyContactname": "Ayşe Öztürk", "emergencyContactrelationship": "Eşi", - "emergencyContactphone": "5325550100", + "emergencyContactphoneNumber": "5325550100", "hireDate": "09-01-2020", "terminationDate": null, "employmentTypeName": "Full Time", @@ -2899,14 +2899,14 @@ "district": "Güdül", "street": "Özköy mah.", "postalCode": "6840", - "phone": "2125550102", - "personalPhone": "5325550103", + "phoneNumber": "2125550102", + "mobileNumber": "5325550103", "email": "ayse.kaya@company.com", "address1": "", "address2": "", "emergencyContactname": "Fatma Kaya", "emergencyContactrelationship": "Anne", - "emergencyContactphone": "5325550104", + "emergencyContactphoneNumber": "5325550104", "hireDate": "01-06-2021", "terminationDate": null, "employmentTypeName": "Full Time", @@ -2939,14 +2939,14 @@ "district": "Merkez", "street": "Kızıldamlar köyü", "postalCode": "34000", - "phone": "2125550105", - "personalPhone": "5325550106", + "phoneNumber": "2125550105", + "mobileNumber": "5325550106", "email": "mehmet.yilmaz@company.com", "address1": "", "address2": "", "emergencyContactname": "Zeynep Yılmaz", "emergencyContactrelationship": "Eşi", - "emergencyContactphone": "5325550107", + "emergencyContactphoneNumber": "5325550107", "hireDate": "10-02-2020", "terminationDate": null, "employmentTypeName": "Full Time", @@ -2979,14 +2979,14 @@ "district": "", "street": "", "postalCode": "06100", - "phone": "3125550108", - "personalPhone": "5425550109", + "phoneNumber": "3125550108", + "mobileNumber": "5425550109", "email": "selin.demir@company.com", "address1": "", "address2": "", "emergencyContactname": "Ali Demir", "emergencyContactrelationship": "Baba", - "emergencyContactphone": "5325550110", + "emergencyContactphoneNumber": "5325550110", "hireDate": "10-01-2022", "terminationDate": null, "employmentTypeName": "Part Time", @@ -3019,14 +3019,14 @@ "district": "Kadıköy", "street": "Bağdat Cad.", "postalCode": "34728", - "phone": "2125550111", - "personalPhone": "5325550112", + "phoneNumber": "2125550111", + "mobileNumber": "5325550112", "email": "ahmet.celik@company.com", "address1": "", "address2": "", "emergencyContactname": "Emine Çelik", "emergencyContactrelationship": "Eşi", - "emergencyContactphone": "5325550113", + "emergencyContactphoneNumber": "5325550113", "hireDate": "01-04-2019", "terminationDate": null, "employmentTypeName": "Full Time", @@ -3059,14 +3059,14 @@ "district": "İzmir", "street": "Yıldız Mah.", "postalCode": "35000", - "phone": "2165550114", - "personalPhone": "5325550115", + "phoneNumber": "2165550114", + "mobileNumber": "5325550115", "email": "zeynep.arslan@company.com", "address1": "", "address2": "", "emergencyContactname": "Hasan Arslan", "emergencyContactrelationship": "Baba", - "emergencyContactphone": "5325550116", + "emergencyContactphoneNumber": "5325550116", "hireDate": "02-03-2023", "terminationDate": null, "employmentTypeName": "Intern", @@ -3099,14 +3099,14 @@ "district": "Ankara", "street": "Osmangazi Mah.", "postalCode": "16000", - "phone": "2245550117", - "personalPhone": "5325550118", + "phoneNumber": "2245550117", + "mobileNumber": "5325550118", "email": "burak.koc@company.com", "address1": "", "address2": "", "emergencyContactname": "Elif Koç", "emergencyContactrelationship": "Eşi", - "emergencyContactphone": "5325550119", + "emergencyContactphoneNumber": "5325550119", "hireDate": "09-07-2021", "terminationDate": null, "employmentTypeName": "Full Time", @@ -3139,14 +3139,14 @@ "district": "İzmir", "street": "Alsancak Mah. No:88", "postalCode": "35220", - "phone": "2325550120", - "personalPhone": "5325550121", + "phoneNumber": "2325550120", + "mobileNumber": "5325550121", "email": "elif.sahin@company.com", "address1": "", "address2": "", "emergencyContactname": "Murat Şahin", "emergencyContactrelationship": "Eşi", - "emergencyContactphone": "5325550122", + "emergencyContactphoneNumber": "5325550122", "hireDate": "01-09-2018", "terminationDate": null, "employmentTypeName": "Full Time", @@ -3179,14 +3179,14 @@ "district": "Ankara", "street": "Bahçelievler Mah. No:55", "postalCode": "06490", - "phone": "3125550123", - "personalPhone": "5325550124", + "phoneNumber": "3125550123", + "mobileNumber": "5325550124", "email": "canan.ozturk@company.com", "address1": "", "address2": "", "emergencyContactname": "Hüseyin Öztürk", "emergencyContactrelationship": "Baba", - "emergencyContactphone": "5325550125", + "emergencyContactphoneNumber": "5325550125", "hireDate": "02-06-2020", "terminationDate": null, "employmentTypeName": "Full Time", @@ -3219,14 +3219,14 @@ "district": "İstanbul", "street": "Şişli Mah. No:101", "postalCode": "34360", - "phone": "2125550126", - "personalPhone": "5325550127", + "phoneNumber": "2125550126", + "mobileNumber": "5325550127", "email": "murat.aydin@company.com", "address1": "", "address2": "", "emergencyContactname": "Ayten Aydın", "emergencyContactrelationship": "Eşi", - "emergencyContactphone": "5325550128", + "emergencyContactphoneNumber": "5325550128", "hireDate": "06-05-2017", "terminationDate": null, "employmentTypeName": "Full Time", @@ -3775,7 +3775,7 @@ "fullName": "Ali Veli", "companyName": "ABC Teknoloji", "email": "ali.veli@abc.com", - "phone": "5321112233", + "phoneNumber": "5321112233", "visitDate": "2025-10-29T09:00:00", "checkIn": "2025-10-29T09:15:00", "employeeCode": "EMP-001", @@ -3787,7 +3787,7 @@ "fullName": "Fatma Yıldız", "companyName": "XYZ Danışmanlık", "email": "fatma@xyz.com", - "phone": "5332223344", + "phoneNumber": "5332223344", "visitDate": "2025-10-30T10:30:00", "employeeCode": "EMP-002", "purpose": "Eğitim Danışmanlığı", @@ -3798,7 +3798,7 @@ "fullName": "Mehmet Kara", "companyName": "DEF Yazılım", "email": "mehmet@def.com", - "phone": "5343334455", + "phoneNumber": "5343334455", "visitDate": "2025-10-31T14:00:00", "checkIn": "2025-10-31T14:10:00", "checkOut": "2025-10-31T16:00:00", diff --git a/api/src/Kurs.Platform.EntityFrameworkCore/Tenants/TenantDataSeeder.cs b/api/src/Kurs.Platform.EntityFrameworkCore/Tenants/TenantDataSeeder.cs index 1a9fe556..deb41e97 100644 --- a/api/src/Kurs.Platform.EntityFrameworkCore/Tenants/TenantDataSeeder.cs +++ b/api/src/Kurs.Platform.EntityFrameworkCore/Tenants/TenantDataSeeder.cs @@ -589,7 +589,7 @@ public class TenantDataSeeder : IDataSeedContributor, ITransientDependency await _contactRepository.InsertAsync(new Contact { Address = item.Address, - Phone = item.Phone, + PhoneNumber = item.PhoneNumber, Email = item.Email, Location = item.Location, TaxNumber = item.TaxNumber, @@ -1052,15 +1052,15 @@ public class TenantDataSeeder : IDataSeedContributor, ITransientDependency District = item.District, Street = item.Street, PostalCode = item.PostalCode, - Phone = item.Phone, - PersonalPhone = item.PersonalPhone, + MobileNumber = item.MobileNumber, + PhoneNumber = item.PhoneNumber, Email = item.Email, Address1 = item.Address1, Address2 = item.Address2, EmergencyContactName = item.EmergencyContactName, EmergencyContactRelationship = item.EmergencyContactRelationship, - EmergencyContactPhone = item.EmergencyContactPhone, + EmergencyContactPhoneNumber = item.EmergencyContactPhoneNumber, HireDate = item.HireDate, TerminationDate = item.TerminationDate != null ? item.TerminationDate : null, @@ -1147,7 +1147,7 @@ public class TenantDataSeeder : IDataSeedContributor, ITransientDependency Bonus = item.Bonus, GrossSalary = item.GrossSalary, NetSalary = item.NetSalary, - Tax = item.Tax, + TaxNumber = item.TaxNumber, SocialSecurity = item.SocialSecurity, Status = item.Status }, autoSave: true); @@ -1298,7 +1298,7 @@ public class TenantDataSeeder : IDataSeedContributor, ITransientDependency FullName = item.FullName, CompanyName = item.CompanyName, Email = item.Email, - Phone = item.Phone, + PhoneNumber = item.PhoneNumber, Purpose = item.Purpose, VisitDate = item.VisitDate, CheckIn = item.CheckIn, diff --git a/api/src/Kurs.Platform.EntityFrameworkCore/Tenants/TenantSeederDto.cs b/api/src/Kurs.Platform.EntityFrameworkCore/Tenants/TenantSeederDto.cs index fb483ac3..0f2378bd 100644 --- a/api/src/Kurs.Platform.EntityFrameworkCore/Tenants/TenantSeederDto.cs +++ b/api/src/Kurs.Platform.EntityFrameworkCore/Tenants/TenantSeederDto.cs @@ -215,7 +215,7 @@ public class VisitorSeedDto public string FullName { get; set; } public string CompanyName { get; set; } public string Email { get; set; } - public string Phone { get; set; } + public long PhoneNumber { get; set; } public string Purpose { get; set; } public DateTime VisitDate { get; set; } public DateTime? CheckIn { get; set; } @@ -310,7 +310,7 @@ public class PayrollSeedDto public decimal Bonus { get; set; } public decimal GrossSalary { get; set; } public decimal NetSalary { get; set; } - public decimal Tax { get; set; } + public long TaxNumber { get; set; } public decimal SocialSecurity { get; set; } public string Status { get; set; } } @@ -355,15 +355,15 @@ public class EmployeeSeedDto public string District { get; set; } public string Street { get; set; } public string PostalCode { get; set; } - public string Phone { get; set; } - public string PersonalPhone { get; set; } + public long MobileNumber { get; set; } + public long? PhoneNumber { get; set; } public string Email { get; set; } public string Address1 { get; set; } public string Address2 { get; set; } public string EmergencyContactName { get; set; } public string EmergencyContactRelationship { get; set; } - public string EmergencyContactPhone { get; set; } + public string EmergencyContactPhoneNumber { get; set; } public DateTime HireDate { get; set; } public DateTime? TerminationDate { get; set; } @@ -606,7 +606,7 @@ public class AboutSeedDto public class ContactSeedDto { public string Address { get; set; } - public string Phone { get; set; } + public long PhoneNumber { get; set; } public string Email { get; set; } public string Location { get; set; } public string TaxNumber { get; set; } diff --git a/ui/src/components/orders/PaymentForm.tsx b/ui/src/components/orders/PaymentForm.tsx index b8d879b5..3e666a0f 100644 --- a/ui/src/components/orders/PaymentForm.tsx +++ b/ui/src/components/orders/PaymentForm.tsx @@ -171,9 +171,9 @@ export const PaymentForm: React.FC = ({
- {translate('::Public.payment.customer.phone')} + {translate('::Public.payment.customer.phoneNumber')} - {tenant.phone} + {tenant.phoneNumber}
diff --git a/ui/src/components/orders/TenantForm.tsx b/ui/src/components/orders/TenantForm.tsx index 5f42db70..a66e1cb4 100644 --- a/ui/src/components/orders/TenantForm.tsx +++ b/ui/src/components/orders/TenantForm.tsx @@ -60,9 +60,9 @@ export const TenantForm: React.FC = ({ onSubmit }) => { country: tenant.data.country, city: tenant.data.city, postalCode: tenant.data.postalCode, - phone: tenant.data.phone, - mobile: tenant.data.mobile, - fax: tenant.data.fax, + phoneNumber: tenant.data.phoneNumber, + mobileNumber: tenant.data.mobileNumber, + faxNumber: tenant.data.faxNumber, email: tenant.data.email, website: tenant.data.website, menuGroup: tenant.data.menuGroup, @@ -187,7 +187,7 @@ export const TenantForm: React.FC = ({ onSubmit }) => { {translate('::Public.products.tenantForm.mobile')}: - {formData.mobile} + {formData.mobileNumber}
@@ -301,7 +301,7 @@ export const TenantForm: React.FC = ({ onSubmit }) => {
@@ -309,8 +309,8 @@ export const TenantForm: React.FC = ({ onSubmit }) => { type="tel" required placeholder="+90 (___) ___-____" - value={formData.phone || ''} - onChange={(e) => handleInputChange('phone', e.target.value)} + value={formData.phoneNumber || ''} + onChange={(e) => handleInputChange('phoneNumber', e.target.value)} className="w-full pl-10 pr-4 py-3 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-transparent" />
diff --git a/ui/src/mocks/mockBanks.ts b/ui/src/mocks/mockBanks.ts index 2d52c6d3..710e7a52 100644 --- a/ui/src/mocks/mockBanks.ts +++ b/ui/src/mocks/mockBanks.ts @@ -16,7 +16,7 @@ export const mockBanks: BankAccount[] = [ dailyTransferLimit: 100000, isActive: true, contactPerson: "Mehmet Ak", - phone: "+90 212 555 1111", + phoneNumber: "+90 212 555 1111", creationTime: new Date("2024-01-01"), lastModificationTime: new Date("2024-01-20"), swiftCode: "ISBKTRIS", @@ -36,7 +36,7 @@ export const mockBanks: BankAccount[] = [ dailyTransferLimit: 50000, isActive: true, contactPerson: "Ayşe Yıldız", - phone: "+90 212 555 2222", + phoneNumber: "+90 212 555 2222", creationTime: new Date("2024-01-01"), lastModificationTime: new Date("2024-01-18"), swiftCode: "TGBATRIS", diff --git a/ui/src/mocks/mockBusinessParties.ts b/ui/src/mocks/mockBusinessParties.ts index d12b7493..26a501ef 100644 --- a/ui/src/mocks/mockBusinessParties.ts +++ b/ui/src/mocks/mockBusinessParties.ts @@ -17,15 +17,15 @@ export const mockBusinessParties: BusinessParty[] = [ title: 'Genel Müdür', department: 'Yönetim', email: 'fatma.demir@uretim.com', - phone: '+90 312 555 0202', - mobile: '+90 532 555 0202', + phoneNumber: '+90 312 555 0202', + mobileNumber: '+90 532 555 0202', isPrimary: true, isActive: true, creationTime: new Date(), lastModificationTime: new Date(), }, email: 'aliveli@gmail.com', - phone: '+90 212 555 1234', + phoneNumber: '+90 212 555 1234', address: { street: 'İstiklal Cad. No:10', city: 'İstanbul', @@ -84,7 +84,7 @@ export const mockBusinessParties: BusinessParty[] = [ fullName: 'Ali Veli', title: 'Satınalma Müdürü', email: 'aliveli@gmail.com', - phone: '+90 212 555 1234', + phoneNumber: '+90 212 555 1234', department: 'Satınalma', isPrimary: true, isActive: false, @@ -109,15 +109,15 @@ export const mockBusinessParties: BusinessParty[] = [ title: 'Genel Müdür', department: 'Yönetim', email: 'fatma.demir@uretim.com', - phone: '+90 312 555 0202', - mobile: '+90 532 555 0202', + phoneNumber: '+90 312 555 0202', + mobileNumber: '+90 532 555 0202', isPrimary: true, isActive: true, creationTime: new Date(), lastModificationTime: new Date(), }, email: 'aysedemir@gmail.com', - phone: '+90 216 555 5678', + phoneNumber: '+90 216 555 5678', address: { street: 'Barbaros Bulv. No:20', city: 'İstanbul', @@ -176,7 +176,7 @@ export const mockBusinessParties: BusinessParty[] = [ fullName: 'Ayşe Demir', title: 'Satış Müdürü', email: 'aysedemir@gmail.com', - phone: '+90 216 555 5678', + phoneNumber: '+90 216 555 5678', department: 'Satış', isPrimary: true, isActive: false, @@ -201,15 +201,15 @@ export const mockBusinessParties: BusinessParty[] = [ title: 'Genel Müdür', department: 'Yönetim', email: 'fatma.demir@uretim.com', - phone: '+90 312 555 0202', - mobile: '+90 532 555 0202', + phoneNumber: '+90 312 555 0202', + mobileNumber: '+90 532 555 0202', isPrimary: true, isActive: true, creationTime: new Date(), lastModificationTime: new Date(), }, email: 'mehmetyilmaz@gmail.com', - phone: '+90 232 555 7890', + phoneNumber: '+90 232 555 7890', address: { street: 'Atatürk Cad. No:5', city: 'İzmir', @@ -268,7 +268,7 @@ export const mockBusinessParties: BusinessParty[] = [ fullName: 'Mehmet Yılmaz', title: 'Genel Müdür', email: 'mehmetyilmaz@gmail.com', - phone: '+90 232 555 7890', + phoneNumber: '+90 232 555 7890', department: 'Yönetim', isPrimary: true, isActive: false, @@ -293,15 +293,15 @@ export const mockBusinessParties: BusinessParty[] = [ title: 'Genel Müdür', department: 'Yönetim', email: 'fatma.demir@uretim.com', - phone: '+90 312 555 0202', - mobile: '+90 532 555 0202', + phoneNumber: '+90 312 555 0202', + mobileNumber: '+90 532 555 0202', isPrimary: true, isActive: true, creationTime: new Date(), lastModificationTime: new Date(), }, email: 'fatmacelik@gmail.com', - phone: '+90 312 555 3456', + phoneNumber: '+90 312 555 3456', address: { street: 'Kızılay Meydanı No:15', city: 'Ankara', @@ -360,7 +360,7 @@ export const mockBusinessParties: BusinessParty[] = [ fullName: 'Fatma Çelik', title: 'Finans Müdürü', email: 'fatmacelik@gmail.com', - phone: '+90 312 555 3456', + phoneNumber: '+90 312 555 3456', department: 'Finans', isPrimary: true, isActive: false, @@ -387,8 +387,8 @@ export const mockBusinessParties: BusinessParty[] = [ title: 'Genel Müdür', department: 'Yönetim', email: 'fatma.demir@uretim.com', - phone: '+90 312 555 0202', - mobile: '+90 532 555 0202', + phoneNumber: '+90 312 555 0202', + mobileNumber: '+90 532 555 0202', isPrimary: true, isActive: true, creationTime: new Date(), @@ -438,8 +438,8 @@ export const mockBusinessParties: BusinessParty[] = [ title: 'Satınalma Müdürü', department: 'Satınalma', email: 'ali.yilmaz@teknoloji.com', - phone: '+90 212 555 0201', - mobile: '+90 532 555 0201', + phoneNumber: '+90 212 555 0201', + mobileNumber: '+90 532 555 0201', isPrimary: true, isActive: true, creationTime: new Date(), @@ -482,7 +482,7 @@ export const mockBusinessPartyNew: BusinessParty = { supplierType: SupplierTypeEnum.ServiceProvider, name: '', email: '', - phone: '', + phoneNumber: '', address: { street: '', city: '', diff --git a/ui/src/mocks/mockCurrentAccounts.ts b/ui/src/mocks/mockCurrentAccounts.ts index 98809525..2995a2f6 100644 --- a/ui/src/mocks/mockCurrentAccounts.ts +++ b/ui/src/mocks/mockCurrentAccounts.ts @@ -11,7 +11,7 @@ export const mockCurrentAccounts: FiCurrentAccount[] = [ taxNumber: "1234567890", taxOffice: "Beylikdüzü V.D.", contactPerson: "Ahmet Yılmaz", - phone: "+90 212 555 1234", + phoneNumber: "+90 212 555 1234", email: "info@abctedarik.com", address: "Beylikdüzü Organize Sanayi Bölgesi, İstanbul", creditLimit: 50000, @@ -33,7 +33,7 @@ export const mockCurrentAccounts: FiCurrentAccount[] = [ taxNumber: "9876543210", taxOffice: "Kadıköy V.D.", contactPerson: "Fatma Demir", - phone: "+90 216 888 5678", + phoneNumber: "+90 216 888 5678", email: "satis@xyzmuster.com", address: "Kadıköy, İstanbul", creditLimit: 100000, @@ -55,7 +55,7 @@ export const mockCurrentAccounts: FiCurrentAccount[] = [ taxNumber: "5555666677", taxOffice: "Ümraniye V.D.", contactPerson: "Mehmet Kaya", - phone: "+90 216 333 4455", + phoneNumber: "+90 216 333 4455", email: "info@definsaat.com", address: "Ümraniye, İstanbul", creditLimit: 75000, @@ -77,7 +77,7 @@ export const mockCurrentAccounts: FiCurrentAccount[] = [ taxNumber: "1111222233", taxOffice: "Beşiktaş V.D.", contactPerson: "Ayşe Özkan", - phone: "+90 212 777 8899", + phoneNumber: "+90 212 777 8899", email: "info@ghiteknoloji.com", address: "Beşiktaş, İstanbul", creditLimit: 200000, @@ -99,7 +99,7 @@ export const mockCurrentAccounts: FiCurrentAccount[] = [ taxNumber: "9999888877", taxOffice: "Maltepe V.D.", contactPerson: "Ali Öz", - phone: "+90 216 555 1122", + phoneNumber: "+90 216 555 1122", email: "info@jklgida.com", address: "Maltepe, İstanbul", creditLimit: 30000, diff --git a/ui/src/mocks/mockEmployees.ts b/ui/src/mocks/mockEmployees.ts index f4622e79..fa94abd3 100644 --- a/ui/src/mocks/mockEmployees.ts +++ b/ui/src/mocks/mockEmployees.ts @@ -17,8 +17,8 @@ export const mockEmployees: EmployeeDto[] = [ lastName: "Öztürk", fullName: "Ali Öztürk", email: "ali.ozturk@company.com", - phone: "+90 212 555 0100", - personalPhone: "+90 532 555 0101", + phoneNumber: "+90 212 555 0100", + mobileNumber: "+90 532 555 0101", avatar: "https://i.pravatar.cc/150?img=12", nationalId: "12345678901", birthDate: new Date("1988-10-20"), @@ -34,7 +34,7 @@ export const mockEmployees: EmployeeDto[] = [ emergencyContact: { name: "Ayşe Öztürk", relationship: "Eşi", - phone: "+90 532 555 0100", + phoneNumber: "+90 532 555 0100", }, hireDate: new Date("2020-01-15"), employmentType: EmploymentTypeEnum.FullTime, @@ -75,8 +75,8 @@ export const mockEmployees: EmployeeDto[] = [ lastName: "Kaya", fullName: "Ayşe Kaya", email: "ayse.kaya@company.com", - phone: "+90 212 555 0102", - personalPhone: "+90 532 555 0103", + phoneNumber: "+90 212 555 0102", + mobileNumber: "+90 532 555 0103", avatar: "https://i.pravatar.cc/150?img=5", nationalId: "12345678902", birthDate: new Date("1990-08-22"), @@ -92,7 +92,7 @@ export const mockEmployees: EmployeeDto[] = [ emergencyContact: { name: "Fatma Kaya", relationship: "Anne", - phone: "+90 532 555 0104", + phoneNumber: "+90 532 555 0104", }, hireDate: new Date("2021-06-01"), employmentType: EmploymentTypeEnum.FullTime, @@ -134,8 +134,8 @@ export const mockEmployees: EmployeeDto[] = [ lastName: "Yılmaz", fullName: "Mehmet Yılmaz", email: "mehmet.yilmaz@company.com", - phone: "+90 212 555 0105", - personalPhone: "+90 532 555 0106", + phoneNumber: "+90 212 555 0105", + mobileNumber: "+90 532 555 0106", avatar: "https://i.pravatar.cc/150?img=8", nationalId: "12345678903", birthDate: new Date("1987-03-12"), @@ -151,7 +151,7 @@ export const mockEmployees: EmployeeDto[] = [ emergencyContact: { name: "Zeynep Yılmaz", relationship: "Eşi", - phone: "+90 532 555 0107", + phoneNumber: "+90 532 555 0107", }, hireDate: new Date("2020-02-15"), employmentType: EmploymentTypeEnum.FullTime, @@ -193,8 +193,8 @@ export const mockEmployees: EmployeeDto[] = [ lastName: "Demir", fullName: "Selin Demir", email: "selin.demir@company.com", - phone: "+90 312 555 0108", - personalPhone: "+90 542 555 0109", + phoneNumber: "+90 312 555 0108", + mobileNumber: "+90 542 555 0109", avatar: "https://i.pravatar.cc/150?img=9", nationalId: "12345678904", birthDate: new Date("1993-05-25"), @@ -210,7 +210,7 @@ export const mockEmployees: EmployeeDto[] = [ emergencyContact: { name: "Ali Demir", relationship: "Baba", - phone: "+90 532 555 0110", + phoneNumber: "+90 532 555 0110", }, hireDate: new Date("2022-01-10"), employmentType: EmploymentTypeEnum.PartTime, @@ -252,8 +252,8 @@ export const mockEmployees: EmployeeDto[] = [ lastName: "Çelik", fullName: "Ahmet Çelik", email: "ahmet.celik@company.com", - phone: "+90 212 555 0111", - personalPhone: "+90 532 555 0112", + phoneNumber: "+90 212 555 0111", + mobileNumber: "+90 532 555 0112", avatar: "https://i.pravatar.cc/150?img=33", nationalId: "12345678905", birthDate: new Date("1985-09-10"), @@ -269,7 +269,7 @@ export const mockEmployees: EmployeeDto[] = [ emergencyContact: { name: "Emine Çelik", relationship: "Eşi", - phone: "+90 532 555 0113", + phoneNumber: "+90 532 555 0113", }, hireDate: new Date("2019-04-01"), employmentType: EmploymentTypeEnum.FullTime, @@ -311,8 +311,8 @@ export const mockEmployees: EmployeeDto[] = [ lastName: "Arslan", fullName: "Zeynep Arslan", email: "zeynep.arslan@company.com", - phone: "+90 216 555 0114", - personalPhone: "+90 532 555 0115", + phoneNumber: "+90 216 555 0114", + mobileNumber: "+90 532 555 0115", avatar: "https://i.pravatar.cc/150?img=10", nationalId: "12345678906", birthDate: new Date("1995-01-30"), @@ -328,7 +328,7 @@ export const mockEmployees: EmployeeDto[] = [ emergencyContact: { name: "Hasan Arslan", relationship: "Baba", - phone: "+90 532 555 0116", + phoneNumber: "+90 532 555 0116", }, hireDate: new Date("2023-03-20"), employmentType: EmploymentTypeEnum.Intern, @@ -370,8 +370,8 @@ export const mockEmployees: EmployeeDto[] = [ lastName: "Koç", fullName: "Burak Koç", email: "burak.koc@company.com", - phone: "+90 224 555 0117", - personalPhone: "+90 532 555 0118", + phoneNumber: "+90 224 555 0117", + mobileNumber: "+90 532 555 0118", avatar: "https://i.pravatar.cc/150?img=14", nationalId: "12345678907", birthDate: new Date("1991-06-18"), @@ -387,7 +387,7 @@ export const mockEmployees: EmployeeDto[] = [ emergencyContact: { name: "Elif Koç", relationship: "Eşi", - phone: "+90 532 555 0119", + phoneNumber: "+90 532 555 0119", }, hireDate: new Date("2021-07-12"), employmentType: EmploymentTypeEnum.FullTime, @@ -429,8 +429,8 @@ export const mockEmployees: EmployeeDto[] = [ lastName: "Şahin", fullName: "Elif Şahin", email: "elif.sahin@company.com", - phone: "+90 232 555 0120", - personalPhone: "+90 532 555 0121", + phoneNumber: "+90 232 555 0120", + mobileNumber: "+90 532 555 0121", avatar: "https://i.pravatar.cc/150?img=20", nationalId: "12345678908", birthDate: new Date("1989-11-05"), @@ -446,7 +446,7 @@ export const mockEmployees: EmployeeDto[] = [ emergencyContact: { name: "Murat Şahin", relationship: "Eşi", - phone: "+90 532 555 0122", + phoneNumber: "+90 532 555 0122", }, hireDate: new Date("2018-09-01"), employmentType: EmploymentTypeEnum.FullTime, @@ -488,8 +488,8 @@ export const mockEmployees: EmployeeDto[] = [ lastName: "Öztürk", fullName: "Canan Öztürk", email: "canan.ozturk@company.com", - phone: "+90 312 555 0123", - personalPhone: "+90 532 555 0124", + phoneNumber: "+90 312 555 0123", + mobileNumber: "+90 532 555 0124", avatar: "https://i.pravatar.cc/150?img=25", nationalId: "12345678909", birthDate: new Date("1992-04-14"), @@ -505,7 +505,7 @@ export const mockEmployees: EmployeeDto[] = [ emergencyContact: { name: "Hüseyin Öztürk", relationship: "Baba", - phone: "+90 532 555 0125", + phoneNumber: "+90 532 555 0125", }, hireDate: new Date("2020-11-02"), employmentType: EmploymentTypeEnum.FullTime, @@ -547,8 +547,8 @@ export const mockEmployees: EmployeeDto[] = [ lastName: "Aydın", fullName: "Murat Aydın", email: "murat.aydin@company.com", - phone: "+90 212 555 0126", - personalPhone: "+90 532 555 0127", + phoneNumber: "+90 212 555 0126", + mobileNumber: "+90 532 555 0127", avatar: "https://i.pravatar.cc/150?img=30", nationalId: "12345678910", birthDate: new Date("1984-12-22"), @@ -564,7 +564,7 @@ export const mockEmployees: EmployeeDto[] = [ emergencyContact: { name: "Ayten Aydın", relationship: "Eşi", - phone: "+90 532 555 0128", + phoneNumber: "+90 532 555 0128", }, hireDate: new Date("2017-05-15"), employmentType: EmploymentTypeEnum.FullTime, diff --git a/ui/src/proxy/config/models.ts b/ui/src/proxy/config/models.ts index 598edb86..479604b0 100644 --- a/ui/src/proxy/config/models.ts +++ b/ui/src/proxy/config/models.ts @@ -37,9 +37,9 @@ export interface CustomTenantDto extends TenantDto { country: string city: string postalCode: string - phone: number - mobile: number - fax: number + phoneNumber: number + mobileNumber: number + faxNumber: number email: string website: string menuGroup?: string diff --git a/ui/src/proxy/contact/models.ts b/ui/src/proxy/contact/models.ts index 795956df..2c8ac5e3 100644 --- a/ui/src/proxy/contact/models.ts +++ b/ui/src/proxy/contact/models.ts @@ -1,7 +1,7 @@ export interface ContactDto { id: string address: string - phone: string + phoneNumber: string email: string location: string taxNumber: string diff --git a/ui/src/proxy/demo/models.ts b/ui/src/proxy/demo/models.ts index 77b7c98a..257e7661 100644 --- a/ui/src/proxy/demo/models.ts +++ b/ui/src/proxy/demo/models.ts @@ -4,7 +4,7 @@ export interface DemoDto { organizationName: string fullName: string email: string - phone: string + phoneNumber: string address: string numberOfBranches: number numberOfUsers: number diff --git a/ui/src/proxy/intranet/models.ts b/ui/src/proxy/intranet/models.ts index 8b3ca2c0..cd49cb95 100644 --- a/ui/src/proxy/intranet/models.ts +++ b/ui/src/proxy/intranet/models.ts @@ -67,8 +67,8 @@ export interface EmployeeDto { lastName: string fullName: string email: string - phone?: string - personalPhone?: string + phoneNumber?: string + mobileNumber?: string avatar?: string // Avatar URL nationalId: string birthDate: Date @@ -149,7 +149,7 @@ export interface VisitorDto { fullName: string companyName: string email: string - phone: string + phoneNumber: string purpose: string visitDate: Date checkIn?: Date diff --git a/ui/src/types/common.ts b/ui/src/types/common.ts index 2995038c..807c9719 100644 --- a/ui/src/types/common.ts +++ b/ui/src/types/common.ts @@ -44,7 +44,7 @@ export interface BusinessParty { contacts?: Contact[] industry?: BusinessPartyIndustryEnum email?: string - phone?: string + phoneNumber?: string website?: string lastOrderDate?: Date status?: BusinessPartyStatusEnum @@ -138,8 +138,8 @@ export interface Contact { title?: string department?: string email: string - phone?: string - mobile?: string + phoneNumber?: string + mobileNumber?: string isPrimary: boolean isActive: boolean creationTime: Date @@ -171,7 +171,7 @@ export interface BankAccount { dailyTransferLimit: number isActive: boolean contactPerson?: string - phone?: string + phoneNumber?: string swiftCode?: string isDefault: boolean creationTime: Date diff --git a/ui/src/types/fi.ts b/ui/src/types/fi.ts index 23fe04e9..e2aba4c6 100644 --- a/ui/src/types/fi.ts +++ b/ui/src/types/fi.ts @@ -9,7 +9,7 @@ export interface FiCurrentAccount { businessParty?: BusinessParty type: AccountTypeEnum contactPerson?: string - phone?: string + phoneNumber?: string email?: string address?: string taxNumber?: string diff --git a/ui/src/types/hr.ts b/ui/src/types/hr.ts index b07d6f42..e1102e6b 100644 --- a/ui/src/types/hr.ts +++ b/ui/src/types/hr.ts @@ -150,7 +150,7 @@ export interface HrEmergencyContact { // İnsan Kaynakları Acil Durum İletişim name: string relationship: string - phone: string + phoneNumber: string email?: string address?: Address } diff --git a/ui/src/views/accounting/BankPage.tsx b/ui/src/views/accounting/BankPage.tsx index cec610fb..cbfe15ba 100644 --- a/ui/src/views/accounting/BankPage.tsx +++ b/ui/src/views/accounting/BankPage.tsx @@ -82,7 +82,7 @@ const BankPage: React.FC = () => { overdraftLimit: accountData.overdraftLimit || 0, dailyTransferLimit: accountData.dailyTransferLimit || 0, contactPerson: accountData.contactPerson, - phone: accountData.phone, + phoneNumber: accountData.phoneNumber, isActive: accountData.isActive ?? true, creationTime: new Date(), lastModificationTime: new Date(), diff --git a/ui/src/views/accounting/components/BankAccountDetails.tsx b/ui/src/views/accounting/components/BankAccountDetails.tsx index cba9db30..826e7e8f 100644 --- a/ui/src/views/accounting/components/BankAccountDetails.tsx +++ b/ui/src/views/accounting/components/BankAccountDetails.tsx @@ -290,7 +290,7 @@ const BankAccountDetails: React.FC = ({
- {(account.contactPerson || account.phone) && ( + {(account.contactPerson || account.phoneNumber) && (

@@ -305,10 +305,10 @@ const BankAccountDetails: React.FC = ({

)} - {account.phone && ( + {account.phoneNumber && (
Telefon: - {account.phone} + {account.phoneNumber}
)}
diff --git a/ui/src/views/accounting/components/BankAccountForm.tsx b/ui/src/views/accounting/components/BankAccountForm.tsx index d4a4d9a9..4b731c22 100644 --- a/ui/src/views/accounting/components/BankAccountForm.tsx +++ b/ui/src/views/accounting/components/BankAccountForm.tsx @@ -25,7 +25,7 @@ const BankAccountForm: React.FC = ({ account, isOpen, onCl overdraftLimit: 0, dailyTransferLimit: 0, contactPerson: '', - phone: '', + phoneNumber: '', isActive: true, }) @@ -47,7 +47,7 @@ const BankAccountForm: React.FC = ({ account, isOpen, onCl overdraftLimit: 0, dailyTransferLimit: 0, contactPerson: '', - phone: '', + phoneNumber: '', isActive: true, }) } @@ -379,8 +379,8 @@ const BankAccountForm: React.FC = ({ account, isOpen, onCl = ({ {account.contactPerson && (
{account.contactPerson}
)} - {account.phone && ( -
{account.phone}
+ {account.phoneNumber && ( +
{account.phoneNumber}
)} ), diff --git a/ui/src/views/accounting/components/CurrentAccountDetails.tsx b/ui/src/views/accounting/components/CurrentAccountDetails.tsx index 4be78959..265faa30 100644 --- a/ui/src/views/accounting/components/CurrentAccountDetails.tsx +++ b/ui/src/views/accounting/components/CurrentAccountDetails.tsx @@ -137,12 +137,12 @@ const CurrentAccountDetails: React.FC = ({ )} - {account.phone && ( + {account.phoneNumber && (
Telefon
-
{account.phone}
+
{account.phoneNumber}
)} diff --git a/ui/src/views/accounting/components/CurrentAccountForm.tsx b/ui/src/views/accounting/components/CurrentAccountForm.tsx index b52f038d..c5aba55a 100644 --- a/ui/src/views/accounting/components/CurrentAccountForm.tsx +++ b/ui/src/views/accounting/components/CurrentAccountForm.tsx @@ -27,7 +27,7 @@ const CurrentAccountForm: React.FC = ({ businessPartyId: '', type: AccountTypeEnum.Customer, contactPerson: '', - phone: '', + phoneNumber: '', email: '', address: '', taxNumber: '', @@ -54,7 +54,7 @@ const CurrentAccountForm: React.FC = ({ businessPartyId: '', type: AccountTypeEnum.Customer, contactPerson: '', - phone: '', + phoneNumber: '', email: '', address: '', taxNumber: '', @@ -226,8 +226,8 @@ const CurrentAccountForm: React.FC = ({ = ({ header: 'İletişim', render: (account: FiCurrentAccount) => (
- {account.phone &&
{account.phone}
} + {account.phoneNumber &&
{account.phoneNumber}
} {account.email &&
{account.email}
}
), diff --git a/ui/src/views/accounting/components/InvoiceDetails.tsx b/ui/src/views/accounting/components/InvoiceDetails.tsx index bd20e689..a6f612e0 100644 --- a/ui/src/views/accounting/components/InvoiceDetails.tsx +++ b/ui/src/views/accounting/components/InvoiceDetails.tsx @@ -155,9 +155,9 @@ const InvoiceDetails: React.FC = ({ {invoice.currentAccount.contactPerson} )} - {invoice.currentAccount?.phone && ( + {invoice.currentAccount?.phoneNumber && (
- Tel: {invoice.currentAccount.phone} + Tel: {invoice.currentAccount.phoneNumber}
)} {invoice.currentAccount?.email && ( diff --git a/ui/src/views/accounting/components/WaybillDetails.tsx b/ui/src/views/accounting/components/WaybillDetails.tsx index 4a81e5b7..15b3041c 100644 --- a/ui/src/views/accounting/components/WaybillDetails.tsx +++ b/ui/src/views/accounting/components/WaybillDetails.tsx @@ -190,7 +190,7 @@ const WaybillDetails: React.FC = ({
Telefon: - {account.phone || "-"} + {account.phoneNumber || "-"}
E-posta: diff --git a/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogEditForm.tsx b/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogEditForm.tsx index 4cd61437..fcd1af48 100644 --- a/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogEditForm.tsx +++ b/ui/src/views/admin/listForm/edit/json-row-operations/JsonRowOpDialogEditForm.tsx @@ -309,6 +309,7 @@ function JsonRowOpDialogEditForm({
● Editor Options
{`• {"showClearButton":true }`}
+ 
{`• {"format": "fixedPoint", "precision": 2}`}
{`• {"format": "phoneGlobal", "mask":"(000) 000-0000", "maskInvalidMessage":"Lütfen geçerli bir telefon numarası girin", "useMaskedValue":false, "maskRules": { "X": "[1-9]" }, "placeholder": "(555) 123-4567" }`}
{`• {"height":200}`}
diff --git a/ui/src/views/crm/components/ActivityDetails.tsx b/ui/src/views/crm/components/ActivityDetails.tsx
index 1cb02ad0..e490a1ff 100644
--- a/ui/src/views/crm/components/ActivityDetails.tsx
+++ b/ui/src/views/crm/components/ActivityDetails.tsx
@@ -206,10 +206,10 @@ const ActivityDetails: React.FC = ({ isOpen, onClose, onEd
                           
                           {customer.primaryContact?.email}
- {customer.primaryContact?.phone && ( + {customer.primaryContact?.phoneNumber && (
- {customer.primaryContact.phone} + {customer.primaryContact.phoneNumber}
)}
diff --git a/ui/src/views/crm/components/CustomerCards.tsx b/ui/src/views/crm/components/CustomerCards.tsx index 18efd53e..6345aba4 100644 --- a/ui/src/views/crm/components/CustomerCards.tsx +++ b/ui/src/views/crm/components/CustomerCards.tsx @@ -325,10 +325,10 @@ const CustomerCards: React.FC = () => { {customer.primaryContact?.email} - {customer.primaryContact?.phone && ( + {customer.primaryContact?.phoneNumber && (
- {customer.primaryContact.phone} + {customer.primaryContact.phoneNumber}
)}
diff --git a/ui/src/views/crm/components/CustomerEdit.tsx b/ui/src/views/crm/components/CustomerEdit.tsx index def7a091..76952e54 100644 --- a/ui/src/views/crm/components/CustomerEdit.tsx +++ b/ui/src/views/crm/components/CustomerEdit.tsx @@ -473,8 +473,8 @@ const CustomerEdit: React.FC = () => { handleInputChange('primaryContact.phone', e.target.value)} + value={formData.primaryContact?.phoneNumber} + onChange={(e) => handleInputChange('primaryContact.phoneNumber', e.target.value)} className="w-full px-3 py-1.5 text-sm border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-transparent" placeholder="+90 (212) 555 0123" /> @@ -486,7 +486,7 @@ const CustomerEdit: React.FC = () => { handleInputChange('primaryContact.mobile', e.target.value)} className="w-full px-3 py-1.5 text-sm border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-transparent" placeholder="+90 (555) 123 4567" diff --git a/ui/src/views/crm/components/CustomerForm.tsx b/ui/src/views/crm/components/CustomerForm.tsx index 445a108e..b58f50ad 100644 --- a/ui/src/views/crm/components/CustomerForm.tsx +++ b/ui/src/views/crm/components/CustomerForm.tsx @@ -286,16 +286,16 @@ const CustomerForm: React.FC = () => { handleInputChange('phone', e.target.value)} + value={formData.phoneNumber} + onChange={(e) => handleInputChange('phoneNumber', e.target.value)} className={`block w-full px-3 py-1.5 text-sm border rounded-md shadow-sm focus:outline-none focus:ring-1 ${ - errors.phone + errors.phoneNumber ? 'border-red-300 focus:border-red-500 focus:ring-red-500' : 'border-gray-300 focus:border-blue-500 focus:ring-blue-500' }`} placeholder="+90 212 555 0123" /> - {errors.phone &&

{errors.phone}

} + {errors.phoneNumber &&

{errors.phoneNumber}

}
diff --git a/ui/src/views/crm/components/CustomerFormNew.tsx b/ui/src/views/crm/components/CustomerFormNew.tsx index 7e7422ce..4ea653a2 100644 --- a/ui/src/views/crm/components/CustomerFormNew.tsx +++ b/ui/src/views/crm/components/CustomerFormNew.tsx @@ -282,16 +282,16 @@ const CustomerForm: React.FC = () => { handleInputChange('phone', e.target.value)} + value={formData.phoneNumber} + onChange={(e) => handleInputChange('phoneNumber', e.target.value)} className={`block w-full px-3 py-1.5 text-sm border rounded-md shadow-sm focus:outline-none focus:ring-1 ${ - errors.phone + errors.phoneNumber ? 'border-red-300 focus:border-red-500 focus:ring-red-500' : 'border-gray-300 focus:border-blue-500 focus:ring-blue-500' }`} placeholder="+90 212 555 0123" /> - {errors.phone &&

{errors.phone}

} + {errors.phoneNumber &&

{errors.phoneNumber}

} diff --git a/ui/src/views/crm/components/CustomerList.tsx b/ui/src/views/crm/components/CustomerList.tsx index a96a155c..fdde67e3 100644 --- a/ui/src/views/crm/components/CustomerList.tsx +++ b/ui/src/views/crm/components/CustomerList.tsx @@ -289,10 +289,10 @@ const CustomerList: React.FC = () => { {customer.primaryContact?.email} - {customer.primaryContact?.phone && ( + {customer.primaryContact?.phoneNumber && (
- {customer.primaryContact?.phone} + {customer.primaryContact?.phoneNumber}
)}
diff --git a/ui/src/views/crm/components/CustomerView.tsx b/ui/src/views/crm/components/CustomerView.tsx index 21bca1f6..b71e72af 100644 --- a/ui/src/views/crm/components/CustomerView.tsx +++ b/ui/src/views/crm/components/CustomerView.tsx @@ -431,14 +431,14 @@ const CustomerView: React.FC = () => { {customer.primaryContact?.email}
- {customer.primaryContact?.phone && ( + {customer.primaryContact?.phoneNumber && ( )} @@ -542,16 +542,16 @@ const CustomerView: React.FC = () => { - {customer.primaryContact?.phone && ( + {customer.primaryContact?.phoneNumber && ( @@ -628,14 +628,14 @@ const CustomerView: React.FC = () => { {contact.email} - {contact.phone && ( + {contact.phoneNumber && ( )} diff --git a/ui/src/views/crm/components/OpportunityDetails.tsx b/ui/src/views/crm/components/OpportunityDetails.tsx index 257f7955..a6341d14 100644 --- a/ui/src/views/crm/components/OpportunityDetails.tsx +++ b/ui/src/views/crm/components/OpportunityDetails.tsx @@ -194,10 +194,10 @@ const OpportunityDetails: React.FC = ({ {customer.primaryContact?.email} - {customer.primaryContact?.phone && ( + {customer.primaryContact?.phoneNumber && (
- {customer.primaryContact?.phone} + {customer.primaryContact?.phoneNumber}
)} diff --git a/ui/src/views/crm/components/SalesOrderForm.tsx b/ui/src/views/crm/components/SalesOrderForm.tsx index e232f267..8ab3861d 100644 --- a/ui/src/views/crm/components/SalesOrderForm.tsx +++ b/ui/src/views/crm/components/SalesOrderForm.tsx @@ -383,7 +383,7 @@ const SalesOrderForm: React.FC = () => { diff --git a/ui/src/views/crm/components/SalesOrderView.tsx b/ui/src/views/crm/components/SalesOrderView.tsx index dec1f136..7c5532e5 100644 --- a/ui/src/views/crm/components/SalesOrderView.tsx +++ b/ui/src/views/crm/components/SalesOrderView.tsx @@ -229,7 +229,7 @@ const SalesOrderView: React.FC = () => {
- {order.customer?.primaryContact?.phone || 'Belirtilmemiş'} + {order.customer?.primaryContact?.phoneNumber || 'Belirtilmemiş'}
diff --git a/ui/src/views/hr/components/OrganizationChart.tsx b/ui/src/views/hr/components/OrganizationChart.tsx index 6f5557dc..3ed8fdb9 100644 --- a/ui/src/views/hr/components/OrganizationChart.tsx +++ b/ui/src/views/hr/components/OrganizationChart.tsx @@ -486,19 +486,19 @@ const OrganizationChart: React.FC = () => { E-posta: {selectedEmployee.email}
- {selectedEmployee.phone && ( + {selectedEmployee.phoneNumber && (
İş Telefonu: - {selectedEmployee.phone} + {selectedEmployee.phoneNumber}
)} - {selectedEmployee.personalPhone && ( + {selectedEmployee.mobileNumber && (
Kişisel Telefon: - {selectedEmployee.personalPhone} + {selectedEmployee.mobileNumber}
)} @@ -618,7 +618,7 @@ const OrganizationChart: React.FC = () => {
Telefon: -

{selectedEmployee.emergencyContact.phone}

+

{selectedEmployee.emergencyContact.phoneNumber}

diff --git a/ui/src/views/intranet/SocialWall/PostItem.tsx b/ui/src/views/intranet/SocialWall/PostItem.tsx index cf6e08ed..efa2270b 100644 --- a/ui/src/views/intranet/SocialWall/PostItem.tsx +++ b/ui/src/views/intranet/SocialWall/PostItem.tsx @@ -271,7 +271,7 @@ const PostItem: React.FC = ({ post, onLike, onComment, onDelete, avatar: post.employee.avatar || 'https://i.pravatar.cc/150?img=1', title: post.employee.jobPosition?.name || 'Çalışan', email: post.employee.email, - phone: post.employee.phone, + phoneNumber: post.employee.phoneNumber, department: post.employee.department?.name, location: post.employee.workLocation }} diff --git a/ui/src/views/intranet/SocialWall/UserProfileCard.tsx b/ui/src/views/intranet/SocialWall/UserProfileCard.tsx index 4acbc31d..33afb1a4 100644 --- a/ui/src/views/intranet/SocialWall/UserProfileCard.tsx +++ b/ui/src/views/intranet/SocialWall/UserProfileCard.tsx @@ -9,7 +9,7 @@ interface UserProfileCardProps { avatar: string title: string email?: string - phone?: string + phoneNumber?: string department?: string location?: string } @@ -59,14 +59,14 @@ const UserProfileCard: React.FC = ({ user, position = 'bot )} - {user.phone && ( + {user.phoneNumber && ( )} diff --git a/ui/src/views/maintenance/components/MaintenanceTeams.tsx b/ui/src/views/maintenance/components/MaintenanceTeams.tsx index dcbcd8ee..793a91f5 100644 --- a/ui/src/views/maintenance/components/MaintenanceTeams.tsx +++ b/ui/src/views/maintenance/components/MaintenanceTeams.tsx @@ -291,10 +291,10 @@ const MaintenanceTeams: React.FC = () => { {leader.employee.email} )} - {leader.employee?.phone && ( + {leader.employee?.phoneNumber && (
- {leader.employee.phone} + {leader.employee.phoneNumber}
)} diff --git a/ui/src/views/maintenance/components/ViewTeamModal.tsx b/ui/src/views/maintenance/components/ViewTeamModal.tsx index 556cf817..7b76f832 100644 --- a/ui/src/views/maintenance/components/ViewTeamModal.tsx +++ b/ui/src/views/maintenance/components/ViewTeamModal.tsx @@ -147,10 +147,10 @@ const ViewTeamModal: React.FC = ({ isOpen, onClose, onEdit, {leader.employee.email} )} - {leader.employee?.phone && ( + {leader.employee?.phoneNumber && (
- {leader.employee.phone} + {leader.employee.phoneNumber}
)} @@ -206,10 +206,10 @@ const ViewTeamModal: React.FC = ({ isOpen, onClose, onEdit, {member.employee.email} )} - {member.employee?.phone && ( + {member.employee?.phoneNumber && (
- {member.employee.phone} + {member.employee.phoneNumber}
)}
diff --git a/ui/src/views/project/components/ProjectForm.tsx b/ui/src/views/project/components/ProjectForm.tsx index 17511f02..8c685098 100644 --- a/ui/src/views/project/components/ProjectForm.tsx +++ b/ui/src/views/project/components/ProjectForm.tsx @@ -1119,10 +1119,10 @@ const ProjectForm: React.FC = () => { {manager.email}
- {manager.phone && ( + {manager.phoneNumber && (
- {manager.phone} + {manager.phoneNumber}
)} @@ -1175,10 +1175,10 @@ const ProjectForm: React.FC = () => { {customer.primaryContact.email} )} - {customer.primaryContact?.phone && ( + {customer.primaryContact?.phoneNumber && (
- {customer.primaryContact.phone} + {customer.primaryContact.phoneNumber}
)} diff --git a/ui/src/views/project/components/ProjectView.tsx b/ui/src/views/project/components/ProjectView.tsx index 0d68aa15..91c4f4b9 100644 --- a/ui/src/views/project/components/ProjectView.tsx +++ b/ui/src/views/project/components/ProjectView.tsx @@ -315,10 +315,10 @@ const ProjectView: React.FC = () => { {project.projectManager.email} - {project.projectManager.phone && ( + {project.projectManager.phoneNumber && (
- {project.projectManager.phone} + {project.projectManager.phoneNumber}
)} @@ -350,10 +350,10 @@ const ProjectView: React.FC = () => { {project.customer.primaryContact.email} )} - {project.customer.primaryContact?.phone && ( + {project.customer.primaryContact?.phoneNumber && (
- {project.customer.primaryContact.phone} + {project.customer.primaryContact.phoneNumber}
)} diff --git a/ui/src/views/public/Contact.tsx b/ui/src/views/public/Contact.tsx index 78e7ab17..b0f8e4d2 100644 --- a/ui/src/views/public/Contact.tsx +++ b/ui/src/views/public/Contact.tsx @@ -97,7 +97,7 @@ const Contact: React.FC = () => {
-

{contact?.phone}

+

{contact?.phoneNumber}

diff --git a/ui/src/views/public/Demo.tsx b/ui/src/views/public/Demo.tsx index c36ecdda..6e755000 100644 --- a/ui/src/views/public/Demo.tsx +++ b/ui/src/views/public/Demo.tsx @@ -28,7 +28,7 @@ const Demo: React.FC = ({ isOpen, onClose }) => { organizationName: "", fullName: "", email: "", - phone: "", + phoneNumber: "", address: "", numberOfBranches: 0, numberOfUsers: 0, @@ -66,7 +66,7 @@ const Demo: React.FC = ({ isOpen, onClose }) => { } else if (!/\S+@\S+\.\S+/.test(formData.email)) { newErrors.email = "Please enter a valid email"; } - if (!formData.phone.trim()) newErrors.phone = "Phone number is required"; + if (!formData.phoneNumber.trim()) newErrors.phoneNumber = "Phone number is required"; if (!formData.address.trim()) newErrors.address = "Address is required"; if (!formData.message.trim()) newErrors.message = "Message is required"; @@ -137,7 +137,7 @@ const Demo: React.FC = ({ isOpen, onClose }) => { organizationName: "", fullName: "", email: "", - phone: "", + phoneNumber: "", address: "", numberOfBranches: 0, numberOfUsers: 0, @@ -218,7 +218,6 @@ const Demo: React.FC = ({ isOpen, onClose }) => {
- {/* Email & Phone Row */}
handleInputChange('primaryContact.mobile', e.target.value)} className="w-full px-3 py-1.5 text-sm border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-transparent" placeholder="+90 (555) 123 4567" @@ -408,17 +408,17 @@ const SupplierForm: React.FC = () => { handleInputChange('phone', e.target.value)} + value={formData.phoneNumber} + onChange={(e) => handleInputChange('phoneNumber', e.target.value)} className={`block w-full pl-10 pr-3 py-1.5 border rounded-md shadow-sm text-sm focus:outline-none focus:ring-1 ${ - errors.phone + errors.phoneNumber ? 'border-red-300 focus:border-red-500 focus:ring-red-500' : 'border-gray-300 focus:border-blue-500 focus:ring-blue-500' }`} placeholder="+90 212 555 0123" />
- {errors.phone &&

{errors.phone}

} + {errors.phoneNumber &&

{errors.phoneNumber}

}
diff --git a/ui/src/views/supplychain/components/SupplierList.tsx b/ui/src/views/supplychain/components/SupplierList.tsx index 866d9541..9b886c99 100644 --- a/ui/src/views/supplychain/components/SupplierList.tsx +++ b/ui/src/views/supplychain/components/SupplierList.tsx @@ -288,10 +288,10 @@ const SupplierList: React.FC = () => { {supplier.email} )} - {supplier.phone && ( + {supplier.phoneNumber && (
- {supplier.phone} + {supplier.phoneNumber}
)}