Paymeant is done

ElectronicsShop/ElectronicsShopBusinessLogic/BusinessLogic/ReportClientLogic.cs

@@ -29,7 +29,7 @@ namespace ElectronicsShopBusinessLogic.BusinessLogic
                 var record = new ReportPaymeantsViewModel
                 {
                     PaymeantID=paymeant.ID,
-                    ProductID=paymeant.ProductID,
+                    //ProductID=paymeant.ProductID,
                     OrderID=paymeant.OrderID,
                     PayOption=paymeant.PayOption,
                     SumPayment=paymeant.SumPayment,

ElectronicsShop/ElectronicsShopContracts/BindingModels/PaymeantBindingModel.cs

@@ -17,5 +17,7 @@ namespace ElectronicsShopContracts.BindingModels
         public double SumPayment { get; set; }
 
         public PaymeantOption PayOption { get; set; } = PaymeantOption.Неоплачено;
+
+		public int ClientID { get; set; }
 	}
 }

ElectronicsShop/ElectronicsShopContracts/SearchModels/PaymeantSearchModel.cs

@@ -12,5 +12,6 @@ namespace ElectronicsShopContracts.SearchModels
         public int? ProductID { get; set; }
         public int? OrderID { get; set; }
         public double? SumPay { get; set; }
+        public int? ClientID { get; set; }
     }
 }

ElectronicsShop/ElectronicsShopContracts/ViewModels/PaymeantViewModel.cs

@@ -12,8 +12,6 @@ namespace ElectronicsShopContracts.ViewModels
 	public class PaymeantViewModel : IPaymentModel {
 		public int ID { get; set; }
 
-		public int ProductID { get; set; }
-
 		public int OrderID { get; set; }
 
 		[DisplayName("Cумма оплаты продукта")]
@@ -21,5 +19,8 @@ namespace ElectronicsShopContracts.ViewModels
 
         [DisplayName("Статус оплаты")]
         public PaymeantOption PayOption { get; set; } = PaymeantOption.Неоплачено;
-    }
+
+		[DisplayName("Клиент")]
+		public int ClientID { get; set; }
+	}
 }

ElectronicsShop/ElectronicsShopDataBaseImplement/Implements/PaymeantStorage.cs

@@ -48,6 +48,11 @@ namespace ElectronicsShopDataBaseImplement.Implements {
 				return new();
 			}
 			using var context = new Database();
+			if (model.ClientID.HasValue) {
+				return context.Paymeants
+					.Where(x => x.ClientID == model.ClientID)
+					.Select(x => x.GetViewModel).ToList();
+			}
 			return context.Paymeants
 				.Where(x => x.ID == model.ID)
 				.Select(x => x.GetViewModel).ToList();

ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/20240601012156_InitMigration.Designer.cs

@@ -12,7 +12,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 namespace ElectronicsShopDataBaseImplement.Migrations
 {
     [DbContext(typeof(Database))]
-    [Migration("20240601002930_InitMigration")]
+    [Migration("20240601012156_InitMigration")]
     partial class InitMigration
     {
         /// <inheritdoc />
@@ -191,6 +191,9 @@ namespace ElectronicsShopDataBaseImplement.Migrations
 
                     SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("ID"));
 
+                    b.Property<int>("ClientID")
+                        .HasColumnType("int");
+
                     b.Property<int>("OrderID")
                         .HasColumnType("int");
 

ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/20240601012156_InitMigration.cs

@@ -112,6 +112,7 @@ namespace ElectronicsShopDataBaseImplement.Migrations
                     ID = table.Column<int>(type: "int", nullable: false)
                         .Annotation("SqlServer:Identity", "1, 1"),
                     OrderID = table.Column<int>(type: "int", nullable: false),
+                    ClientID = table.Column<int>(type: "int", nullable: false),
                     SumPayment = table.Column<double>(type: "float", nullable: false),
                     PayOption = table.Column<int>(type: "int", nullable: false),
                     PaymentID = table.Column<int>(type: "int", nullable: true)

ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/DatabaseModelSnapshot.cs

@@ -188,6 +188,9 @@ namespace ElectronicsShopDataBaseImplement.Migrations
 
                     SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("ID"));
 
+                    b.Property<int>("ClientID")
+                        .HasColumnType("int");
+
                     b.Property<int>("OrderID")
                         .HasColumnType("int");
 

ElectronicsShop/ElectronicsShopDataBaseImplement/Models/Paymeant.cs

@@ -21,6 +21,9 @@ namespace ElectronicsShopDataBaseImplement.Models
         public int OrderID { get; set; }
 
         [Required]
+		public int ClientID { get; set; }
+
+		[Required]
         public double SumPayment { get; set; }
 
         [Required]
@@ -38,6 +41,7 @@ namespace ElectronicsShopDataBaseImplement.Models
                 OrderID = model.OrderID,
                 SumPayment = model.SumPayment,
                 PayOption = model.PayOption,
+                ClientID = model.ClientID,
             };
         }
         public void Update(PaymeantBindingModel? model)
@@ -57,7 +61,7 @@ namespace ElectronicsShopDataBaseImplement.Models
             OrderID = OrderID,
             SumPayment = SumPayment,
             PayOption = PayOption,
+            ClientID = ClientID,
         };
-
+	}
-    }
 }

ElectronicsShop/ElectronicsShopDataModels/Models/IPaymentModel.cs

@@ -13,5 +13,6 @@ namespace ElectronicsShopDataModels.Models
         int OrderID { get; }
         double SumPayment { get; }
         PaymeantOption PayOption { get; }
+        int ClientID { get; }
     }
 }

ElectronicsShop/ElectronicsShopRestAPI/Controllers/ClientController.cs

@@ -66,5 +66,16 @@ namespace ElectronicsShopRestAPI.Controllers {
 				_logger.LogError(ex, "Ошибка создания оплаты");
 			}
 		}
+
+		[HttpPost]
+		public List<PaymeantViewModel>? GetPaymeants(int _clientID) {
+			try {
+				return _payLogic.ReadList(new PaymeantSearchModel { ClientID = _clientID });
+			}
+			catch (Exception ex) {
+				_logger.LogError(ex, $"Ошибка получения списка оплат клиента id = {_clientID}");
+				throw;
+			}
+		}
 	}
 }

ElectronicsShop/ElectronicsShopShopClientApp/Controllers/HomeController.cs

@@ -29,7 +29,7 @@ namespace ElectronicsShopUserApp.Controllers {
            if (APIClient.Client == null) {
                 return Redirect("~/Home/Enter");
            }
-           return View(APIClient.GetRequset<List<OrderViewModel>>($"api/main/getorders?_clientid={APIClient.Client.ID}"));
+           return View(APIClient.GetRequset<List<PaymeantViewModel>>($"api/client/getpaymeants?_clientid={APIClient.Client.ID}"));
         }
 
         [HttpGet]
@@ -267,8 +267,9 @@ namespace ElectronicsShopUserApp.Controllers {
             }
             APIClient.PostRequest("api/client/createpaymeant", new PaymeantBindingModel {
                 OrderID = id,
-                SumPayment = sum,
+                SumPayment = paysum,
-                PayOption = PayOptionCalc(sum, paysum)
+                PayOption = PayOptionCalc(sum, paysum),
+                ClientID = APIClient.Client.ID
             });
             Response.Redirect("Index");
 		}

ElectronicsShop/ElectronicsShopShopClientApp/Views/Home/Index.cshtml

@@ -1,6 +1,6 @@
 @using ElectronicsShopContracts.ViewModels
 
-@model List<OrderViewModel>
+@model List<PaymeantViewModel>
 
 @{
 	ViewData["Title"] = "Home Page";
@@ -20,14 +20,17 @@
 			<table class="table">
 				<thead>
 					<tr>
+						<th>
+							Номер 
+						</th>
 						<th>
 							Номер заказа
 						</th>
 						<th>
-							Дата создания
+							Сумма к оплате 
 						</th>
 						<th>
-							Сумма
+							Статус оплаты 
 						</th>
 					</tr>
 				</thead>
@@ -38,10 +41,13 @@
 								@Html.DisplayFor(modelItem => item.ID)
 							</th>
 							<th>
-								@Html.DisplayFor(modelItem => item.DateCreate)
+								@Html.DisplayFor(modelItem => item.OrderID)
 							</th>
 							<th>
-								@Html.DisplayFor(modelItem => item.Sum)
+								@Html.DisplayFor(modelItem => item.SumPayment)
+							</th>
+							<th>
+								@Html.DisplayFor(modelItem => item.PayOption)
 							</th>
 						</tr>
 					}