sozsoft/erp-platform
1
0
Fork 0
Code Issues 6 Pull requests Projects 3 Releases Packages Wiki Activity Actions

Mahalle bilgisi kaldırıldı

Browse source
This commit is contained in:
Sedat ÖZTÜRK 2025-11-20 10:07:31 +03:00
parent 8b44d15cbd
commit c32a00f156
30 changed files with 14527 additions and 598343 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/src/Erp.Platform.Application.Contracts/Intranet/EmployeeDto.cs
View file

@ -19,7 +19,7 @@ public class EmployeeDto : FullAuditedEntityDto<Guid>
public string Country { get; set; } public string Country { get; set; }
public string City { get; set; } public string City { get; set; }
public string District { get; set; } public string District { get; set; }
public string Street { get; set; } public string Township { get; set; }
public string PostalCode { get; set; } public string PostalCode { get; set; }
public string PhoneNumber { get; set; } public string PhoneNumber { get; set; }
public string MobileNumber { get; set; } public string MobileNumber { get; set; }

2
api/src/Erp.Platform.Application.Contracts/ListForms/DynamicApi/CreateUpdateTenantInput.cs
View file

@ -18,7 +18,7 @@ public class CreateUpdateTenantInput
public string Country { get; set; } public string Country { get; set; }
public string City { get; set; } public string City { get; set; }
public string District { get; set; } public string District { get; set; }
public string Street { get; set; } public string Township { get; set; }
public string Address1 { get; set; } public string Address1 { get; set; }
public string Address2 { get; set; } public string Address2 { get; set; }
public string PostalCode { get; set; } public string PostalCode { get; set; }

10
api/src/Erp.Platform.Application.Contracts/LookUpQueryValues.cs
View file

@ -113,18 +113,18 @@ public static class LookupQueryValues
$"GROUP BY \"Name\" " + $"GROUP BY \"Name\" " +
$"ORDER BY \"Name\";"; $"ORDER BY \"Name\";";
public static string StreetValues = public static string TownshipValues =
$"SELECT " + $"SELECT " +
$"\"Street\" AS \"Key\", " + $"\"Township\" AS \"Key\", " +
$"\"Street\" AS \"Name\" " + $"\"Township\" AS \"Name\" " +
$"FROM \"{FullNameTable(TableNameEnum.District)}\" " + $"FROM \"{FullNameTable(TableNameEnum.District)}\" " +
$"WHERE " + $"WHERE " +
$"(\"Country\" = @param0 OR @param0 IS NULL) " + $"(\"Country\" = @param0 OR @param0 IS NULL) " +
$"AND (\"City\" = @param1 OR @param1 IS NULL) " + $"AND (\"City\" = @param1 OR @param1 IS NULL) " +
$"AND (\"Name\" = @param2 OR @param2 IS NULL) " + $"AND (\"Name\" = @param2 OR @param2 IS NULL) " +
$"AND \"IsDeleted\" = 'false' " + $"AND \"IsDeleted\" = 'false' " +
$"GROUP BY \"Street\" " + $"GROUP BY \"Township\" " +
$"ORDER BY \"Street\";"; $"ORDER BY \"Township\";";
public static string RoleValues = public static string RoleValues =
$"SELECT " + $"SELECT " +

2
api/src/Erp.Platform.Application.Contracts/Public/DistrictDto.cs
View file

@ -9,6 +9,4 @@ public class DistrictDto : AuditedEntityDto<Guid>
public string City { get; set; } public string City { get; set; }
public string Name { get; set; } public string Name { get; set; }
public string Township { get; set; } public string Township { get; set; }
public string Street { get; set; }
public string ZipCode { get; set; }
} }

2
api/src/Erp.Platform.Application.Contracts/Tenants/CustomTenantDto.cs
View file

@ -15,7 +15,7 @@ public class CustomTenantDto
public string Country { get; set; } public string Country { get; set; }
public string City { get; set; } public string City { get; set; }
public string District { get; set; } public string District { get; set; }
public string Street { get; set; } public string Township { get; set; }
public string Address1 { get; set; } public string Address1 { get; set; }
public string Address2 { get; set; } public string Address2 { get; set; }
public string PostalCode { get; set; } public string PostalCode { get; set; }

4
api/src/Erp.Platform.Application/ListForms/ListFormDynamicApiAppService.cs
View file

@ -120,7 +120,7 @@ public class ListFormDynamicApiAppService : PlatformAppService, IListFormDynamic
entity.SetCountry(input.Data.Country); entity.SetCountry(input.Data.Country);
entity.SetCity(input.Data.City); entity.SetCity(input.Data.City);
entity.SetDistrict(input.Data.District); entity.SetDistrict(input.Data.District);
entity.SetStreet(input.Data.Street); entity.SetTownship(input.Data.Township);
entity.SetAddress1(input.Data.Address1); entity.SetAddress1(input.Data.Address1);
entity.SetAddress2(input.Data.Address2); entity.SetAddress2(input.Data.Address2);
entity.SetPostalCode(input.Data.PostalCode); entity.SetPostalCode(input.Data.PostalCode);
@ -155,7 +155,7 @@ public class ListFormDynamicApiAppService : PlatformAppService, IListFormDynamic
entity.SetCountry(input.Data.Country); entity.SetCountry(input.Data.Country);
entity.SetCity(input.Data.City); entity.SetCity(input.Data.City);
entity.SetDistrict(input.Data.District); entity.SetDistrict(input.Data.District);
entity.SetStreet(input.Data.Street); entity.SetTownship(input.Data.Township);
entity.SetAddress1(input.Data.Address1); entity.SetAddress1(input.Data.Address1);
entity.SetAddress2(input.Data.Address2); entity.SetAddress2(input.Data.Address2);
entity.SetPostalCode(input.Data.PostalCode); entity.SetPostalCode(input.Data.PostalCode);

2
api/src/Erp.Platform.Application/Tenants/PlatformTenantAppService.cs
View file

@ -82,7 +82,7 @@ public class PlatformTenantAppService : TenantAppService, IPlatformTenantAppServ
dto.Country = tenant.GetCountry(); dto.Country = tenant.GetCountry();
dto.City = tenant.GetCity(); dto.City = tenant.GetCity();
dto.District = tenant.GetDistrict(); dto.District = tenant.GetDistrict();
dto.Street = tenant.GetStreet(); dto.Township = tenant.GetTownship();
dto.Address1 = tenant.GetAddress1(); dto.Address1 = tenant.GetAddress1();
dto.Address2 = tenant.GetAddress2(); dto.Address2 = tenant.GetAddress2();
dto.PostalCode = tenant.GetPostalCode(); dto.PostalCode = tenant.GetPostalCode();

594740
api/src/Erp.Platform.DbMigrator/Seeds/Districts.json
View file

File diff suppressed because it is too large Load diff

10
api/src/Erp.Platform.DbMigrator/Seeds/HostDataSeeder.cs
View file

@ -386,11 +386,11 @@ public class HostDataSeeder : IDataSeedContributor, ITransientDependency
// 1. Mevcut kayıtları çek (tek sorguda) // 1. Mevcut kayıtları çek (tek sorguda)
var existingDistricts = await dbCtx.Set<District>() var existingDistricts = await dbCtx.Set<District>()
.Select(d => new { d.Country, d.City, d.Name, d.Township, d.Street, d.ZipCode }) .Select(d => new { d.Country, d.City, d.Name, d.Township })
.ToListAsync(); .ToListAsync();
var existingSet = existingDistricts var existingSet = existingDistricts
.Select(d => $"{d.Country}:{d.City}:{d.Name}:{d.Township}:{d.Street}:{d.ZipCode}") .Select(d => $"{d.Country}:{d.City}:{d.Name}:{d.Township}")
.ToHashSet(); .ToHashSet();
var options = new JsonSerializerOptions var options = new JsonSerializerOptions
@ -406,7 +406,7 @@ public class HostDataSeeder : IDataSeedContributor, ITransientDependency
{ {
if (item == null) continue; if (item == null) continue;
var key = $"{item.Country}:{item.Country}.{item.City}:{item.Name}:{item.Township}:{item.Street}:{item.ZipCode}"; var key = $"{item.Country}:{item.Country}.{item.City}:{item.Name}:{item.Township}";
var city = $"{item.Country}.{item.City}"; var city = $"{item.Country}.{item.City}";
if (existingSet.Contains(key)) continue; if (existingSet.Contains(key)) continue;
@ -415,9 +415,7 @@ public class HostDataSeeder : IDataSeedContributor, ITransientDependency
item.Country, item.Country,
city, city,
item.Name, item.Name,
item.Township, item.Township
item.Street,
item.ZipCode
)); ));
if (buffer.Count >= 5000) // 3. Batch if (buffer.Count >= 5000) // 3. Batch

6
api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Accounting.cs
View file

@ -233,7 +233,7 @@ public class ListFormSeeder_Accounting : IDataSeedContributor, ITransientDepende
DisplayExpr = "Name", DisplayExpr = "Name",
ValueExpr = "Key", ValueExpr = "Key",
LookupQuery = LookupQueryValues.CountryValues, LookupQuery = LookupQueryValues.CountryValues,
CascadeEmptyFields = "City,District,Street" CascadeEmptyFields = "City,District,Township"
}), }),
ColumnCustomizationJson = DefaultColumnCustomizationJson, ColumnCustomizationJson = DefaultColumnCustomizationJson,
PermissionJson = DefaultFieldPermissionJson(listForm.Name), PermissionJson = DefaultFieldPermissionJson(listForm.Name),
@ -259,7 +259,7 @@ public class ListFormSeeder_Accounting : IDataSeedContributor, ITransientDepende
CascadeRelationField = "Country", CascadeRelationField = "Country",
CascadeFilterOperator="=", CascadeFilterOperator="=",
CascadeParentFields = "Country", CascadeParentFields = "Country",
CascadeEmptyFields = "District,Street" CascadeEmptyFields = "District,Township"
}), }),
ColumnCustomizationJson = DefaultColumnCustomizationJson, ColumnCustomizationJson = DefaultColumnCustomizationJson,
PermissionJson = DefaultFieldPermissionJson(listForm.Name), PermissionJson = DefaultFieldPermissionJson(listForm.Name),
@ -285,7 +285,7 @@ public class ListFormSeeder_Accounting : IDataSeedContributor, ITransientDepende
CascadeRelationField = "City", CascadeRelationField = "City",
CascadeFilterOperator="=", CascadeFilterOperator="=",
CascadeParentFields = "Country,City", CascadeParentFields = "Country,City",
CascadeEmptyFields = "Street", CascadeEmptyFields = "Township",
}), }),
ColumnCustomizationJson = DefaultColumnCustomizationJson, ColumnCustomizationJson = DefaultColumnCustomizationJson,
PermissionJson = DefaultFieldPermissionJson(listForm.Name), PermissionJson = DefaultFieldPermissionJson(listForm.Name),

12
api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Crm.cs
View file

@ -346,7 +346,7 @@ public class ListFormSeeder_Crm : IDataSeedContributor, ITransientDependency
new EditingFormItemDto { Order = 10, DataField = "Country", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order = 10, DataField = "Country", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton },
new EditingFormItemDto { Order = 11, DataField = "City", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order = 11, DataField = "City", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton },
new EditingFormItemDto { Order = 12, DataField = "District", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order = 12, DataField = "District", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton },
new EditingFormItemDto { Order = 13, DataField = "Street", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order = 13, DataField = "Township", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton },
new EditingFormItemDto { Order = 14, DataField = "Address1", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 14, DataField = "Address1", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox },
new EditingFormItemDto { Order = 15, DataField = "Address2", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 15, DataField = "Address2", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox },
new EditingFormItemDto { Order = 16, DataField = "PostalCode", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 16, DataField = "PostalCode", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox },
@ -588,7 +588,7 @@ public class ListFormSeeder_Crm : IDataSeedContributor, ITransientDependency
DisplayExpr = "Name", DisplayExpr = "Name",
ValueExpr = "Key", ValueExpr = "Key",
LookupQuery = LookupQueryValues.CountryValues, LookupQuery = LookupQueryValues.CountryValues,
CascadeEmptyFields = "City,District,Street" CascadeEmptyFields = "City,District,Township"
}), }),
ColumnCustomizationJson = DefaultColumnCustomizationJson, ColumnCustomizationJson = DefaultColumnCustomizationJson,
PermissionJson = DefaultFieldPermissionJson(listForm.Name), PermissionJson = DefaultFieldPermissionJson(listForm.Name),
@ -614,7 +614,7 @@ public class ListFormSeeder_Crm : IDataSeedContributor, ITransientDependency
CascadeRelationField = "Country", CascadeRelationField = "Country",
CascadeFilterOperator="=", CascadeFilterOperator="=",
CascadeParentFields = "Country", CascadeParentFields = "Country",
CascadeEmptyFields = "District,Street" CascadeEmptyFields = "District,Township"
}), }),
ColumnCustomizationJson = DefaultColumnCustomizationJson, ColumnCustomizationJson = DefaultColumnCustomizationJson,
PermissionJson = DefaultFieldPermissionJson(listForm.Name), PermissionJson = DefaultFieldPermissionJson(listForm.Name),
@ -640,7 +640,7 @@ public class ListFormSeeder_Crm : IDataSeedContributor, ITransientDependency
CascadeRelationField = "City", CascadeRelationField = "City",
CascadeFilterOperator="=", CascadeFilterOperator="=",
CascadeParentFields = "Country,City", CascadeParentFields = "Country,City",
CascadeEmptyFields = "Street", CascadeEmptyFields = "Township",
}), }),
ColumnCustomizationJson = DefaultColumnCustomizationJson, ColumnCustomizationJson = DefaultColumnCustomizationJson,
PermissionJson = DefaultFieldPermissionJson(listForm.Name), PermissionJson = DefaultFieldPermissionJson(listForm.Name),
@ -650,7 +650,7 @@ public class ListFormSeeder_Crm : IDataSeedContributor, ITransientDependency
ListFormCode = listForm.ListFormCode, ListFormCode = listForm.ListFormCode,
CultureName = LanguageCodes.En, CultureName = LanguageCodes.En,
SourceDbType = DbType.String, SourceDbType = DbType.String,
FieldName = "Street", FieldName = "Township",
Width = 100, Width = 100,
ListOrderNo = 14, ListOrderNo = 14,
Visible = true, Visible = true,
@ -662,7 +662,7 @@ public class ListFormSeeder_Crm : IDataSeedContributor, ITransientDependency
DataSourceType = UiLookupDataSourceTypeEnum.Query, DataSourceType = UiLookupDataSourceTypeEnum.Query,
DisplayExpr = "Name", DisplayExpr = "Name",
ValueExpr = "Key", ValueExpr = "Key",
LookupQuery = LookupQueryValues.StreetValues, LookupQuery = LookupQueryValues.TownshipValues,
CascadeRelationField = "District", CascadeRelationField = "District",
CascadeFilterOperator="=", CascadeFilterOperator="=",
CascadeParentFields = "Country,City,District", CascadeParentFields = "Country,City,District",

12
api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Hr.cs
View file

@ -1315,7 +1315,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency
new EditingFormItemDto { Order = 1, DataField = "Country", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order = 1, DataField = "Country", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton },
new EditingFormItemDto { Order = 2, DataField = "City", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order = 2, DataField = "City", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton },
new EditingFormItemDto { Order = 3, DataField = "District", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, 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 = 4, DataField = "Township", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton },
new EditingFormItemDto { Order = 5, DataField = "PostalCode", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox }, new EditingFormItemDto { Order = 5, DataField = "PostalCode", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox },
new EditingFormItemDto { Order = 6, DataField = "PhoneNumber", 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 = 7, DataField = "MobileNumber", ColSpan = 1, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.PhoneEditorOptions },
@ -1580,7 +1580,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency
DisplayExpr = "Name", DisplayExpr = "Name",
ValueExpr = "Key", ValueExpr = "Key",
LookupQuery = LookupQueryValues.CountryValues, LookupQuery = LookupQueryValues.CountryValues,
CascadeEmptyFields = "City,District,Street" CascadeEmptyFields = "City,District,Township"
}), }),
ValidationRuleJson = DefaultValidationRuleRequiredJson, ValidationRuleJson = DefaultValidationRuleRequiredJson,
ColumnCustomizationJson = DefaultColumnCustomizationJson, ColumnCustomizationJson = DefaultColumnCustomizationJson,
@ -1607,7 +1607,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency
CascadeRelationField = "Country", CascadeRelationField = "Country",
CascadeFilterOperator="=", CascadeFilterOperator="=",
CascadeParentFields = "Country", CascadeParentFields = "Country",
CascadeEmptyFields = "District,Street" CascadeEmptyFields = "District,Township"
}), }),
ValidationRuleJson = DefaultValidationRuleRequiredJson, ValidationRuleJson = DefaultValidationRuleRequiredJson,
ColumnCustomizationJson = DefaultColumnCustomizationJson, ColumnCustomizationJson = DefaultColumnCustomizationJson,
@ -1634,7 +1634,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency
CascadeRelationField = "City", CascadeRelationField = "City",
CascadeFilterOperator="=", CascadeFilterOperator="=",
CascadeParentFields = "Country,City", CascadeParentFields = "Country,City",
CascadeEmptyFields = "Street", CascadeEmptyFields = "Township",
}), }),
ValidationRuleJson = DefaultValidationRuleRequiredJson, ValidationRuleJson = DefaultValidationRuleRequiredJson,
ColumnCustomizationJson = DefaultColumnCustomizationJson, ColumnCustomizationJson = DefaultColumnCustomizationJson,
@ -1645,7 +1645,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency
ListFormCode = listForm.ListFormCode, ListFormCode = listForm.ListFormCode,
CultureName = LanguageCodes.En, CultureName = LanguageCodes.En,
SourceDbType = DbType.String, SourceDbType = DbType.String,
FieldName = "Street", FieldName = "Township",
Width = 100, Width = 100,
ListOrderNo = 15, ListOrderNo = 15,
Visible = true, Visible = true,
@ -1657,7 +1657,7 @@ public class ListFormSeeder_Hr : IDataSeedContributor, ITransientDependency
DataSourceType = UiLookupDataSourceTypeEnum.Query, DataSourceType = UiLookupDataSourceTypeEnum.Query,
DisplayExpr = "Name", DisplayExpr = "Name",
ValueExpr = "Key", ValueExpr = "Key",
LookupQuery = LookupQueryValues.StreetValues, LookupQuery = LookupQueryValues.TownshipValues,
CascadeRelationField = "District", CascadeRelationField = "District",
CascadeFilterOperator="=", CascadeFilterOperator="=",
CascadeParentFields = "Country,City,District", CascadeParentFields = "Country,City,District",

58
api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_Saas.cs
View file

@ -101,7 +101,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency
new EditingFormItemDto { Order=1, DataField = "Country", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order=1, DataField = "Country", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton },
new EditingFormItemDto { Order=2, DataField = "City", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, 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=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=4, DataField = "Township", 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=5, DataField = "PostalCode", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox, EditorOptions=EditorOptionValues.ShowClearButton },
new EditingFormItemDto { Order=6, DataField = "Address1", 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=7, DataField = "Address2", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox },
@ -258,7 +258,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency
DisplayExpr = "Name", DisplayExpr = "Name",
ValueExpr = "Key", ValueExpr = "Key",
LookupQuery = LookupQueryValues.CountryValues, LookupQuery = LookupQueryValues.CountryValues,
CascadeEmptyFields = "City,District,Street" CascadeEmptyFields = "City,District,Township"
}), }),
ColumnCustomizationJson = DefaultColumnCustomizationJson, ColumnCustomizationJson = DefaultColumnCustomizationJson,
PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false),
@ -285,7 +285,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency
CascadeRelationField = "Country", CascadeRelationField = "Country",
CascadeFilterOperator="=", CascadeFilterOperator="=",
CascadeParentFields = "Country", CascadeParentFields = "Country",
CascadeEmptyFields = "District,Street" CascadeEmptyFields = "District,Township"
}), }),
ColumnCustomizationJson = DefaultColumnCustomizationJson, ColumnCustomizationJson = DefaultColumnCustomizationJson,
PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false),
@ -312,7 +312,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency
CascadeRelationField = "City", CascadeRelationField = "City",
CascadeFilterOperator="=", CascadeFilterOperator="=",
CascadeParentFields = "Country,City", CascadeParentFields = "Country,City",
CascadeEmptyFields = "Street", CascadeEmptyFields = "Township",
}), }),
ColumnCustomizationJson = DefaultColumnCustomizationJson, ColumnCustomizationJson = DefaultColumnCustomizationJson,
PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false), PermissionJson = DefaultFieldPermissionJson(TenantManagementPermissions.Tenants.Create, TenantManagementPermissions.Tenants.Default, TenantManagementPermissions.Tenants.Update, true, true, false),
@ -323,7 +323,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency
ListFormCode = listForm.ListFormCode, ListFormCode = listForm.ListFormCode,
CultureName = LanguageCodes.En, CultureName = LanguageCodes.En,
SourceDbType = DbType.String, SourceDbType = DbType.String,
FieldName = "Street", FieldName = "Township",
Width = 100, Width = 100,
ListOrderNo = 10, ListOrderNo = 10,
Visible = true, Visible = true,
@ -335,7 +335,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency
DataSourceType = UiLookupDataSourceTypeEnum.Query, DataSourceType = UiLookupDataSourceTypeEnum.Query,
DisplayExpr = "Name", DisplayExpr = "Name",
ValueExpr = "Key", ValueExpr = "Key",
LookupQuery = LookupQueryValues.StreetValues, LookupQuery = LookupQueryValues.TownshipValues,
CascadeRelationField = "District", CascadeRelationField = "District",
CascadeFilterOperator="=", CascadeFilterOperator="=",
CascadeParentFields = "Country,City,District" CascadeParentFields = "Country,City,District"
@ -575,7 +575,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency
new EditingFormItemDto { Order=1, DataField = "Country", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order=1, DataField = "Country", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton },
new EditingFormItemDto { Order=2, DataField = "City", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, 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=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=4, DataField = "Township", ColSpan=2, IsRequired=true, EditorType2=EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton },
new EditingFormItemDto { Order=5, DataField = "Address1", 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=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=7, DataField = "PostalCode", ColSpan=2, IsRequired=false, EditorType2=EditorTypes.dxTextBox },
@ -725,7 +725,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency
DisplayExpr = "Name", DisplayExpr = "Name",
ValueExpr = "Key", ValueExpr = "Key",
LookupQuery = LookupQueryValues.CountryValues, LookupQuery = LookupQueryValues.CountryValues,
CascadeEmptyFields = "City,District,Street" CascadeEmptyFields = "City,District,Township"
}), }),
ColumnCustomizationJson = DefaultColumnCustomizationJson, ColumnCustomizationJson = DefaultColumnCustomizationJson,
PermissionJson = DefaultFieldPermissionJson(listForm.Name), PermissionJson = DefaultFieldPermissionJson(listForm.Name),
@ -752,7 +752,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency
CascadeRelationField = "Country", CascadeRelationField = "Country",
CascadeFilterOperator="=", CascadeFilterOperator="=",
CascadeParentFields = "Country", CascadeParentFields = "Country",
CascadeEmptyFields = "District,Street" CascadeEmptyFields = "District,Township"
}), }),
ColumnCustomizationJson = DefaultColumnCustomizationJson, ColumnCustomizationJson = DefaultColumnCustomizationJson,
PermissionJson = DefaultFieldPermissionJson(listForm.Name), PermissionJson = DefaultFieldPermissionJson(listForm.Name),
@ -779,7 +779,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency
CascadeRelationField = "City", CascadeRelationField = "City",
CascadeFilterOperator="=", CascadeFilterOperator="=",
CascadeParentFields = "Country,City", CascadeParentFields = "Country,City",
CascadeEmptyFields = "Street", CascadeEmptyFields = "Township",
}), }),
ColumnCustomizationJson = DefaultColumnCustomizationJson, ColumnCustomizationJson = DefaultColumnCustomizationJson,
PermissionJson = DefaultFieldPermissionJson(listForm.Name), PermissionJson = DefaultFieldPermissionJson(listForm.Name),
@ -790,7 +790,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency
ListFormCode = listForm.ListFormCode, ListFormCode = listForm.ListFormCode,
CultureName = LanguageCodes.En, CultureName = LanguageCodes.En,
SourceDbType = DbType.String, SourceDbType = DbType.String,
FieldName = "Street", FieldName = "Township",
Width = 100, Width = 100,
ListOrderNo = 9, ListOrderNo = 9,
Visible = true, Visible = true,
@ -802,7 +802,7 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency
DataSourceType = UiLookupDataSourceTypeEnum.Query, DataSourceType = UiLookupDataSourceTypeEnum.Query,
DisplayExpr = "Name", DisplayExpr = "Name",
ValueExpr = "Key", ValueExpr = "Key",
LookupQuery = LookupQueryValues.StreetValues, LookupQuery = LookupQueryValues.TownshipValues,
CascadeRelationField = "District", CascadeRelationField = "District",
CascadeFilterOperator="=", CascadeFilterOperator="=",
CascadeParentFields = "Country,City,District" CascadeParentFields = "Country,City,District"
@ -4373,8 +4373,6 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency
new EditingFormItemDto { Order = 2, DataField = "City", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order = 2, DataField = "City", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton },
new EditingFormItemDto { Order = 3, DataField = "Name", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 3, DataField = "Name", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox },
new EditingFormItemDto { Order = 4, DataField = "Township", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 4, DataField = "Township", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox },
new EditingFormItemDto { Order = 5, DataField = "Street", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox },
new EditingFormItemDto { Order = 6, DataField = "ZipCode", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }
] ]
} }
}), }),
@ -4482,38 +4480,6 @@ public class ListFormSeeder_Saas : IDataSeedContributor, ITransientDependency
ColumnCustomizationJson = DefaultColumnCustomizationJson, ColumnCustomizationJson = DefaultColumnCustomizationJson,
PermissionJson = DefaultFieldPermissionJson(listForm.Name), PermissionJson = DefaultFieldPermissionJson(listForm.Name),
}, },
new()
{
ListFormCode = listForm.ListFormCode,
CultureName = LanguageCodes.En,
SourceDbType = DbType.String,
FieldName = "Street",
Width = 400,
ListOrderNo = 6,
Visible = true,
IsActive = true,
IsDeleted = false,
AllowSearch = false,
ValidationRuleJson = DefaultValidationRuleRequiredJson,
ColumnCustomizationJson = DefaultColumnCustomizationJson,
PermissionJson = DefaultFieldPermissionJson(listForm.Name),
},
new()
{
ListFormCode = listForm.ListFormCode,
CultureName = LanguageCodes.En,
SourceDbType = DbType.String,
FieldName = "ZipCode",
Width = 100,
ListOrderNo = 7,
Visible = true,
IsActive = true,
IsDeleted = false,
AllowSearch = false,
ValidationRuleJson = DefaultValidationRuleRequiredJson,
ColumnCustomizationJson = DefaultColumnCustomizationJson,
PermissionJson = DefaultFieldPermissionJson(listForm.Name),
},
]); ]);
#endregion #endregion
} }

12
api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_SupplyChain.cs
View file

@ -1103,7 +1103,7 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend
new EditingFormItemDto { Order = 10, DataField = "Country", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order = 10, DataField = "Country", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton },
new EditingFormItemDto { Order = 11, DataField = "City", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order = 11, DataField = "City", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton },
new EditingFormItemDto { Order = 12, DataField = "District", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order = 12, DataField = "District", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton },
new EditingFormItemDto { Order = 13, DataField = "Street", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton }, new EditingFormItemDto { Order = 13, DataField = "Township", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox, EditorOptions=EditorOptionValues.ShowClearButton },
new EditingFormItemDto { Order = 14, DataField = "Address1", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 14, DataField = "Address1", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox },
new EditingFormItemDto { Order = 15, DataField = "Address2", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 15, DataField = "Address2", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox },
new EditingFormItemDto { Order = 16, DataField = "PostalCode", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 16, DataField = "PostalCode", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox },
@ -1345,7 +1345,7 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend
DisplayExpr = "Name", DisplayExpr = "Name",
ValueExpr = "Key", ValueExpr = "Key",
LookupQuery = LookupQueryValues.CountryValues, LookupQuery = LookupQueryValues.CountryValues,
CascadeEmptyFields = "City,District,Street" CascadeEmptyFields = "City,District,Township"
}), }),
ColumnCustomizationJson = DefaultColumnCustomizationJson, ColumnCustomizationJson = DefaultColumnCustomizationJson,
PermissionJson = DefaultFieldPermissionJson(listForm.Name), PermissionJson = DefaultFieldPermissionJson(listForm.Name),
@ -1371,7 +1371,7 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend
CascadeRelationField = "Country", CascadeRelationField = "Country",
CascadeFilterOperator="=", CascadeFilterOperator="=",
CascadeParentFields = "Country", CascadeParentFields = "Country",
CascadeEmptyFields = "District,Street" CascadeEmptyFields = "District,Township"
}), }),
ColumnCustomizationJson = DefaultColumnCustomizationJson, ColumnCustomizationJson = DefaultColumnCustomizationJson,
PermissionJson = DefaultFieldPermissionJson(listForm.Name), PermissionJson = DefaultFieldPermissionJson(listForm.Name),
@ -1397,7 +1397,7 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend
CascadeRelationField = "City", CascadeRelationField = "City",
CascadeFilterOperator="=", CascadeFilterOperator="=",
CascadeParentFields = "Country,City", CascadeParentFields = "Country,City",
CascadeEmptyFields = "Street", CascadeEmptyFields = "Township",
}), }),
ColumnCustomizationJson = DefaultColumnCustomizationJson, ColumnCustomizationJson = DefaultColumnCustomizationJson,
PermissionJson = DefaultFieldPermissionJson(listForm.Name), PermissionJson = DefaultFieldPermissionJson(listForm.Name),
@ -1407,7 +1407,7 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend
ListFormCode = listForm.ListFormCode, ListFormCode = listForm.ListFormCode,
CultureName = LanguageCodes.En, CultureName = LanguageCodes.En,
SourceDbType = DbType.String, SourceDbType = DbType.String,
FieldName = "Street", FieldName = "Township",
Width = 100, Width = 100,
ListOrderNo = 14, ListOrderNo = 14,
Visible = true, Visible = true,
@ -1419,7 +1419,7 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend
DataSourceType = UiLookupDataSourceTypeEnum.Query, DataSourceType = UiLookupDataSourceTypeEnum.Query,
DisplayExpr = "Name", DisplayExpr = "Name",
ValueExpr = "Key", ValueExpr = "Key",
LookupQuery = LookupQueryValues.StreetValues, LookupQuery = LookupQueryValues.TownshipValues,
CascadeRelationField = "District", CascadeRelationField = "District",
CascadeFilterOperator="=", CascadeFilterOperator="=",
CascadeParentFields = "Country,City,District", CascadeParentFields = "Country,City,District",

2
api/src/Erp.Platform.Domain.Shared/PlatformConsts.cs
View file

@ -56,7 +56,7 @@ public static class PlatformConsts
public const string Country = "Country"; public const string Country = "Country";
public const string City = "City"; public const string City = "City";
public const string District = "District"; public const string District = "District";
public const string Street = "Street"; public const string Township = "Township";
public const string Address1 = "Address1"; public const string Address1 = "Address1";
public const string Address2 = "Address2"; public const string Address2 = "Address2";
public const string PostalCode = "PostalCode"; public const string PostalCode = "PostalCode";

6
api/src/Erp.Platform.Domain/Entities/Host/District.cs
View file

@ -9,20 +9,16 @@ public class District : FullAuditedEntity<Guid>
public string City { get; set; } public string City { get; set; }
public string Name { get; set; } public string Name { get; set; }
public string Township { get; set; } public string Township { get; set; }
public string Street { get; set; }
public string ZipCode { get; set; }
protected District() { } protected District() { }
public District(Guid id, string country, string city, string name, string township, string street, string zipCode) public District(Guid id, string country, string city, string name, string township)
: base(id) : base(id)
{ {
Country = country; Country = country;
City = city; City = city;
Name = name; Name = name;
Township = township; Township = township;
Street = street;
ZipCode = zipCode;
} }
} }

2
api/src/Erp.Platform.Domain/Entities/Tenant/Hr/Employee.cs
View file

@ -21,7 +21,7 @@ public class Employee : FullAuditedEntity<Guid>, IMultiTenant
public string Country { get; set; } public string Country { get; set; }
public string City { get; set; } public string City { get; set; }
public string District { get; set; } public string District { get; set; }
public string Street { get; set; } public string Township { get; set; }
public string PostalCode { get; set; } public string PostalCode { get; set; }
public string MobileNumber { get; set; } public string MobileNumber { get; set; }
public string PhoneNumber { get; set; } public string PhoneNumber { get; set; }

2
api/src/Erp.Platform.Domain/Entities/Tenant/Saas/Branch.cs
View file

@ -16,7 +16,7 @@ public class Branch : FullAuditedEntity<Guid>
public string Country { get; set; } public string Country { get; set; }
public string City { get; set; } public string City { get; set; }
public string District { get; set; } public string District { get; set; }
public string Street { get; set; } public string Township { get; set; }
public string Address1 { get; set; } public string Address1 { get; set; }
public string Address2 { get; set; } public string Address2 { get; set; }
public string PostalCode { get; set; } public string PostalCode { get; set; }

2
api/src/Erp.Platform.Domain/Entities/Tenant/SupplyChain/Partner.cs
View file

@ -25,7 +25,7 @@ public class Partner : FullAuditedEntity<Guid>, IMultiTenant
public string Country { get; set; } public string Country { get; set; }
public string City { get; set; } public string City { get; set; }
public string District { get; set; } public string District { get; set; }
public string Street { get; set; } public string Township { get; set; }
public string Address1 { get; set; } public string Address1 { get; set; }
public string Address2 { get; set; } public string Address2 { get; set; }
public string PostalCode { get; set; } public string PostalCode { get; set; }

8
api/src/Erp.Platform.Domain/Extensions/AbpTenantExtensions.cs
View file

@ -77,13 +77,13 @@ public static class AbpTenantExtensions
{ {
return tenant.GetProperty<string>(PlatformConsts.Tenants.District); return tenant.GetProperty<string>(PlatformConsts.Tenants.District);
} }
public static void SetStreet(this Tenant tenant, string street) public static void SetTownship(this Tenant tenant, string township)
{ {
tenant.SetProperty(PlatformConsts.Tenants.Street, street); tenant.SetProperty(PlatformConsts.Tenants.Township, township);
} }
public static string GetStreet(this Tenant tenant) public static string GetTownship(this Tenant tenant)
{ {
return tenant.GetProperty<string>(PlatformConsts.Tenants.Street); return tenant.GetProperty<string>(PlatformConsts.Tenants.Township);
} }
public static void SetAddress1(this Tenant tenant, string address) public static void SetAddress1(this Tenant tenant, string address)

8
api/src/Erp.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformDbContext.cs
View file

@ -294,7 +294,7 @@ public class PlatformDbContext :
b.Property(a => a.Country).HasMaxLength(128); b.Property(a => a.Country).HasMaxLength(128);
b.Property(a => a.City).HasMaxLength(128); b.Property(a => a.City).HasMaxLength(128);
b.Property(a => a.District).HasMaxLength(128); b.Property(a => a.District).HasMaxLength(128);
b.Property(a => a.Street).HasMaxLength(256); b.Property(a => a.Township).HasMaxLength(256);
b.Property(a => a.Address1).HasMaxLength(512); b.Property(a => a.Address1).HasMaxLength(512);
b.Property(a => a.Address2).HasMaxLength(512); b.Property(a => a.Address2).HasMaxLength(512);
b.Property(a => a.PostalCode).HasMaxLength(16); b.Property(a => a.PostalCode).HasMaxLength(16);
@ -899,10 +899,8 @@ public class PlatformDbContext :
b.Property(x => x.City).IsRequired().HasMaxLength(16); b.Property(x => x.City).IsRequired().HasMaxLength(16);
b.Property(x => x.Name).IsRequired().HasMaxLength(128); b.Property(x => x.Name).IsRequired().HasMaxLength(128);
b.Property(x => x.Township).HasMaxLength(128); b.Property(x => x.Township).HasMaxLength(128);
b.Property(x => x.Street).HasMaxLength(256);
b.Property(x => x.ZipCode).HasMaxLength(16);
b.HasIndex(x => new { x.Country, x.City, x.Name, x.Township, x.Street, x.ZipCode }).IsUnique(); b.HasIndex(x => new { x.Country, x.City, x.Name, x.Township }).IsUnique();
}); });
builder.Entity<SkillType>(b => builder.Entity<SkillType>(b =>
@ -2371,7 +2369,7 @@ public class PlatformDbContext :
b.Property(p => p.Country).IsRequired().HasMaxLength(64); b.Property(p => p.Country).IsRequired().HasMaxLength(64);
b.Property(p => p.City).IsRequired().HasMaxLength(64); b.Property(p => p.City).IsRequired().HasMaxLength(64);
b.Property(p => p.District).HasMaxLength(64); b.Property(p => p.District).HasMaxLength(64);
b.Property(p => p.Street).HasMaxLength(128); b.Property(p => p.Township).HasMaxLength(128);
b.Property(p => p.Address1).HasMaxLength(256); b.Property(p => p.Address1).HasMaxLength(256);
b.Property(p => p.Address2).HasMaxLength(256); b.Property(p => p.Address2).HasMaxLength(256);
b.Property(p => p.PostalCode).HasMaxLength(16); b.Property(p => p.PostalCode).HasMaxLength(16);

2
api/src/Erp.Platform.EntityFrameworkCore/EntityFrameworkCore/PlatformEfCoreEntityExtensionMappings.cs
View file

@ -120,7 +120,7 @@ public static class PlatformEfCoreEntityExtensionMappings
ObjectExtensionManager.Instance ObjectExtensionManager.Instance
.MapEfCoreProperty<Tenant, string>( .MapEfCoreProperty<Tenant, string>(
PlatformConsts.Tenants.Street, PlatformConsts.Tenants.Township,
(entityBuilder, propertyBuilder) => (entityBuilder, propertyBuilder) =>
{ {
propertyBuilder.HasMaxLength(128).HasDefaultValue(null); propertyBuilder.HasMaxLength(128).HasDefaultValue(null);

44
api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251118201005_Initial.Designer.cs → api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251120065949_Initial.Designer.cs generated
View file

@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore;
namespace Erp.Platform.Migrations namespace Erp.Platform.Migrations
{ {
[DbContext(typeof(PlatformDbContext))] [DbContext(typeof(PlatformDbContext))]
[Migration("20251118201005_Initial")] [Migration("20251120065949_Initial")]
partial class Initial partial class Initial
{ {
/// <inheritdoc /> /// <inheritdoc />
@ -1599,10 +1599,6 @@ namespace Erp.Platform.Migrations
.HasMaxLength(16) .HasMaxLength(16)
.HasColumnType("nvarchar(16)"); .HasColumnType("nvarchar(16)");
b.Property<string>("Street")
.HasMaxLength(256)
.HasColumnType("nvarchar(256)");
b.Property<string>("TaxOffice") b.Property<string>("TaxOffice")
.HasMaxLength(128) .HasMaxLength(128)
.HasColumnType("nvarchar(128)"); .HasColumnType("nvarchar(128)");
@ -1610,6 +1606,10 @@ namespace Erp.Platform.Migrations
b.Property<Guid?>("TenantId") b.Property<Guid?>("TenantId")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
b.Property<string>("Township")
.HasMaxLength(256)
.HasColumnType("nvarchar(256)");
b.Property<long>("VknTckn") b.Property<long>("VknTckn")
.HasColumnType("bigint"); .HasColumnType("bigint");
@ -3715,25 +3715,17 @@ namespace Erp.Platform.Migrations
.HasMaxLength(128) .HasMaxLength(128)
.HasColumnType("nvarchar(128)"); .HasColumnType("nvarchar(128)");
b.Property<string>("Street")
.HasMaxLength(256)
.HasColumnType("nvarchar(256)");
b.Property<string>("Township") b.Property<string>("Township")
.HasMaxLength(128) .HasMaxLength(128)
.HasColumnType("nvarchar(128)"); .HasColumnType("nvarchar(128)");
b.Property<string>("ZipCode")
.HasMaxLength(16)
.HasColumnType("nvarchar(16)");
b.HasKey("Id"); b.HasKey("Id");
b.HasIndex("CityId"); b.HasIndex("CityId");
b.HasIndex("Country", "City", "Name", "Township", "Street", "ZipCode") b.HasIndex("Country", "City", "Name", "Township")
.IsUnique() .IsUnique()
.HasFilter("[Country] IS NOT NULL AND [Township] IS NOT NULL AND [Street] IS NOT NULL AND [ZipCode] IS NOT NULL"); .HasFilter("[Country] IS NOT NULL AND [Township] IS NOT NULL");
b.ToTable("Sas_H_District", (string)null); b.ToTable("Sas_H_District", (string)null);
}); });
@ -4073,9 +4065,6 @@ namespace Erp.Platform.Migrations
b.Property<string>("PostalCode") b.Property<string>("PostalCode")
.HasColumnType("nvarchar(max)"); .HasColumnType("nvarchar(max)");
b.Property<string>("Street")
.HasColumnType("nvarchar(max)");
b.Property<Guid?>("TenantId") b.Property<Guid?>("TenantId")
.HasColumnType("uniqueidentifier") .HasColumnType("uniqueidentifier")
.HasColumnName("TenantId"); .HasColumnName("TenantId");
@ -4083,6 +4072,9 @@ namespace Erp.Platform.Migrations
b.Property<DateTime?>("TerminationDate") b.Property<DateTime?>("TerminationDate")
.HasColumnType("datetime2"); .HasColumnType("datetime2");
b.Property<string>("Township")
.HasColumnType("nvarchar(max)");
b.Property<string>("WorkLocation") b.Property<string>("WorkLocation")
.HasMaxLength(150) .HasMaxLength(150)
.HasColumnType("nvarchar(150)"); .HasColumnType("nvarchar(150)");
@ -7190,10 +7182,6 @@ namespace Erp.Platform.Migrations
.HasMaxLength(10) .HasMaxLength(10)
.HasColumnType("nvarchar(10)"); .HasColumnType("nvarchar(10)");
b.Property<string>("Street")
.HasMaxLength(128)
.HasColumnType("nvarchar(128)");
b.Property<Guid?>("SupplierTypeId") b.Property<Guid?>("SupplierTypeId")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
@ -7221,6 +7209,10 @@ namespace Erp.Platform.Migrations
.HasColumnType("decimal(18,2)") .HasColumnType("decimal(18,2)")
.HasDefaultValue(0m); .HasDefaultValue(0m);
b.Property<string>("Township")
.HasMaxLength(128)
.HasColumnType("nvarchar(128)");
b.Property<DateTime?>("ValidFrom") b.Property<DateTime?>("ValidFrom")
.HasColumnType("datetime2"); .HasColumnType("datetime2");
@ -13585,14 +13577,14 @@ namespace Erp.Platform.Migrations
.HasMaxLength(10) .HasMaxLength(10)
.HasColumnType("nvarchar(10)"); .HasColumnType("nvarchar(10)");
b.Property<string>("Street")
.HasMaxLength(128)
.HasColumnType("nvarchar(128)");
b.Property<string>("TaxOffice") b.Property<string>("TaxOffice")
.HasMaxLength(64) .HasMaxLength(64)
.HasColumnType("nvarchar(64)"); .HasColumnType("nvarchar(64)");
b.Property<string>("Township")
.HasMaxLength(128)
.HasColumnType("nvarchar(128)");
b.Property<long?>("VknTckn") b.Property<long?>("VknTckn")
.HasColumnType("bigint"); .HasColumnType("bigint");

16
api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251118201005_Initial.cs → api/src/Erp.Platform.EntityFrameworkCore/Migrations/20251120065949_Initial.cs
View file

@ -355,8 +355,8 @@ namespace Erp.Platform.Migrations
OrganizationName = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true), OrganizationName = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
PhoneNumber = table.Column<string>(type: "nvarchar(20)", maxLength: 20, nullable: true), PhoneNumber = table.Column<string>(type: "nvarchar(20)", maxLength: 20, nullable: true),
PostalCode = table.Column<string>(type: "nvarchar(10)", maxLength: 10, nullable: true), PostalCode = table.Column<string>(type: "nvarchar(10)", maxLength: 10, nullable: true),
Street = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
TaxOffice = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true), TaxOffice = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
Township = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
VknTckn = table.Column<long>(type: "bigint", nullable: true), VknTckn = table.Column<long>(type: "bigint", nullable: true),
Website = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: true), Website = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: true),
ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: false), ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: false),
@ -2098,7 +2098,7 @@ namespace Erp.Platform.Migrations
Country = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true), Country = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
City = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true), City = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
District = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true), District = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
Street = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: true), Township = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: true),
Address1 = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: true), Address1 = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: true),
Address2 = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: true), Address2 = table.Column<string>(type: "nvarchar(512)", maxLength: 512, nullable: true),
PostalCode = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: true), PostalCode = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: true),
@ -4041,8 +4041,6 @@ namespace Erp.Platform.Migrations
City = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: false), City = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: false),
Name = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false), Name = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: false),
Township = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true), Township = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
Street = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: true),
ZipCode = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: true),
CityId = table.Column<Guid>(type: "uniqueidentifier", nullable: true), CityId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false), CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true), CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
@ -4191,7 +4189,7 @@ namespace Erp.Platform.Migrations
Country = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false), Country = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
City = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false), City = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: false),
District = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true), District = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
Street = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true), Township = table.Column<string>(type: "nvarchar(128)", maxLength: 128, nullable: true),
Address1 = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: true), Address1 = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: true),
Address2 = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: true), Address2 = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: true),
PostalCode = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: true), PostalCode = table.Column<string>(type: "nvarchar(16)", maxLength: 16, nullable: true),
@ -4870,7 +4868,7 @@ namespace Erp.Platform.Migrations
Country = table.Column<string>(type: "nvarchar(max)", nullable: true), Country = table.Column<string>(type: "nvarchar(max)", nullable: true),
City = table.Column<string>(type: "nvarchar(max)", nullable: true), City = table.Column<string>(type: "nvarchar(max)", nullable: true),
District = table.Column<string>(type: "nvarchar(max)", nullable: true), District = table.Column<string>(type: "nvarchar(max)", nullable: true),
Street = table.Column<string>(type: "nvarchar(max)", nullable: true), Township = table.Column<string>(type: "nvarchar(max)", nullable: true),
PostalCode = table.Column<string>(type: "nvarchar(max)", nullable: true), PostalCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
MobileNumber = table.Column<string>(type: "nvarchar(20)", maxLength: 20, nullable: true), MobileNumber = table.Column<string>(type: "nvarchar(20)", maxLength: 20, nullable: true),
PhoneNumber = table.Column<string>(type: "nvarchar(20)", maxLength: 20, nullable: true), PhoneNumber = table.Column<string>(type: "nvarchar(20)", maxLength: 20, nullable: true),
@ -6570,11 +6568,11 @@ namespace Erp.Platform.Migrations
column: "CityId"); column: "CityId");
migrationBuilder.CreateIndex( migrationBuilder.CreateIndex(
name: "IX_Sas_H_District_Country_City_Name_Township_Street_ZipCode", name: "IX_Sas_H_District_Country_City_Name_Township",
table: "Sas_H_District", table: "Sas_H_District",
columns: new[] { "Country", "City", "Name", "Township", "Street", "ZipCode" }, columns: new[] { "Country", "City", "Name", "Township" },
unique: true, unique: true,
filter: "[Country] IS NOT NULL AND [Township] IS NOT NULL AND [Street] IS NOT NULL AND [ZipCode] IS NOT NULL"); filter: "[Country] IS NOT NULL AND [Township] IS NOT NULL");
migrationBuilder.CreateIndex( migrationBuilder.CreateIndex(
name: "IX_Sas_H_ForumCategory_DisplayOrder", name: "IX_Sas_H_ForumCategory_DisplayOrder",

42
api/src/Erp.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs
View file

@ -1596,10 +1596,6 @@ namespace Erp.Platform.Migrations
.HasMaxLength(16) .HasMaxLength(16)
.HasColumnType("nvarchar(16)"); .HasColumnType("nvarchar(16)");
b.Property<string>("Street")
.HasMaxLength(256)
.HasColumnType("nvarchar(256)");
b.Property<string>("TaxOffice") b.Property<string>("TaxOffice")
.HasMaxLength(128) .HasMaxLength(128)
.HasColumnType("nvarchar(128)"); .HasColumnType("nvarchar(128)");
@ -1607,6 +1603,10 @@ namespace Erp.Platform.Migrations
b.Property<Guid?>("TenantId") b.Property<Guid?>("TenantId")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
b.Property<string>("Township")
.HasMaxLength(256)
.HasColumnType("nvarchar(256)");
b.Property<long>("VknTckn") b.Property<long>("VknTckn")
.HasColumnType("bigint"); .HasColumnType("bigint");
@ -3712,25 +3712,17 @@ namespace Erp.Platform.Migrations
.HasMaxLength(128) .HasMaxLength(128)
.HasColumnType("nvarchar(128)"); .HasColumnType("nvarchar(128)");
b.Property<string>("Street")
.HasMaxLength(256)
.HasColumnType("nvarchar(256)");
b.Property<string>("Township") b.Property<string>("Township")
.HasMaxLength(128) .HasMaxLength(128)
.HasColumnType("nvarchar(128)"); .HasColumnType("nvarchar(128)");
b.Property<string>("ZipCode")
.HasMaxLength(16)
.HasColumnType("nvarchar(16)");
b.HasKey("Id"); b.HasKey("Id");
b.HasIndex("CityId"); b.HasIndex("CityId");
b.HasIndex("Country", "City", "Name", "Township", "Street", "ZipCode") b.HasIndex("Country", "City", "Name", "Township")
.IsUnique() .IsUnique()
.HasFilter("[Country] IS NOT NULL AND [Township] IS NOT NULL AND [Street] IS NOT NULL AND [ZipCode] IS NOT NULL"); .HasFilter("[Country] IS NOT NULL AND [Township] IS NOT NULL");
b.ToTable("Sas_H_District", (string)null); b.ToTable("Sas_H_District", (string)null);
}); });
@ -4070,9 +4062,6 @@ namespace Erp.Platform.Migrations
b.Property<string>("PostalCode") b.Property<string>("PostalCode")
.HasColumnType("nvarchar(max)"); .HasColumnType("nvarchar(max)");
b.Property<string>("Street")
.HasColumnType("nvarchar(max)");
b.Property<Guid?>("TenantId") b.Property<Guid?>("TenantId")
.HasColumnType("uniqueidentifier") .HasColumnType("uniqueidentifier")
.HasColumnName("TenantId"); .HasColumnName("TenantId");
@ -4080,6 +4069,9 @@ namespace Erp.Platform.Migrations
b.Property<DateTime?>("TerminationDate") b.Property<DateTime?>("TerminationDate")
.HasColumnType("datetime2"); .HasColumnType("datetime2");
b.Property<string>("Township")
.HasColumnType("nvarchar(max)");
b.Property<string>("WorkLocation") b.Property<string>("WorkLocation")
.HasMaxLength(150) .HasMaxLength(150)
.HasColumnType("nvarchar(150)"); .HasColumnType("nvarchar(150)");
@ -7187,10 +7179,6 @@ namespace Erp.Platform.Migrations
.HasMaxLength(10) .HasMaxLength(10)
.HasColumnType("nvarchar(10)"); .HasColumnType("nvarchar(10)");
b.Property<string>("Street")
.HasMaxLength(128)
.HasColumnType("nvarchar(128)");
b.Property<Guid?>("SupplierTypeId") b.Property<Guid?>("SupplierTypeId")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
@ -7218,6 +7206,10 @@ namespace Erp.Platform.Migrations
.HasColumnType("decimal(18,2)") .HasColumnType("decimal(18,2)")
.HasDefaultValue(0m); .HasDefaultValue(0m);
b.Property<string>("Township")
.HasMaxLength(128)
.HasColumnType("nvarchar(128)");
b.Property<DateTime?>("ValidFrom") b.Property<DateTime?>("ValidFrom")
.HasColumnType("datetime2"); .HasColumnType("datetime2");
@ -13582,14 +13574,14 @@ namespace Erp.Platform.Migrations
.HasMaxLength(10) .HasMaxLength(10)
.HasColumnType("nvarchar(10)"); .HasColumnType("nvarchar(10)");
b.Property<string>("Street")
.HasMaxLength(128)
.HasColumnType("nvarchar(128)");
b.Property<string>("TaxOffice") b.Property<string>("TaxOffice")
.HasMaxLength(64) .HasMaxLength(64)
.HasColumnType("nvarchar(64)"); .HasColumnType("nvarchar(64)");
b.Property<string>("Township")
.HasMaxLength(128)
.HasColumnType("nvarchar(128)");
b.Property<long?>("VknTckn") b.Property<long?>("VknTckn")
.HasColumnType("bigint"); .HasColumnType("bigint");

78
api/src/Erp.Platform.EntityFrameworkCore/Tenants/Seeds/TenantData.json
View file

@ -2856,7 +2856,7 @@
"country": "TR", "country": "TR",
"city": "TR.34", "city": "TR.34",
"district": "Ümraniye", "district": "Ümraniye",
"street": "Fatih sultan mehmet mah.", "township": "Esenşehir",
"postalCode": "34771", "postalCode": "34771",
"phoneNumber": "2125550100", "phoneNumber": "2125550100",
"mobileNumber": "5325550101", "mobileNumber": "5325550101",
@ -2896,7 +2896,7 @@
"country": "TR", "country": "TR",
"city": "TR.06", "city": "TR.06",
"district": "Güdül", "district": "Güdül",
"street": "Özköy mah.", "township": "Güdül",
"postalCode": "6840", "postalCode": "6840",
"phoneNumber": "2125550102", "phoneNumber": "2125550102",
"mobileNumber": "5325550103", "mobileNumber": "5325550103",
@ -2936,7 +2936,7 @@
"country": "TR", "country": "TR",
"city": "TR.11", "city": "TR.11",
"district": "Merkez", "district": "Merkez",
"street": "Kızıldamlar köyü", "township": "Merkezköyler",
"postalCode": "34000", "postalCode": "34000",
"phoneNumber": "2125550105", "phoneNumber": "2125550105",
"mobileNumber": "5325550106", "mobileNumber": "5325550106",
@ -2976,7 +2976,7 @@
"country": "TR", "country": "TR",
"city": "", "city": "",
"district": "", "district": "",
"street": "", "township": "",
"postalCode": "06100", "postalCode": "06100",
"phoneNumber": "3125550108", "phoneNumber": "3125550108",
"mobileNumber": "5425550109", "mobileNumber": "5425550109",
@ -3016,7 +3016,7 @@
"country": "TR", "country": "TR",
"city": "TR.34", "city": "TR.34",
"district": "Kadıköy", "district": "Kadıköy",
"street": "Bağdat Cad.", "township": "Bostancı",
"postalCode": "34728", "postalCode": "34728",
"phoneNumber": "2125550111", "phoneNumber": "2125550111",
"mobileNumber": "5325550112", "mobileNumber": "5325550112",
@ -3055,8 +3055,8 @@
"maritalStatus": "Single", "maritalStatus": "Single",
"country": "TR", "country": "TR",
"city": "TR.35", "city": "TR.35",
"district": "İzmir", "district": "Kemalpaşa",
"street": "Yıldız Mah.", "township": "Ören",
"postalCode": "35000", "postalCode": "35000",
"phoneNumber": "2165550114", "phoneNumber": "2165550114",
"mobileNumber": "5325550115", "mobileNumber": "5325550115",
@ -3095,8 +3095,8 @@
"maritalStatus": "Married", "maritalStatus": "Married",
"country": "TR", "country": "TR",
"city": "TR.06", "city": "TR.06",
"district": "Ankara", "district": "Altındağ",
"street": "Osmangazi Mah.", "township": "Telsizler",
"postalCode": "16000", "postalCode": "16000",
"phoneNumber": "2245550117", "phoneNumber": "2245550117",
"mobileNumber": "5325550118", "mobileNumber": "5325550118",
@ -3135,8 +3135,8 @@
"maritalStatus": "Married", "maritalStatus": "Married",
"country": "TR", "country": "TR",
"city": "TR.11", "city": "TR.11",
"district": "İzmir", "district": "Osmaneli",
"street": "Alsancak Mah. No:88", "township": "Merkezköyler",
"postalCode": "35220", "postalCode": "35220",
"phoneNumber": "2325550120", "phoneNumber": "2325550120",
"mobileNumber": "5325550121", "mobileNumber": "5325550121",
@ -3175,8 +3175,8 @@
"maritalStatus": "Single", "maritalStatus": "Single",
"country": "TR", "country": "TR",
"city": "TR.45", "city": "TR.45",
"district": "Ankara", "district": "Demirci",
"street": "Bahçelievler Mah. No:55", "township": "Durhasan",
"postalCode": "06490", "postalCode": "06490",
"phoneNumber": "3125550123", "phoneNumber": "3125550123",
"mobileNumber": "5325550124", "mobileNumber": "5325550124",
@ -3215,8 +3215,8 @@
"maritalStatus": "Married", "maritalStatus": "Married",
"country": "TR", "country": "TR",
"city": "TR.34", "city": "TR.34",
"district": "İstanbul", "district": "Beykoz",
"street": "Şişli Mah. No:101", "township": "Polonezköy",
"postalCode": "34360", "postalCode": "34360",
"phoneNumber": "2125550126", "phoneNumber": "2125550126",
"mobileNumber": "5325550127", "mobileNumber": "5325550127",
@ -4495,10 +4495,10 @@
"SectorName": "Ambalaj", "SectorName": "Ambalaj",
"TaxNumber": 1234567890, "TaxNumber": 1234567890,
"TaxOffice": "İstanbul Vergi Dairesi", "TaxOffice": "İstanbul Vergi Dairesi",
"Country": "Türkiye", "Country": "TR",
"City": "İstanbul", "City": "TR.34",
"District": "İstanbul", "District": "Beykoz",
"Street": "Atatürk Cad. No:10", "Township": "Çubuklu",
"Address1": null, "Address1": null,
"Address2": null, "Address2": null,
"PostalCode": "34000", "PostalCode": "34000",
@ -4533,10 +4533,10 @@
"SectorName": "Cam, Çimento ve Toprak", "SectorName": "Cam, Çimento ve Toprak",
"TaxNumber": 987654321, "TaxNumber": 987654321,
"TaxOffice": null, "TaxOffice": null,
"Country": "Türkiye", "Country": "TR",
"City": "İstanbul", "City": "TR.34",
"District": "İstanbul", "District": "Çekmeköy",
"Street": "Barbaros Bulv. No:20", "Township": "Taşdelen",
"Address1": null, "Address1": null,
"Address2": null, "Address2": null,
"PostalCode": "34746", "PostalCode": "34746",
@ -4571,10 +4571,10 @@
"SectorName": "Bilişim Teknolojileri", "SectorName": "Bilişim Teknolojileri",
"TaxNumber": 1122334455, "TaxNumber": 1122334455,
"TaxOffice": null, "TaxOffice": null,
"Country": "Türkiye", "Country": "TR",
"City": "İzmir", "City": "TR.34",
"District": "İzmir", "District": "Eyüp",
"Street": "Atatürk Cad. No:5", "Township": "Rami",
"Address1": null, "Address1": null,
"Address2": null, "Address2": null,
"PostalCode": "35210", "PostalCode": "35210",
@ -4609,10 +4609,10 @@
"SectorName": "Ambalaj", "SectorName": "Ambalaj",
"TaxNumber": 6677889900, "TaxNumber": 6677889900,
"TaxOffice": null, "TaxOffice": null,
"Country": "Türkiye", "Country": "TR",
"City": "Ankara", "City": "TR.06",
"District": "Ankara", "District": "Kızılcahamam",
"Street": "Kızılay Meydanı No:15", "Township": "Kızılcahamam",
"Address1": null, "Address1": null,
"Address2": null, "Address2": null,
"PostalCode": "06690", "PostalCode": "06690",
@ -4647,10 +4647,10 @@
"SectorName": "Bilişim Teknolojileri", "SectorName": "Bilişim Teknolojileri",
"TaxNumber": 987654321, "TaxNumber": 987654321,
"TaxOffice": null, "TaxOffice": null,
"Country": "Türkiye", "Country": "TR",
"City": "Ankara", "City": "TR.06",
"District": "Ankara", "District": "Yenimahalle",
"Street": "Sanayi Sitesi 5. Cadde No:25", "Township": "Ostim",
"Address1": null, "Address1": null,
"Address2": null, "Address2": null,
"PostalCode": "06000", "PostalCode": "06000",
@ -4685,10 +4685,10 @@
"SectorName": "Bilişim Teknolojileri", "SectorName": "Bilişim Teknolojileri",
"TaxNumber": 1234567890, "TaxNumber": 1234567890,
"TaxOffice": null, "TaxOffice": null,
"Country": "Türkiye", "Country": "TR",
"City": "İstanbul", "City": "TR.34",
"District": "İstanbul", "District": "Beyoğlu",
"Street": "Teknoloji Caddesi No:100", "Township": "Cihangir",
"Address1": null, "Address1": null,
"Address2": null, "Address2": null,
"PostalCode": "34000", "PostalCode": "34000",

4
api/src/Erp.Platform.EntityFrameworkCore/Tenants/TenantDataSeeder.cs
View file

@ -1049,7 +1049,7 @@ public class TenantDataSeeder : IDataSeedContributor, ITransientDependency
Country = item.Country, Country = item.Country,
City = item.City, City = item.City,
District = item.District, District = item.District,
Street = item.Street, Township = item.Township,
PostalCode = item.PostalCode, PostalCode = item.PostalCode,
MobileNumber = item.MobileNumber, MobileNumber = item.MobileNumber,
PhoneNumber = item.PhoneNumber, PhoneNumber = item.PhoneNumber,
@ -1845,7 +1845,7 @@ public class TenantDataSeeder : IDataSeedContributor, ITransientDependency
Country = item.Country, Country = item.Country,
City = item.City, City = item.City,
District = item.District, District = item.District,
Street = item.Street, Township = item.Township,
Address1 = item.Address1, Address1 = item.Address1,
Address2 = item.Address2, Address2 = item.Address2,
PostalCode = item.PostalCode, PostalCode = item.PostalCode,

4
api/src/Erp.Platform.EntityFrameworkCore/Tenants/TenantSeederDto.cs
View file

@ -174,7 +174,7 @@ public class PartnerSeedDto
public string Country { get; set; } public string Country { get; set; }
public string City { get; set; } public string City { get; set; }
public string District { get; set; } public string District { get; set; }
public string Street { get; set; } public string Township { get; set; }
public string Address1 { get; set; } public string Address1 { get; set; }
public string Address2 { get; set; } public string Address2 { get; set; }
public string PostalCode { get; set; } public string PostalCode { get; set; }
@ -536,7 +536,7 @@ public class EmployeeSeedDto
public string Country { get; set; } public string Country { get; set; }
public string City { get; set; } public string City { get; set; }
public string District { get; set; } public string District { get; set; }
public string Street { get; set; } public string Township { get; set; }
public string PostalCode { get; set; } public string PostalCode { get; set; }
public string MobileNumber { get; set; } public string MobileNumber { get; set; }
public string PhoneNumber { get; set; } public string PhoneNumber { get; set; }

10
ui/src/mocks/mockSalesOrders.ts
View file

@ -72,7 +72,6 @@ export const mockSalesOrders: CrmSalesOrder[] = [
}, },
], ],
deliveries: [], deliveries: [],
invoices: [],
creationTime: new Date("2024-08-15"), creationTime: new Date("2024-08-15"),
lastModificationTime: new Date("2024-08-16"), lastModificationTime: new Date("2024-08-16"),
}, },
@ -140,7 +139,6 @@ export const mockSalesOrders: CrmSalesOrder[] = [
}, },
], ],
deliveries: [], deliveries: [],
invoices: [],
creationTime: new Date("2024-08-20"), creationTime: new Date("2024-08-20"),
lastModificationTime: new Date("2024-08-21"), lastModificationTime: new Date("2024-08-21"),
}, },
@ -208,7 +206,6 @@ export const mockSalesOrders: CrmSalesOrder[] = [
}, },
], ],
deliveries: [], deliveries: [],
invoices: [],
creationTime: new Date("2024-08-25"), creationTime: new Date("2024-08-25"),
lastModificationTime: new Date("2024-08-26"), lastModificationTime: new Date("2024-08-26"),
}, },
@ -276,7 +273,6 @@ export const mockSalesOrders: CrmSalesOrder[] = [
}, },
], ],
deliveries: [], deliveries: [],
invoices: [],
creationTime: new Date("2024-09-01"), creationTime: new Date("2024-09-01"),
lastModificationTime: new Date("2024-09-02"), lastModificationTime: new Date("2024-09-02"),
}, },
@ -344,7 +340,6 @@ export const mockSalesOrders: CrmSalesOrder[] = [
}, },
], ],
deliveries: [], deliveries: [],
invoices: [],
creationTime: new Date("2024-09-05"), creationTime: new Date("2024-09-05"),
lastModificationTime: new Date("2024-09-06"), lastModificationTime: new Date("2024-09-06"),
}, },
@ -396,7 +391,6 @@ export const mockSalesOrders: CrmSalesOrder[] = [
}, },
], ],
deliveries: [], deliveries: [],
invoices: [],
creationTime: new Date("2024-09-10"), creationTime: new Date("2024-09-10"),
lastModificationTime: new Date("2024-09-10"), lastModificationTime: new Date("2024-09-10"),
}, },
@ -448,7 +442,6 @@ export const mockSalesOrders: CrmSalesOrder[] = [
}, },
], ],
deliveries: [], deliveries: [],
invoices: [],
creationTime: new Date("2024-08-10"), creationTime: new Date("2024-08-10"),
lastModificationTime: new Date("2024-08-15"), lastModificationTime: new Date("2024-08-15"),
}, },
@ -516,7 +509,6 @@ export const mockSalesOrders: CrmSalesOrder[] = [
}, },
], ],
deliveries: [], deliveries: [],
invoices: [],
creationTime: new Date("2024-09-12"), creationTime: new Date("2024-09-12"),
lastModificationTime: new Date("2024-09-13"), lastModificationTime: new Date("2024-09-13"),
}, },
@ -584,7 +576,6 @@ export const mockSalesOrders: CrmSalesOrder[] = [
}, },
], ],
deliveries: [], deliveries: [],
invoices: [],
creationTime: new Date("2024-09-15"), creationTime: new Date("2024-09-15"),
lastModificationTime: new Date("2024-09-16"), lastModificationTime: new Date("2024-09-16"),
}, },
@ -668,7 +659,6 @@ export const mockSalesOrders: CrmSalesOrder[] = [
}, },
], ],
deliveries: [], deliveries: [],
invoices: [],
creationTime: new Date("2024-09-18"), creationTime: new Date("2024-09-18"),
lastModificationTime: new Date("2024-09-19"), lastModificationTime: new Date("2024-09-19"),
}, },

8
ui/src/types/common.ts
View file

@ -148,11 +148,11 @@ export interface Contact {
export interface Address { export interface Address {
// Adres // Adres
street: string
city: string
state: string
postalCode: string
country: string country: string
state: string
city: string
street: string
postalCode: string
} }
// Bank Management Types // Bank Management Types