diff --git a/api/src/Erp.Platform.DbMigrator/Seeds/LanguagesData.json b/api/src/Erp.Platform.DbMigrator/Seeds/LanguagesData.json index 889d212d..23d19007 100644 --- a/api/src/Erp.Platform.DbMigrator/Seeds/LanguagesData.json +++ b/api/src/Erp.Platform.DbMigrator/Seeds/LanguagesData.json @@ -9235,6 +9235,24 @@ "tr": "Satın Alma Talepleri", "en": "Purchase Requests" }, + { + "resourceName": "Platform", + "key": "App.SupplyChain.PartnerBank", + "tr": "Bankalar", + "en": "Partner Banks" + }, + { + "resourceName": "Platform", + "key": "App.SupplyChain.PartnerCertificate", + "tr": "Sertifikalar", + "en": "Partner Certificates" + }, + { + "resourceName": "Platform", + "key": "App.SupplyChain.PartnerContact", + "tr": "Kişiler", + "en": "Partner Contacts" + }, { "resourceName": "Platform", "key": "App.SupplyChain.Quotation", diff --git a/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_SupplyChain.cs b/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_SupplyChain.cs index afd6eabc..500b571f 100644 --- a/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_SupplyChain.cs +++ b/api/src/Erp.Platform.DbMigrator/Seeds/ListFormSeeder_SupplyChain.cs @@ -1070,12 +1070,12 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend DeleteCommand = DefaultDeleteCommand(nameof(TableNameEnum.Partner)), DeleteFieldsDefaultValueJson = DefaultDeleteFieldsDefaultValueJson, PagerOptionJson = DefaultPagerOptionJson, - EditingOptionJson = DefaultEditingOptionJson(AppCodes.SupplyChain.Supply, 900, 800, true, true, true, true, false), + EditingOptionJson = DefaultEditingOptionJson(AppCodes.SupplyChain.Supply, 1000, 700, true, true, true, true, false), EditingFormJson = JsonSerializer.Serialize(new List() { new() { - Order = 1, Caption = "General", ColCount = 2, ColSpan = 2, ItemType = "group", Items = + Order = 1, Caption = "General", ColCount = 3, ColSpan = 2, ItemType = "group", Items = [ new EditingFormItemDto { Order = 1, DataField = "Code", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 2, DataField = "Name", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, @@ -1090,7 +1090,7 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend }, new() { - Order = 2, Caption = "Address", ColCount = 2, ColSpan = 2, ItemType = "group", Items = + Order = 2, Caption = "Address", ColCount = 3, ColSpan = 2, ItemType = "group", Items = [ new EditingFormItemDto { Order = 10, DataField = "Country", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, new EditingFormItemDto { Order = 11, DataField = "City", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, @@ -1099,16 +1099,16 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend 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 = 16, DataField = "PostalCode", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 17, DataField = "PhoneNumber", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 18, DataField = "MobileNumber", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 19, DataField = "FaxNumber", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 17, DataField = "PhoneNumber", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox, EditorOptions = EditorOptionValues.PhoneEditorOptions }, + new EditingFormItemDto { Order = 18, DataField = "MobileNumber", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox, EditorOptions = EditorOptionValues.PhoneEditorOptions }, + new EditingFormItemDto { Order = 19, DataField = "FaxNumber", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox, EditorOptions = EditorOptionValues.PhoneEditorOptions }, new EditingFormItemDto { Order = 20, DataField = "Email", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 21, DataField = "Website", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, ] }, new() { - Order = 3, Caption="Supply Card", ColCount = 2, ColSpan = 2, ItemType = "group", Items = + Order = 3, Caption="Supply Card", ColCount = 3, ColSpan = 2, ItemType = "group", Items = [ new EditingFormItemDto { Order = 22, DataField = "SupplierTypeId", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, new EditingFormItemDto { Order = 23, DataField = "SupplyCardTypeId", ColSpan = 1, EditorType2 = EditorTypes.dxSelectBox }, @@ -1128,7 +1128,7 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend new() { FieldName = "CreditLimit", FieldDbType = DbType.Decimal, Value = "0", CustomValueType = FieldCustomValueTypeEnum.Value }, new() { FieldName = "CurrentBalance", FieldDbType = DbType.Decimal, Value = "0", CustomValueType = FieldCustomValueTypeEnum.Value }, new() { FieldName = "DiscountRate", FieldDbType = DbType.Decimal, Value = "0", CustomValueType = FieldCustomValueTypeEnum.Value }, - new() { FieldName = "Status", FieldDbType = DbType.String, Value = "Aktif", CustomValueType = FieldCustomValueTypeEnum.Value }, + new() { FieldName = "Status", FieldDbType = DbType.String, Value = "Active", CustomValueType = FieldCustomValueTypeEnum.Value }, new() { FieldName = "Country", FieldDbType = DbType.String, Value = "TR", CustomValueType = FieldCustomValueTypeEnum.Value }, }), CommandColumnJson = JsonSerializer.Serialize(new CommandColumnDto[] { @@ -1230,7 +1230,7 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "SectorId", - Width = 100, + Width = 200, ListOrderNo = 5, Visible = true, IsActive = true, @@ -1476,7 +1476,8 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend AllowSearch = true, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AppCodes.SupplyChain.Supply), - PivotSettingsJson = DefaultPivotSettingsJson + PivotSettingsJson = DefaultPivotSettingsJson, + EditorOptions = EditorOptionValues.PhoneEditorOptions }, new() { ListFormCode = listForm.ListFormCode, @@ -1491,7 +1492,8 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend AllowSearch = true, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AppCodes.SupplyChain.Supply), - PivotSettingsJson = DefaultPivotSettingsJson + PivotSettingsJson = DefaultPivotSettingsJson, + EditorOptions = EditorOptionValues.PhoneEditorOptions }, new() { ListFormCode = listForm.ListFormCode, @@ -1513,13 +1515,13 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend CultureName = LanguageCodes.En, SourceDbType = DbType.String, FieldName = "Email", - Width = 100, + Width = 150, ListOrderNo = 21, Visible = true, IsActive = true, IsDeleted = false, AllowSearch = true, - ValidationRuleJson = DefaultValidationRuleEmailJson, + ValidationRuleJson = DefaultValidationRuleEmailRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AppCodes.SupplyChain.Supply), PivotSettingsJson = DefaultPivotSettingsJson @@ -1777,13 +1779,12 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend DeleteCommand = DefaultDeleteCommand(nameof(TableNameEnum.PartnerBank)), DeleteFieldsDefaultValueJson = DefaultDeleteFieldsDefaultValueJson, PagerOptionJson = DefaultPagerOptionJson, - EditingOptionJson = DefaultEditingOptionJson(AppCodes.SupplyChain.PartnerBank, 500, 300, true, true, true, true, false), + EditingOptionJson = DefaultEditingOptionJson(AppCodes.SupplyChain.PartnerBank, 500, 500, true, true, true, true, false), InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson, EditingFormJson = JsonSerializer.Serialize(new List() { new() { Order=1, ColCount=1, ColSpan=1, ItemType="group", Items =[ - new EditingFormItemDto { Order = 0, DataField="PartnerId", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, new EditingFormItemDto { Order = 1, DataField="BankName", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 2, DataField="AccountNumber", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 3, DataField="Iban", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, @@ -1797,12 +1798,13 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend new EditingFormItemDto { Order = 11, DataField="DailyTransferLimit", ColSpan = 1, EditorType2 = EditorTypes.dxNumberBox }, new EditingFormItemDto { Order = 12, DataField="IsDefault", ColSpan = 1, EditorType2 = EditorTypes.dxCheckBox }, new EditingFormItemDto { Order = 13, DataField="IsActive", ColSpan = 1, EditorType2 = EditorTypes.dxCheckBox }, + new EditingFormItemDto { Order = 14, DataField="PartnerId", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, ]} }), FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { - new() { FieldName = "Balance", FieldDbType = DbType.Boolean, Value = "0", CustomValueType = FieldCustomValueTypeEnum.Value }, - new() { FieldName = "OverdraftLimit", FieldDbType = DbType.Boolean, Value = "0", CustomValueType = FieldCustomValueTypeEnum.Value }, - new() { FieldName = "DailyTransferLimit", FieldDbType = DbType.Boolean, Value = "0", CustomValueType = FieldCustomValueTypeEnum.Value }, + new() { FieldName = "Balance", FieldDbType = DbType.Decimal, Value = "0", CustomValueType = FieldCustomValueTypeEnum.Value }, + new() { FieldName = "OverdraftLimit", FieldDbType = DbType.Decimal, Value = "0", CustomValueType = FieldCustomValueTypeEnum.Value }, + new() { FieldName = "DailyTransferLimit", FieldDbType = DbType.Decimal, Value = "0", CustomValueType = FieldCustomValueTypeEnum.Value }, new() { FieldName = "IsDefault", FieldDbType = DbType.Boolean, Value = "false", CustomValueType = FieldCustomValueTypeEnum.Value }, new() { FieldName = "IsActive", FieldDbType = DbType.Boolean, Value = "true", CustomValueType = FieldCustomValueTypeEnum.Value } }), @@ -2040,6 +2042,22 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend PermissionJson = DefaultFieldPermissionJson(AppCodes.SupplyChain.PartnerBank), PivotSettingsJson = DefaultPivotSettingsJson }, + new() { + ListFormCode = listForm.ListFormCode, + CultureName = LanguageCodes.En, + SourceDbType = DbType.Guid, + FieldName = "PartnerId", + Width = 100, + ListOrderNo = 15, + Visible = true, + IsActive = true, + IsDeleted = false, + AllowSearch = true, + LookupJson = LookupQueryValues.DefaultLookupQueryJson(nameof(TableNameEnum.Partner), "Id", "Name"), + ColumnCustomizationJson = DefaultColumnCustomizationJson, + PermissionJson = DefaultFieldPermissionJson(AppCodes.SupplyChain.PartnerBank), + PivotSettingsJson = DefaultPivotSettingsJson + }, ]); #endregion } @@ -2079,17 +2097,17 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend DeleteCommand = DefaultDeleteCommand(nameof(TableNameEnum.PartnerCertificate)), DeleteFieldsDefaultValueJson = DefaultDeleteFieldsDefaultValueJson, PagerOptionJson = DefaultPagerOptionJson, - EditingOptionJson = DefaultEditingOptionJson(AppCodes.SupplyChain.PartnerCertificate, 500, 300, true, true, true, true, false), + EditingOptionJson = DefaultEditingOptionJson(AppCodes.SupplyChain.PartnerCertificate, 500, 400, true, true, true, true, false), InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson, EditingFormJson = JsonSerializer.Serialize(new List() { new() { Order=1, ColCount=1, ColSpan=1, ItemType="group", Items =[ - new EditingFormItemDto { Order = 0, DataField="PartnerId", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, new EditingFormItemDto { Order = 1, DataField="Certificate", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 2, DataField="Issuer", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextArea }, + new EditingFormItemDto { Order = 2, DataField="Issuer", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 3, DataField="IssueDate", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxDateBox }, new EditingFormItemDto { Order = 4, DataField="ExpiryDate", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxDateBox }, + new EditingFormItemDto { Order = 5, DataField="PartnerId", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, ]} }), } @@ -2177,6 +2195,22 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend PermissionJson = DefaultFieldPermissionJson(AppCodes.SupplyChain.PartnerCertificate), PivotSettingsJson = DefaultPivotSettingsJson }, + new() { + ListFormCode = listForm.ListFormCode, + CultureName = LanguageCodes.En, + SourceDbType = DbType.Guid, + FieldName = "PartnerId", + Width = 100, + ListOrderNo = 6, + Visible = true, + IsActive = true, + IsDeleted = false, + AllowSearch = true, + LookupJson = LookupQueryValues.DefaultLookupQueryJson(nameof(TableNameEnum.Partner), "Id", "Name"), + ColumnCustomizationJson = DefaultColumnCustomizationJson, + PermissionJson = DefaultFieldPermissionJson(AppCodes.SupplyChain.PartnerBank), + PivotSettingsJson = DefaultPivotSettingsJson + }, ]); #endregion } @@ -2216,23 +2250,27 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend DeleteCommand = DefaultDeleteCommand(nameof(TableNameEnum.PartnerContact)), DeleteFieldsDefaultValueJson = DefaultDeleteFieldsDefaultValueJson, PagerOptionJson = DefaultPagerOptionJson, - EditingOptionJson = DefaultEditingOptionJson(AppCodes.SupplyChain.PartnerContact, 500, 300, true, true, true, true, false), + EditingOptionJson = DefaultEditingOptionJson(AppCodes.SupplyChain.PartnerContact, 500, 400, true, true, true, true, false), InsertFieldsDefaultValueJson = DefaultInsertFieldsDefaultValueJson, EditingFormJson = JsonSerializer.Serialize(new List() { new() { Order=1, ColCount=1, ColSpan=1, ItemType="group", Items =[ - new EditingFormItemDto { Order = 0, DataField="PartnerId", 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="Title", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 3, DataField="Department", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, new EditingFormItemDto { Order = 4, DataField="Email", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 5, DataField="PhoneNumber", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox }, - new EditingFormItemDto { Order = 6, DataField="MobileNumber", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox }, + new EditingFormItemDto { Order = 5, DataField="PhoneNumber", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxTextBox, EditorOptions = EditorOptionValues.PhoneEditorOptions }, + new EditingFormItemDto { Order = 6, DataField="MobileNumber", ColSpan = 1, EditorType2 = EditorTypes.dxTextBox, EditorOptions = EditorOptionValues.PhoneEditorOptions }, new EditingFormItemDto { Order = 7, DataField="IsPrimary", ColSpan = 1, EditorType2 = EditorTypes.dxCheckBox }, new EditingFormItemDto { Order = 8, DataField="IsActive", ColSpan = 1, EditorType2 = EditorTypes.dxCheckBox }, + new EditingFormItemDto { Order = 9, DataField="PartnerId", ColSpan = 1, IsRequired = true, EditorType2 = EditorTypes.dxSelectBox }, ]} }), + FormFieldsDefaultValueJson = JsonSerializer.Serialize(new FieldsDefaultValue[] { + new() { FieldName = "IsPrimary", FieldDbType = DbType.Boolean, Value = "false", CustomValueType = FieldCustomValueTypeEnum.Value }, + new() { FieldName = "IsActive", FieldDbType = DbType.Boolean, Value = "true", CustomValueType = FieldCustomValueTypeEnum.Value } + }), } ); @@ -2312,7 +2350,7 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend IsActive = true, IsDeleted = false, AllowSearch = true, - ValidationRuleJson = DefaultValidationRuleRequiredJson, + ValidationRuleJson = DefaultValidationRuleEmailRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AppCodes.SupplyChain.PartnerContact), PivotSettingsJson = DefaultPivotSettingsJson @@ -2331,7 +2369,8 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AppCodes.SupplyChain.PartnerContact), - PivotSettingsJson = DefaultPivotSettingsJson + PivotSettingsJson = DefaultPivotSettingsJson, + EditorOptions = EditorOptionValues.PhoneEditorOptions }, new() { ListFormCode = listForm.ListFormCode, @@ -2344,10 +2383,10 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend IsActive = true, IsDeleted = false, AllowSearch = true, - ValidationRuleJson = DefaultValidationRuleRequiredJson, ColumnCustomizationJson = DefaultColumnCustomizationJson, PermissionJson = DefaultFieldPermissionJson(AppCodes.SupplyChain.PartnerContact), - PivotSettingsJson = DefaultPivotSettingsJson + PivotSettingsJson = DefaultPivotSettingsJson, + EditorOptions = EditorOptionValues.PhoneEditorOptions }, new() { ListFormCode = listForm.ListFormCode, @@ -2379,6 +2418,22 @@ public class ListFormSeeder_SupplyChain : IDataSeedContributor, ITransientDepend PermissionJson = DefaultFieldPermissionJson(AppCodes.SupplyChain.PartnerContact), PivotSettingsJson = DefaultPivotSettingsJson }, + new() { + ListFormCode = listForm.ListFormCode, + CultureName = LanguageCodes.En, + SourceDbType = DbType.Guid, + FieldName = "PartnerId", + Width = 100, + ListOrderNo = 8, + Visible = true, + IsActive = true, + IsDeleted = false, + AllowSearch = true, + LookupJson = LookupQueryValues.DefaultLookupQueryJson(nameof(TableNameEnum.Partner), "Id", "Name"), + ColumnCustomizationJson = DefaultColumnCustomizationJson, + PermissionJson = DefaultFieldPermissionJson(AppCodes.SupplyChain.PartnerBank), + PivotSettingsJson = DefaultPivotSettingsJson + }, ]); #endregion } diff --git a/ui/src/index.css b/ui/src/index.css index 5bfccd88..229e86b2 100644 --- a/ui/src/index.css +++ b/ui/src/index.css @@ -4,6 +4,10 @@ body { font-size: 14px; /* body’ye font-size uygulanmaz */ } +.dx-form-group-with-caption > .dx-form-group-content { + padding-top: 2px !important; +} + /* Popup formun içerisindeki Tabbed Item Title */ .dx-tab-text-span-pseudo { display: none !important;