diff --git a/ElectronicsShop/ElectronicsShopBusinessLogic/BusinessLogic/ReportClientLogic.cs b/ElectronicsShop/ElectronicsShopBusinessLogic/BusinessLogic/ReportClientLogic.cs
index 98c2f95..b2ea3d3 100644
--- a/ElectronicsShop/ElectronicsShopBusinessLogic/BusinessLogic/ReportClientLogic.cs
+++ b/ElectronicsShop/ElectronicsShopBusinessLogic/BusinessLogic/ReportClientLogic.cs
@@ -29,7 +29,7 @@ namespace ElectronicsShopBusinessLogic.BusinessLogic
var record = new ReportPaymeantsViewModel
{
PaymeantID=paymeant.ID,
- //ProductID=paymeant.ProductID,
+ ClientID=paymeant.ClientID,
OrderID=paymeant.OrderID,
PayOption=paymeant.PayOption,
SumPayment=paymeant.SumPayment,
diff --git a/ElectronicsShop/ElectronicsShopContracts/ViewModels/ReportPaymeantsViewModel.cs b/ElectronicsShop/ElectronicsShopContracts/ViewModels/ReportPaymeantsViewModel.cs
index 0c8a943..c60a12c 100644
--- a/ElectronicsShop/ElectronicsShopContracts/ViewModels/ReportPaymeantsViewModel.cs
+++ b/ElectronicsShop/ElectronicsShopContracts/ViewModels/ReportPaymeantsViewModel.cs
@@ -11,7 +11,7 @@ namespace ElectronicsShopContracts.ViewModels
{
public int PaymeantID { get; set; }
- public int ProductID { get; set; }
+ public int ClientID { get; set; }
public int OrderID { get; set; }
public double SumPayment { get; set; }
diff --git a/ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/20240601012156_InitMigration.Designer.cs b/ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/20240601013228_Init.Designer.cs
similarity index 99%
rename from ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/20240601012156_InitMigration.Designer.cs
rename to ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/20240601013228_Init.Designer.cs
index 31a2e6b..68decab 100644
--- a/ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/20240601012156_InitMigration.Designer.cs
+++ b/ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/20240601013228_Init.Designer.cs
@@ -12,8 +12,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace ElectronicsShopDataBaseImplement.Migrations
{
[DbContext(typeof(Database))]
- [Migration("20240601012156_InitMigration")]
- partial class InitMigration
+ [Migration("20240601013228_Init")]
+ partial class Init
{
///
protected override void BuildTargetModel(ModelBuilder modelBuilder)
diff --git a/ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/20240601012156_InitMigration.cs b/ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/20240601013228_Init.cs
similarity index 99%
rename from ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/20240601012156_InitMigration.cs
rename to ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/20240601013228_Init.cs
index 780ffb3..e2457fc 100644
--- a/ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/20240601012156_InitMigration.cs
+++ b/ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/20240601013228_Init.cs
@@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
namespace ElectronicsShopDataBaseImplement.Migrations
{
///
- public partial class InitMigration : Migration
+ public partial class Init : Migration
{
///
protected override void Up(MigrationBuilder migrationBuilder)
diff --git a/ElectronicsShop/ElectronicsShopRestAPI/Controllers/ClientController.cs b/ElectronicsShop/ElectronicsShopRestAPI/Controllers/ClientController.cs
index b78a2a2..9a75de5 100644
--- a/ElectronicsShop/ElectronicsShopRestAPI/Controllers/ClientController.cs
+++ b/ElectronicsShop/ElectronicsShopRestAPI/Controllers/ClientController.cs
@@ -66,5 +66,15 @@ namespace ElectronicsShopRestAPI.Controllers {
_logger.LogError(ex, "Ошибка создания оплаты");
}
}
+ [HttpGet]
+ public List? GetPaymeants(int _clientID) {
+ try {
+ return _payLogic?.ReadList(new PaymeantSearchModel { ClientID = _clientID });
+ }
+ catch (Exception ex) {
+ _logger.LogError(ex, $"Ошибка получения списка оплат клиента id = {_clientID}");
+ throw;
+ }
+ }
}
}
diff --git a/ElectronicsShop/ElectronicsShopShopClientApp/Controllers/HomeController.cs b/ElectronicsShop/ElectronicsShopShopClientApp/Controllers/HomeController.cs
index d3529fd..befbfdc 100644
--- a/ElectronicsShop/ElectronicsShopShopClientApp/Controllers/HomeController.cs
+++ b/ElectronicsShop/ElectronicsShopShopClientApp/Controllers/HomeController.cs
@@ -30,9 +30,7 @@ namespace ElectronicsShopUserApp.Controllers {
if (APIClient.Client == null) {
return Redirect("~/Home/Enter");
}
-
- var view = APIClient.GetRequset>($"api/main/getpaymeants?_clientid={APIClient.Client.ID}");
- return View(view);
+ return View(APIClient.GetRequset>($"api/client/getpaymeants?_clientid={APIClient.Client.ID}"));
}
[HttpGet]