From b9ff14757b15cf1a63c5c15d642839adfe8947f3 Mon Sep 17 00:00:00 2001 From: SamSys Date: Thu, 25 Sep 2025 12:26:38 +0330 Subject: [PATCH 1/7] new tab permission code --- .../Areas/Admin/Pages/Accounts/Account/CreateRole.cshtml | 9 ++++++--- .../Areas/Admin/Pages/Accounts/Account/EditRole.cshtml | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ServiceHost/Areas/Admin/Pages/Accounts/Account/CreateRole.cshtml b/ServiceHost/Areas/Admin/Pages/Accounts/Account/CreateRole.cshtml index 30a37640..fca01fe8 100644 --- a/ServiceHost/Areas/Admin/Pages/Accounts/Account/CreateRole.cshtml +++ b/ServiceHost/Areas/Admin/Pages/Accounts/Account/CreateRole.cshtml @@ -230,9 +230,12 @@
-
- -
+
+ +
+
+ +
diff --git a/ServiceHost/Areas/Admin/Pages/Accounts/Account/EditRole.cshtml b/ServiceHost/Areas/Admin/Pages/Accounts/Account/EditRole.cshtml index 6f17ca6b..025f5756 100644 --- a/ServiceHost/Areas/Admin/Pages/Accounts/Account/EditRole.cshtml +++ b/ServiceHost/Areas/Admin/Pages/Accounts/Account/EditRole.cshtml @@ -230,9 +230,12 @@
-
- -
+
+ +
+
+ +
From b8b8d9c3c40368863f674ecd316fb1917cd946b5 Mon Sep 17 00:00:00 2001 From: mahan Date: Thu, 25 Sep 2025 12:47:04 +0330 Subject: [PATCH 2/7] set account permission in EditWorkshop --- .../Admin/Pages/Company/Workshops/EditWorkshop.cshtml | 10 +++++++++- .../Pages/Company/Workshops/EditWorkshop.cshtml.cs | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ServiceHost/Areas/Admin/Pages/Company/Workshops/EditWorkshop.cshtml b/ServiceHost/Areas/Admin/Pages/Company/Workshops/EditWorkshop.cshtml index f76180ac..21ea2cfe 100644 --- a/ServiceHost/Areas/Admin/Pages/Company/Workshops/EditWorkshop.cshtml +++ b/ServiceHost/Areas/Admin/Pages/Company/Workshops/EditWorkshop.cshtml @@ -312,7 +312,15 @@
- + + +
- + +
From 85936cad63b99d5c251e33a9ca369e491a3540a2 Mon Sep 17 00:00:00 2001 From: SamSys Date: Mon, 29 Sep 2025 05:11:05 +0330 Subject: [PATCH 6/7] gozareshgir address and phone changed --- ServiceHost/Pages/contact-us/Index.cshtml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ServiceHost/Pages/contact-us/Index.cshtml b/ServiceHost/Pages/contact-us/Index.cshtml index e3469289..24c73869 100644 --- a/ServiceHost/Pages/contact-us/Index.cshtml +++ b/ServiceHost/Pages/contact-us/Index.cshtml @@ -196,13 +196,13 @@
نشانی گزارشگیر
-
منطقه آزاد انزلی، مجتمع ونوس طبقه اول، قرفه ۵۵۰
+
رشت - خیابان حاجی آباد - روبروی پارکینگ بزرگ حاجی آباد - ابتدای کوچه سپهدار - ساختمان دادماش - طبقه پنجم - واحد 17
شماره تماس
-
۰۱۳۳۲۳۲۸۸۸۶
-
۰۱۳۳۲۳۲۸۸۸۷
-
۰۱۳۳۳۲۴۴۹۲۶
-
۰۱۳۳۳۲۳۸۷۷۷
+
01333238777
+
01333328886
+
01333328887
+
From a6fdfd13f95ba0ed4b5a6e335181493b2f683085 Mon Sep 17 00:00:00 2001 From: mahan Date: Wed, 1 Oct 2025 12:20:09 +0330 Subject: [PATCH 7/7] add new get contractingParty --- .../ContractingPartyGetListViewModel.cs | 8 ++++++++ .../Repository/PersonalContractingPartyRepository.cs | 6 +++++- .../Areas/Admin/Controllers/ContractingPartyController.cs | 6 ------ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/CompanyManagment.App.Contracts/PersonalContractingParty/ContractingPartyGetListViewModel.cs b/CompanyManagment.App.Contracts/PersonalContractingParty/ContractingPartyGetListViewModel.cs index ab435f57..9fd90608 100644 --- a/CompanyManagment.App.Contracts/PersonalContractingParty/ContractingPartyGetListViewModel.cs +++ b/CompanyManagment.App.Contracts/PersonalContractingParty/ContractingPartyGetListViewModel.cs @@ -57,4 +57,12 @@ public class ContractingPartyGetListViewModel /// public ActivationStatus Status { get; set; } + + public string Address { get; set; } + public string PhoneNumber { get; set; } + public string NationalId { get; set; } + public string RepresentativeName { get; set; } + + + } \ No newline at end of file diff --git a/CompanyManagment.EFCore/Repository/PersonalContractingPartyRepository.cs b/CompanyManagment.EFCore/Repository/PersonalContractingPartyRepository.cs index a19767d7..2c478976 100644 --- a/CompanyManagment.EFCore/Repository/PersonalContractingPartyRepository.cs +++ b/CompanyManagment.EFCore/Repository/PersonalContractingPartyRepository.cs @@ -567,7 +567,11 @@ public class PersonalContractingPartyRepository : RepositoryBase i.IsActiveString == "true"), NationalIdOrNationalCode = x.contractingParty.IsLegal == "حقیقی" ? x.contractingParty.Nationalcode : x.contractingParty.NationalId, - Status = x.contractingParty.IsActiveString == "true" ? ActivationStatus.Active : ActivationStatus.DeActive + Status = x.contractingParty.IsActiveString == "true" ? ActivationStatus.Active : ActivationStatus.DeActive, + Address = x.contractingParty.Address, + NationalId = x.contractingParty.NationalId, + PhoneNumber = x.contractingParty.Phone, + RepresentativeName = x.contractingParty.RepresentativeFullName }).ToListAsync(); return result; } diff --git a/ServiceHost/Areas/Admin/Controllers/ContractingPartyController.cs b/ServiceHost/Areas/Admin/Controllers/ContractingPartyController.cs index 9eef011b..246b764e 100644 --- a/ServiceHost/Areas/Admin/Controllers/ContractingPartyController.cs +++ b/ServiceHost/Areas/Admin/Controllers/ContractingPartyController.cs @@ -29,12 +29,6 @@ public class ContractingPartyController : AdminBaseController Console.WriteLine(watch.Elapsed); return result.ToList(); } - [HttpGet("t/{name}")] - public async Task> TestApi(string name) - { - var res = _contractingPartyApplication.SearchByName(name).Where(x=>x.Contains(name)).ToList(); - return res; - } /// /// جزئیات طرف حساب حقیقی