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 fe0441c1..7198c4d4 100644 --- a/api/src/Kurs.Platform.Application.Contracts/ListForms/DynamicApi/CreateUpdateTenantInput.cs +++ b/api/src/Kurs.Platform.Application.Contracts/ListForms/DynamicApi/CreateUpdateTenantInput.cs @@ -19,7 +19,7 @@ public class CreateUpdateTenantInput public string City { get; set; } public string District { get; set; } public string Street { get; set; } - public string Address { get; set; } + public string Address1 { get; set; } public string Address2 { get; set; } public string PostalCode { get; set; } public string Phone { get; set; } diff --git a/api/src/Kurs.Platform.Application/ListForms/ListFormDynamicApiAppService.cs b/api/src/Kurs.Platform.Application/ListForms/ListFormDynamicApiAppService.cs index ca5f2e1b..bb76b512 100644 --- a/api/src/Kurs.Platform.Application/ListForms/ListFormDynamicApiAppService.cs +++ b/api/src/Kurs.Platform.Application/ListForms/ListFormDynamicApiAppService.cs @@ -121,7 +121,7 @@ public class ListFormDynamicApiAppService : PlatformAppService, IListFormDynamic entity.SetCity(input.Data.City); entity.SetDistrict(input.Data.District); entity.SetStreet(input.Data.Street); - entity.SetAddress1(input.Data.Address); + entity.SetAddress1(input.Data.Address1); entity.SetAddress2(input.Data.Address2); entity.SetPostalCode(input.Data.PostalCode); entity.SetPhone(input.Data.Phone); @@ -156,7 +156,7 @@ public class ListFormDynamicApiAppService : PlatformAppService, IListFormDynamic entity.SetCity(input.Data.City); entity.SetDistrict(input.Data.District); entity.SetStreet(input.Data.Street); - entity.SetAddress1(input.Data.Address); + entity.SetAddress1(input.Data.Address1); entity.SetAddress2(input.Data.Address2); entity.SetPostalCode(input.Data.PostalCode); entity.SetPhone(input.Data.Phone); diff --git a/api/src/Kurs.Platform.Application/Tenants/PlatformTenantAppService.cs b/api/src/Kurs.Platform.Application/Tenants/PlatformTenantAppService.cs index faaf446d..bbb17f7a 100644 --- a/api/src/Kurs.Platform.Application/Tenants/PlatformTenantAppService.cs +++ b/api/src/Kurs.Platform.Application/Tenants/PlatformTenantAppService.cs @@ -83,7 +83,7 @@ public class PlatformTenantAppService : TenantAppService, IPlatformTenantAppServ dto.City = tenant.GetCity(); dto.District = tenant.GetDistrict(); dto.Street = tenant.GetStreet(); - dto.Address = tenant.GetAddress1(); + dto.Address1 = tenant.GetAddress1(); dto.Address2 = tenant.GetAddress2(); dto.PostalCode = tenant.GetPostalCode(); dto.Phone = tenant.GetPhone(); diff --git a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormsSeeder.cs b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormsSeeder.cs index 0e2eb257..55fd3512 100644 --- a/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormsSeeder.cs +++ b/api/src/Kurs.Platform.DbMigrator/Seeds/ListFormsSeeder.cs @@ -1395,7 +1395,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency new EditingFormItemDto { Order=3, DataField = "District", ColSpan=1, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order=4, DataField = "Street", ColSpan=1, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order=5, DataField = "PostalCode", ColSpan=1, IsRequired=false, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order=6, DataField = "Address", ColSpan=1, IsRequired=false, EditorType2=EditorTypes.dxTextBox }, + new EditingFormItemDto { Order=6, DataField = "Address1", ColSpan=1, IsRequired=false, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=7, DataField = "Address2", ColSpan=1, IsRequired=false, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=8, DataField = "Email", ColSpan=1, IsRequired=true, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=9, DataField = "Website", ColSpan=1, IsRequired=true, EditorType2=EditorTypes.dxTextBox }, @@ -1809,7 +1809,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency UserId = null, CultureName = LanguageCodes.En, SourceDbType = DbType.String, - FieldName = "Address", + FieldName = "Address1", Width = 150, ListOrderNo = 11, Visible = true, @@ -2508,7 +2508,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency new EditingFormItemDto { Order=3, DataField = "District", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order=4, DataField = "Street", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order=5, DataField = "PostalCode", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order=6, DataField = "Address", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox }, + new EditingFormItemDto { Order=6, DataField = "Address1", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=7, DataField = "Address2", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=8, DataField = "Email", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=9, DataField = "Website", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxTextBox }, @@ -2929,7 +2929,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency UserId = null, CultureName = LanguageCodes.En, SourceDbType = DbType.String, - FieldName = "Address", + FieldName = "Address1", Width = 150, ListOrderNo = 11, Visible = true, @@ -3378,7 +3378,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency new EditingFormItemDto { Order=2, DataField = "City", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order=3, DataField = "District", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order=4, DataField = "Street", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, - new EditingFormItemDto { Order=5, DataField = "Address", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox }, + new EditingFormItemDto { Order=5, DataField = "Address1", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=6, DataField = "Address2", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=7, DataField = "PostalCode", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox }, new EditingFormItemDto { Order=8, DataField = "Email", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxTextBox }, @@ -3814,7 +3814,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency UserId = null, CultureName = LanguageCodes.En, SourceDbType = DbType.String, - FieldName = "Address", + FieldName = "Address1", Width = 150, ListOrderNo = 10, Visible = true, @@ -14038,7 +14038,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency new EditingFormItemDto { Order = 2, DataField = "Founder", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 3, DataField = "VknTckn", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxNumberBox }, new EditingFormItemDto { Order = 4, DataField = "TaxOffice", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 5, DataField = "Address", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 5, DataField = "Address1", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 6, DataField = "Address2", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 7, DataField = "Country", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order = 8, DataField = "City", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, @@ -14235,7 +14235,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency ListFormCode = listFormPurchaseOrder.ListFormCode, CultureName = LanguageCodes.En, SourceDbType = DbType.String, - FieldName = "Address", + FieldName = "Address1", Width = 100, ListOrderNo = 6, Visible = true, @@ -34111,7 +34111,7 @@ public class ListFormsSeeder : IDataSeedContributor, ITransientDependency 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 = 8, DataField="Email", ColSpan = 2, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 9, DataField="Address", ColSpan = 2, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 9, DataField="Address1", ColSpan = 2, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 10, DataField="Address2", ColSpan = 2, EditorType2 = EditorTypes.dxTextBox }, ] }, 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 3eeb6877..a5a8c421 100644 --- a/api/src/Kurs.Platform.Domain/Entities/Tenant/Hr/Employee.cs +++ b/api/src/Kurs.Platform.Domain/Entities/Tenant/Hr/Employee.cs @@ -25,7 +25,7 @@ public class Employee : FullAuditedEntity, IMultiTenant public string Phone { get; set; } public string PersonalPhone { get; set; } public string Email { get; set; } - public string Address { get; set; } + public string Address1 { get; set; } public string Address2 { get; set; } // Emergency contact diff --git a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251021143137_Initial.Designer.cs b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251021144156_Initial.Designer.cs similarity index 99% rename from api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251021143137_Initial.Designer.cs rename to api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251021144156_Initial.Designer.cs index 9debf848..dba3e569 100644 --- a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251021143137_Initial.Designer.cs +++ b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251021144156_Initial.Designer.cs @@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore; namespace Kurs.Platform.Migrations { [DbContext(typeof(PlatformDbContext))] - [Migration("20251021143137_Initial")] + [Migration("20251021144156_Initial")] partial class Initial { /// @@ -3332,7 +3332,7 @@ namespace Kurs.Platform.Migrations .ValueGeneratedOnAdd() .HasColumnType("uniqueidentifier"); - b.Property("Address") + b.Property("Address1") .HasColumnType("nvarchar(max)"); b.Property("Address2") diff --git a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251021143137_Initial.cs b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251021144156_Initial.cs similarity index 99% rename from api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251021143137_Initial.cs rename to api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251021144156_Initial.cs index 49200298..f4a8e33b 100644 --- a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251021143137_Initial.cs +++ b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20251021144156_Initial.cs @@ -3853,7 +3853,7 @@ namespace Kurs.Platform.Migrations Phone = table.Column(type: "nvarchar(50)", maxLength: 50, nullable: true), PersonalPhone = table.Column(type: "nvarchar(50)", maxLength: 50, nullable: true), Email = table.Column(type: "nvarchar(150)", maxLength: 150, nullable: true), - Address = table.Column(type: "nvarchar(max)", 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), diff --git a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs index a5be42f1..0aeba3e2 100644 --- a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs +++ b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs @@ -3329,7 +3329,7 @@ namespace Kurs.Platform.Migrations .ValueGeneratedOnAdd() .HasColumnType("uniqueidentifier"); - b.Property("Address") + b.Property("Address1") .HasColumnType("nvarchar(max)"); b.Property("Address2")