From 9cf42a1d795888f516d8fce7d44e9efce3e440a5 Mon Sep 17 00:00:00 2001 From: Brett Hargreaves Date: Wed, 10 Jan 2018 15:35:10 +0000 Subject: [PATCH 01/13] Added Order Creation --- .../MyShop.Core/Contracts/IBasketService.cs | 1 + MyShop/MyShop.Core/Contracts/IOrderService.cs | 15 +++ MyShop/MyShop.Core/Models/Order.cs | 25 ++++ MyShop/MyShop.Core/Models/OrderItem.cs | 18 +++ MyShop/MyShop.Core/MyShop.Core.csproj | 3 + MyShop/MyShop.DataAccess.SQL/DataContext.cs | 2 + .../201801101446455_AddedOrders.Designer.cs | 29 ++++ .../Migrations/201801101446455_AddedOrders.cs | 54 ++++++++ .../201801101446455_AddedOrders.resx | 126 ++++++++++++++++++ .../MyShop.DataAccess.SQL.csproj | 7 + MyShop/MyShop.Services/BasketService.cs | 6 + MyShop/MyShop.Services/MyShop.Services.csproj | 1 + MyShop/MyShop.Services/OrderService.cs | 36 +++++ .../Controllers/BasketControllerTests.cs | 49 ++++++- MyShop/MyShop.WebUI/App_Start/UnityConfig.cs | 3 + .../Controllers/BasketController.cs | 29 +++- MyShop/MyShop.WebUI/MyShop.WebUI.csproj | 2 + .../MyShop.WebUI/Views/Basket/Checkout.cshtml | 79 +++++++++++ MyShop/MyShop.WebUI/Views/Basket/Index.cshtml | 1 + .../MyShop.WebUI/Views/Basket/ThankYou.cshtml | 7 + 20 files changed, 489 insertions(+), 4 deletions(-) create mode 100644 MyShop/MyShop.Core/Contracts/IOrderService.cs create mode 100644 MyShop/MyShop.Core/Models/Order.cs create mode 100644 MyShop/MyShop.Core/Models/OrderItem.cs create mode 100644 MyShop/MyShop.DataAccess.SQL/Migrations/201801101446455_AddedOrders.Designer.cs create mode 100644 MyShop/MyShop.DataAccess.SQL/Migrations/201801101446455_AddedOrders.cs create mode 100644 MyShop/MyShop.DataAccess.SQL/Migrations/201801101446455_AddedOrders.resx create mode 100644 MyShop/MyShop.Services/OrderService.cs create mode 100644 MyShop/MyShop.WebUI/Views/Basket/Checkout.cshtml create mode 100644 MyShop/MyShop.WebUI/Views/Basket/ThankYou.cshtml diff --git a/MyShop/MyShop.Core/Contracts/IBasketService.cs b/MyShop/MyShop.Core/Contracts/IBasketService.cs index 21a7a40..bd3b7ea 100644 --- a/MyShop/MyShop.Core/Contracts/IBasketService.cs +++ b/MyShop/MyShop.Core/Contracts/IBasketService.cs @@ -14,6 +14,7 @@ public interface IBasketService void RemoveFromBasket(HttpContextBase httpContext, string itemId); List GetBasketItems(HttpContextBase httpContext); BasketSummaryViewModel GetBasketSummary(HttpContextBase httpContext); + void ClearBasket(HttpContextBase httpContext); } } diff --git a/MyShop/MyShop.Core/Contracts/IOrderService.cs b/MyShop/MyShop.Core/Contracts/IOrderService.cs new file mode 100644 index 0000000..e6db503 --- /dev/null +++ b/MyShop/MyShop.Core/Contracts/IOrderService.cs @@ -0,0 +1,15 @@ +using MyShop.Core.Models; +using MyShop.Core.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MyShop.Core.Contracts +{ + public interface IOrderService + { + void CreateOrder(Order baseOrder, List basketItems); + } +} diff --git a/MyShop/MyShop.Core/Models/Order.cs b/MyShop/MyShop.Core/Models/Order.cs new file mode 100644 index 0000000..3e6fb3d --- /dev/null +++ b/MyShop/MyShop.Core/Models/Order.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MyShop.Core.Models +{ + public class Order : BaseEntity + { + public Order() { + this.OrderItems = new List(); + } + + public string FirstName { get; set; } + public string Surname { get; set; } + public string Email { get; set; } + public string Street { get; set; } + public string City { get; set; } + public string State { get; set; } + public string ZipCode { get; set; } + public string OrderStatus { get; set; } + public virtual ICollection OrderItems { get; set; } + } +} diff --git a/MyShop/MyShop.Core/Models/OrderItem.cs b/MyShop/MyShop.Core/Models/OrderItem.cs new file mode 100644 index 0000000..e0ae2a4 --- /dev/null +++ b/MyShop/MyShop.Core/Models/OrderItem.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MyShop.Core.Models +{ + public class OrderItem : BaseEntity + { + public string OrderId { get; set; } + public string ProductId { get; set; } + public string ProductName { get; set; } + public decimal Price { get; set; } + public string Image { get; set; } + public int Quanity { get; set; } + } +} diff --git a/MyShop/MyShop.Core/MyShop.Core.csproj b/MyShop/MyShop.Core/MyShop.Core.csproj index d710ecc..26b77f3 100644 --- a/MyShop/MyShop.Core/MyShop.Core.csproj +++ b/MyShop/MyShop.Core/MyShop.Core.csproj @@ -43,11 +43,14 @@ + + + diff --git a/MyShop/MyShop.DataAccess.SQL/DataContext.cs b/MyShop/MyShop.DataAccess.SQL/DataContext.cs index b269b5b..b26d07c 100644 --- a/MyShop/MyShop.DataAccess.SQL/DataContext.cs +++ b/MyShop/MyShop.DataAccess.SQL/DataContext.cs @@ -20,5 +20,7 @@ public DataContext() public DbSet Baskets { get; set; } public DbSet BasketItems { get; set; } public DbSet Customers { get; set; } + public DbSet Orders { get; set; } + public DbSet OrderItems { get; set; } } } diff --git a/MyShop/MyShop.DataAccess.SQL/Migrations/201801101446455_AddedOrders.Designer.cs b/MyShop/MyShop.DataAccess.SQL/Migrations/201801101446455_AddedOrders.Designer.cs new file mode 100644 index 0000000..9140edf --- /dev/null +++ b/MyShop/MyShop.DataAccess.SQL/Migrations/201801101446455_AddedOrders.Designer.cs @@ -0,0 +1,29 @@ +// +namespace MyShop.DataAccess.SQL.Migrations +{ + using System.CodeDom.Compiler; + using System.Data.Entity.Migrations; + using System.Data.Entity.Migrations.Infrastructure; + using System.Resources; + + [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] + public sealed partial class AddedOrders : IMigrationMetadata + { + private readonly ResourceManager Resources = new ResourceManager(typeof(AddedOrders)); + + string IMigrationMetadata.Id + { + get { return "201801101446455_AddedOrders"; } + } + + string IMigrationMetadata.Source + { + get { return null; } + } + + string IMigrationMetadata.Target + { + get { return Resources.GetString("Target"); } + } + } +} diff --git a/MyShop/MyShop.DataAccess.SQL/Migrations/201801101446455_AddedOrders.cs b/MyShop/MyShop.DataAccess.SQL/Migrations/201801101446455_AddedOrders.cs new file mode 100644 index 0000000..e5cf09d --- /dev/null +++ b/MyShop/MyShop.DataAccess.SQL/Migrations/201801101446455_AddedOrders.cs @@ -0,0 +1,54 @@ +namespace MyShop.DataAccess.SQL.Migrations +{ + using System; + using System.Data.Entity.Migrations; + + public partial class AddedOrders : DbMigration + { + public override void Up() + { + CreateTable( + "dbo.OrderItems", + c => new + { + Id = c.String(nullable: false, maxLength: 128), + OrderId = c.String(maxLength: 128), + ProductId = c.String(), + ProductName = c.String(), + Price = c.Decimal(nullable: false, precision: 18, scale: 2), + Image = c.String(), + Quanity = c.Int(nullable: false), + CreatedAt = c.DateTimeOffset(nullable: false, precision: 7), + }) + .PrimaryKey(t => t.Id) + .ForeignKey("dbo.Orders", t => t.OrderId) + .Index(t => t.OrderId); + + CreateTable( + "dbo.Orders", + c => new + { + Id = c.String(nullable: false, maxLength: 128), + FirstName = c.String(), + Surname = c.String(), + Email = c.String(), + Street = c.String(), + City = c.String(), + State = c.String(), + ZipCode = c.String(), + OrderStatus = c.String(), + CreatedAt = c.DateTimeOffset(nullable: false, precision: 7), + }) + .PrimaryKey(t => t.Id); + + } + + public override void Down() + { + DropForeignKey("dbo.OrderItems", "OrderId", "dbo.Orders"); + DropIndex("dbo.OrderItems", new[] { "OrderId" }); + DropTable("dbo.Orders"); + DropTable("dbo.OrderItems"); + } + } +} diff --git a/MyShop/MyShop.DataAccess.SQL/Migrations/201801101446455_AddedOrders.resx b/MyShop/MyShop.DataAccess.SQL/Migrations/201801101446455_AddedOrders.resx new file mode 100644 index 0000000..683873b --- /dev/null +++ b/MyShop/MyShop.DataAccess.SQL/Migrations/201801101446455_AddedOrders.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 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 + + + dbo + + \ No newline at end of file diff --git a/MyShop/MyShop.DataAccess.SQL/MyShop.DataAccess.SQL.csproj b/MyShop/MyShop.DataAccess.SQL/MyShop.DataAccess.SQL.csproj index 56b077e..eddc306 100644 --- a/MyShop/MyShop.DataAccess.SQL/MyShop.DataAccess.SQL.csproj +++ b/MyShop/MyShop.DataAccess.SQL/MyShop.DataAccess.SQL.csproj @@ -60,6 +60,10 @@ 201801032024566_AddCustomer.cs + + + 201801101446455_AddedOrders.cs + @@ -84,6 +88,9 @@ 201801032024566_AddCustomer.cs + + 201801101446455_AddedOrders.cs + \ No newline at end of file diff --git a/MyShop/MyShop.Services/BasketService.cs b/MyShop/MyShop.Services/BasketService.cs index 64c7651..6c8bb60 100644 --- a/MyShop/MyShop.Services/BasketService.cs +++ b/MyShop/MyShop.Services/BasketService.cs @@ -143,5 +143,11 @@ join p in productContext.Collection() on item.ProductId equals p.Id return model; } } + + public void ClearBasket(HttpContextBase httpContext) { + Basket basket = GetBasket(httpContext, false); + basket.BasketItems.Clear(); + basketContext.Commit(); + } } } diff --git a/MyShop/MyShop.Services/MyShop.Services.csproj b/MyShop/MyShop.Services/MyShop.Services.csproj index 3948ccc..9708073 100644 --- a/MyShop/MyShop.Services/MyShop.Services.csproj +++ b/MyShop/MyShop.Services/MyShop.Services.csproj @@ -42,6 +42,7 @@ + diff --git a/MyShop/MyShop.Services/OrderService.cs b/MyShop/MyShop.Services/OrderService.cs new file mode 100644 index 0000000..25c0a9d --- /dev/null +++ b/MyShop/MyShop.Services/OrderService.cs @@ -0,0 +1,36 @@ +using MyShop.Core.Contracts; +using MyShop.Core.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using MyShop.Core.ViewModels; + +namespace MyShop.Services +{ + public class OrderService : IOrderService + { + IRepository orderContext; + public OrderService(IRepository OrderContext) { + this.orderContext = OrderContext; + } + + public void CreateOrder(Order baseOrder, List basketItems) + { + foreach (var item in basketItems) { + baseOrder.OrderItems.Add(new OrderItem() + { + ProductId = item.Id, + Image = item.Image, + Price = item.Price, + ProductName = item.ProductName, + Quanity = item.Quanity + }); + } + + orderContext.Insert(baseOrder); + orderContext.Commit(); + } + } +} diff --git a/MyShop/MyShop.WebUI.Tests/Controllers/BasketControllerTests.cs b/MyShop/MyShop.WebUI.Tests/Controllers/BasketControllerTests.cs index 435b879..15dfba9 100644 --- a/MyShop/MyShop.WebUI.Tests/Controllers/BasketControllerTests.cs +++ b/MyShop/MyShop.WebUI.Tests/Controllers/BasketControllerTests.cs @@ -20,12 +20,14 @@ public void CanAddBasketItem() //setup IRepository baskets = new MockContext(); IRepository products = new MockContext(); + IRepository orders = new MockContext(); var httpContext = new MockHttpContext(); IBasketService basketService = new BasketService(products, baskets); - var controller = new BasketController(basketService); + IOrderService orderService = new OrderService(orders); + var controller = new BasketController(basketService, orderService); controller.ControllerContext = new System.Web.Mvc.ControllerContext(httpContext, new System.Web.Routing.RouteData(), controller); //Act @@ -45,6 +47,7 @@ public void CanAddBasketItem() public void CanGetSummaryViewModel() { IRepository baskets = new MockContext(); IRepository products = new MockContext(); + IRepository orders = new MockContext(); products.Insert(new Product() { Id = "1", Price = 10.00m }); products.Insert(new Product() { Id = "2", Price = 5.00m }); @@ -55,9 +58,9 @@ public void CanGetSummaryViewModel() { baskets.Insert(basket); IBasketService basketService = new BasketService(products, baskets); + IOrderService orderService = new OrderService(orders); + var controller = new BasketController(basketService, orderService); - - var controller = new BasketController(basketService); var httpContext = new MockHttpContext(); httpContext.Request.Cookies.Add(new System.Web.HttpCookie("eCommerceBasket") { Value = basket.Id }); controller.ControllerContext = new System.Web.Mvc.ControllerContext(httpContext, new System.Web.Routing.RouteData(), controller); @@ -71,5 +74,45 @@ public void CanGetSummaryViewModel() { } + + [TestMethod] + public void CanCheckoutAndCreateOrder() { + IRepository products = new MockContext(); + products.Insert(new Product() { Id = "1", Price = 10.00m }); + products.Insert(new Product() { Id = "2", Price = 5.00m }); + + IRepository baskets = new MockContext(); + Basket basket = new Basket(); + basket.BasketItems.Add(new BasketItem() { ProductId = "1", Quanity = 2, BasketId = basket.Id }); + basket.BasketItems.Add(new BasketItem() { ProductId = "1", Quanity = 1, BasketId = basket.Id }); + + baskets.Insert(basket); + + IBasketService basketService = new BasketService(products, baskets); + + IRepository orders = new MockContext(); + IOrderService orderService = new OrderService(orders); + + var controller = new BasketController(basketService, orderService); + var httpContext = new MockHttpContext(); + httpContext.Request.Cookies.Add(new System.Web.HttpCookie("eCommerceBasket") + { + Value = basket.Id + }); + + controller.ControllerContext = new ControllerContext(httpContext, new System.Web.Routing.RouteData(), controller); + + //Act + Order order = new Order(); + controller.Checkout(order); + + //assert + Assert.AreEqual(2, order.OrderItems.Count); + Assert.AreEqual(0, basket.BasketItems.Count); + + Order orderInRep = orders.Find(order.Id); + Assert.AreEqual(2, orderInRep.OrderItems.Count); + + } } } diff --git a/MyShop/MyShop.WebUI/App_Start/UnityConfig.cs b/MyShop/MyShop.WebUI/App_Start/UnityConfig.cs index 0bc1f73..548fed8 100644 --- a/MyShop/MyShop.WebUI/App_Start/UnityConfig.cs +++ b/MyShop/MyShop.WebUI/App_Start/UnityConfig.cs @@ -52,7 +52,10 @@ public static void RegisterTypes(IUnityContainer container) container.RegisterType, SQLRepository>(); container.RegisterType, SQLRepository>(); container.RegisterType, SQLRepository>(); + container.RegisterType, SQLRepository>(); + container.RegisterType(); + container.RegisterType(); } } } \ No newline at end of file diff --git a/MyShop/MyShop.WebUI/Controllers/BasketController.cs b/MyShop/MyShop.WebUI/Controllers/BasketController.cs index 6dc4347..db78e4b 100644 --- a/MyShop/MyShop.WebUI/Controllers/BasketController.cs +++ b/MyShop/MyShop.WebUI/Controllers/BasketController.cs @@ -1,4 +1,5 @@ using MyShop.Core.Contracts; +using MyShop.Core.Models; using System; using System.Collections.Generic; using System.Linq; @@ -10,9 +11,11 @@ namespace MyShop.WebUI.Controllers public class BasketController : Controller { IBasketService basketService; + IOrderService orderService; - public BasketController(IBasketService BasketService) { + public BasketController(IBasketService BasketService, IOrderService OrderService) { this.basketService = BasketService; + this.orderService = OrderService; } // GET: Basket2 public ActionResult Index() @@ -40,5 +43,29 @@ public PartialViewResult BasketSummary() { return PartialView(basketSummary); } + + public ActionResult Checkout() { + return View(); + } + + [HttpPost] + public ActionResult Checkout(Order order) { + + var basketItems = basketService.GetBasketItems(this.HttpContext); + order.OrderStatus = "Order Created"; + + //process payment + + order.OrderStatus = "Payment Processed"; + orderService.CreateOrder(order, basketItems); + basketService.ClearBasket(this.HttpContext); + + return RedirectToAction("Thankyou", new { OrderId = order.Id }); + } + + public ActionResult ThankYou(string OrderId) { + ViewBag.OrderId = OrderId; + return View(); + } } } \ No newline at end of file diff --git a/MyShop/MyShop.WebUI/MyShop.WebUI.csproj b/MyShop/MyShop.WebUI/MyShop.WebUI.csproj index cbb36a2..4013151 100644 --- a/MyShop/MyShop.WebUI/MyShop.WebUI.csproj +++ b/MyShop/MyShop.WebUI/MyShop.WebUI.csproj @@ -304,6 +304,8 @@ + + diff --git a/MyShop/MyShop.WebUI/Views/Basket/Checkout.cshtml b/MyShop/MyShop.WebUI/Views/Basket/Checkout.cshtml new file mode 100644 index 0000000..175c806 --- /dev/null +++ b/MyShop/MyShop.WebUI/Views/Basket/Checkout.cshtml @@ -0,0 +1,79 @@ +@model MyShop.Core.Models.Order + +@using (Html.BeginForm()) +{ + @Html.AntiForgeryToken() + +
+

Order

+
+ @Html.ValidationSummary(true, "", new { @class = "text-danger" }) + + +
+ @Html.LabelFor(model => model.FirstName, htmlAttributes: new { @class = "control-label col-md-2" }) +
+ @Html.EditorFor(model => model.FirstName, new { htmlAttributes = new { @class = "form-control" } }) + @Html.ValidationMessageFor(model => model.FirstName, "", new { @class = "text-danger" }) +
+
+ +
+ @Html.LabelFor(model => model.Surname, htmlAttributes: new { @class = "control-label col-md-2" }) +
+ @Html.EditorFor(model => model.Surname, new { htmlAttributes = new { @class = "form-control" } }) + @Html.ValidationMessageFor(model => model.Surname, "", new { @class = "text-danger" }) +
+
+ +
+ @Html.LabelFor(model => model.Email, htmlAttributes: new { @class = "control-label col-md-2" }) +
+ @Html.EditorFor(model => model.Email, new { htmlAttributes = new { @class = "form-control" } }) + @Html.ValidationMessageFor(model => model.Email, "", new { @class = "text-danger" }) +
+
+ +
+ @Html.LabelFor(model => model.Street, htmlAttributes: new { @class = "control-label col-md-2" }) +
+ @Html.EditorFor(model => model.Street, new { htmlAttributes = new { @class = "form-control" } }) + @Html.ValidationMessageFor(model => model.Street, "", new { @class = "text-danger" }) +
+
+ +
+ @Html.LabelFor(model => model.City, htmlAttributes: new { @class = "control-label col-md-2" }) +
+ @Html.EditorFor(model => model.City, new { htmlAttributes = new { @class = "form-control" } }) + @Html.ValidationMessageFor(model => model.City, "", new { @class = "text-danger" }) +
+
+ +
+ @Html.LabelFor(model => model.State, htmlAttributes: new { @class = "control-label col-md-2" }) +
+ @Html.EditorFor(model => model.State, new { htmlAttributes = new { @class = "form-control" } }) + @Html.ValidationMessageFor(model => model.State, "", new { @class = "text-danger" }) +
+
+ +
+ @Html.LabelFor(model => model.ZipCode, htmlAttributes: new { @class = "control-label col-md-2" }) +
+ @Html.EditorFor(model => model.ZipCode, new { htmlAttributes = new { @class = "form-control" } }) + @Html.ValidationMessageFor(model => model.ZipCode, "", new { @class = "text-danger" }) +
+
+ +
+
+ +
+
+
+} + +
+ @Html.ActionLink("Back to Basket", "Index") +
diff --git a/MyShop/MyShop.WebUI/Views/Basket/Index.cshtml b/MyShop/MyShop.WebUI/Views/Basket/Index.cshtml index 3e1eb82..78d19c5 100644 --- a/MyShop/MyShop.WebUI/Views/Basket/Index.cshtml +++ b/MyShop/MyShop.WebUI/Views/Basket/Index.cshtml @@ -48,6 +48,7 @@ Basket Total @String.Format("{0:c}", (from p in Model select p.Price * p.Quanity).Sum()) + Checkout diff --git a/MyShop/MyShop.WebUI/Views/Basket/ThankYou.cshtml b/MyShop/MyShop.WebUI/Views/Basket/ThankYou.cshtml new file mode 100644 index 0000000..238d088 --- /dev/null +++ b/MyShop/MyShop.WebUI/Views/Basket/ThankYou.cshtml @@ -0,0 +1,7 @@ +@{ + ViewBag.Title = "Thank You"; +} + +

Thank You

+Thank you for your order.

+Your Order Id = @ViewBag.OrderId From f596b8dc5caead862c456d6a6bfeb1f11ee90b2a Mon Sep 17 00:00:00 2001 From: Brett Hargreaves Date: Wed, 10 Jan 2018 17:19:42 +0000 Subject: [PATCH 02/13] linked customer to orders --- .../Controllers/BasketControllerTests.cs | 16 ++++++++-- .../Mocks/MockHttpContext.cs | 12 ++++++++ .../Controllers/BasketController.cs | 29 +++++++++++++++++-- .../MyShop.WebUI/Views/Basket/Checkout.cshtml | 8 ----- 4 files changed, 52 insertions(+), 13 deletions(-) diff --git a/MyShop/MyShop.WebUI.Tests/Controllers/BasketControllerTests.cs b/MyShop/MyShop.WebUI.Tests/Controllers/BasketControllerTests.cs index 15dfba9..91016c7 100644 --- a/MyShop/MyShop.WebUI.Tests/Controllers/BasketControllerTests.cs +++ b/MyShop/MyShop.WebUI.Tests/Controllers/BasketControllerTests.cs @@ -8,6 +8,7 @@ using MyShop.WebUI.Controllers; using System.Web.Mvc; using MyShop.Core.ViewModels; +using System.Security.Principal; namespace MyShop.WebUI.Tests.Controllers { @@ -21,13 +22,14 @@ public void CanAddBasketItem() IRepository baskets = new MockContext(); IRepository products = new MockContext(); IRepository orders = new MockContext(); + IRepository customers = new MockContext(); var httpContext = new MockHttpContext(); IBasketService basketService = new BasketService(products, baskets); IOrderService orderService = new OrderService(orders); - var controller = new BasketController(basketService, orderService); + var controller = new BasketController(basketService, orderService, customers); controller.ControllerContext = new System.Web.Mvc.ControllerContext(httpContext, new System.Web.Routing.RouteData(), controller); //Act @@ -48,6 +50,7 @@ public void CanGetSummaryViewModel() { IRepository baskets = new MockContext(); IRepository products = new MockContext(); IRepository orders = new MockContext(); + IRepository customers = new MockContext(); products.Insert(new Product() { Id = "1", Price = 10.00m }); products.Insert(new Product() { Id = "2", Price = 5.00m }); @@ -59,7 +62,7 @@ public void CanGetSummaryViewModel() { IBasketService basketService = new BasketService(products, baskets); IOrderService orderService = new OrderService(orders); - var controller = new BasketController(basketService, orderService); + var controller = new BasketController(basketService, orderService, customers); var httpContext = new MockHttpContext(); httpContext.Request.Cookies.Add(new System.Web.HttpCookie("eCommerceBasket") { Value = basket.Id }); @@ -77,6 +80,7 @@ public void CanGetSummaryViewModel() { [TestMethod] public void CanCheckoutAndCreateOrder() { + IRepository customers = new MockContext(); IRepository products = new MockContext(); products.Insert(new Product() { Id = "1", Price = 10.00m }); products.Insert(new Product() { Id = "2", Price = 5.00m }); @@ -93,8 +97,14 @@ public void CanCheckoutAndCreateOrder() { IRepository orders = new MockContext(); IOrderService orderService = new OrderService(orders); - var controller = new BasketController(basketService, orderService); + customers.Insert(new Customer() { Id = "1", Email = "brett.hargreaves@gmail.com", ZipCode = "90210" }); + + IPrincipal FakeUser = new GenericPrincipal(new GenericIdentity("brett.hargreaves@gmail.com", "Forms"), null); + + + var controller = new BasketController(basketService, orderService, customers); var httpContext = new MockHttpContext(); + httpContext.User = FakeUser; httpContext.Request.Cookies.Add(new System.Web.HttpCookie("eCommerceBasket") { Value = basket.Id diff --git a/MyShop/MyShop.WebUI.Tests/Mocks/MockHttpContext.cs b/MyShop/MyShop.WebUI.Tests/Mocks/MockHttpContext.cs index 6c0d3c2..694b847 100644 --- a/MyShop/MyShop.WebUI.Tests/Mocks/MockHttpContext.cs +++ b/MyShop/MyShop.WebUI.Tests/Mocks/MockHttpContext.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Security.Principal; using System.Text; using System.Threading.Tasks; using System.Web; @@ -12,6 +13,7 @@ public class MockHttpContext : HttpContextBase private MockRequest request; private MockResponse response; private HttpCookieCollection cookies; + private IPrincipal FakeUser; public MockHttpContext() { cookies = new HttpCookieCollection(); @@ -19,6 +21,16 @@ public MockHttpContext() { this.response = new MockResponse(cookies); } + public override IPrincipal User { + get { + return this.FakeUser; + } + set { + this.FakeUser = value; + } + + } + public override HttpRequestBase Request { get { return request; diff --git a/MyShop/MyShop.WebUI/Controllers/BasketController.cs b/MyShop/MyShop.WebUI/Controllers/BasketController.cs index db78e4b..69898ff 100644 --- a/MyShop/MyShop.WebUI/Controllers/BasketController.cs +++ b/MyShop/MyShop.WebUI/Controllers/BasketController.cs @@ -10,12 +10,14 @@ namespace MyShop.WebUI.Controllers { public class BasketController : Controller { + IRepository customers; IBasketService basketService; IOrderService orderService; - public BasketController(IBasketService BasketService, IOrderService OrderService) { + public BasketController(IBasketService BasketService, IOrderService OrderService, IRepository Customers) { this.basketService = BasketService; this.orderService = OrderService; + this.customers = Customers; } // GET: Basket2 public ActionResult Index() @@ -44,15 +46,38 @@ public PartialViewResult BasketSummary() { return PartialView(basketSummary); } + [Authorize] public ActionResult Checkout() { - return View(); + Customer customer = customers.Collection().FirstOrDefault(c => c.Email == User.Identity.Name); + + if (customer != null) + { + Order order = new Order() + { + Email = customer.Email, + City = customer.City, + State = customer.State, + Street = customer.Street, + FirstName = customer.FirstName, + Surname = customer.LastName, + ZipCode = customer.ZipCode + }; + + return View(order); + } + else { + return RedirectToAction("Error"); + } + } [HttpPost] + [Authorize] public ActionResult Checkout(Order order) { var basketItems = basketService.GetBasketItems(this.HttpContext); order.OrderStatus = "Order Created"; + order.Email = User.Identity.Name; //process payment diff --git a/MyShop/MyShop.WebUI/Views/Basket/Checkout.cshtml b/MyShop/MyShop.WebUI/Views/Basket/Checkout.cshtml index 175c806..68e90b9 100644 --- a/MyShop/MyShop.WebUI/Views/Basket/Checkout.cshtml +++ b/MyShop/MyShop.WebUI/Views/Basket/Checkout.cshtml @@ -26,14 +26,6 @@ -
- @Html.LabelFor(model => model.Email, htmlAttributes: new { @class = "control-label col-md-2" }) -
- @Html.EditorFor(model => model.Email, new { htmlAttributes = new { @class = "form-control" } }) - @Html.ValidationMessageFor(model => model.Email, "", new { @class = "text-danger" }) -
-
-
@Html.LabelFor(model => model.Street, htmlAttributes: new { @class = "control-label col-md-2" })
From 71d5afbd787ab454ce29841c9a2e0840f1cb95e6 Mon Sep 17 00:00:00 2001 From: Brett Hargreaves Date: Thu, 11 Jan 2018 20:31:20 +0000 Subject: [PATCH 03/13] Added Order Manager --- MyShop/MyShop.Core/Contracts/IOrderService.cs | 3 + MyShop/MyShop.Services/OrderService.cs | 13 +++ .../Controllers/AdminController.cs | 17 ++++ .../Controllers/OrderManagerController.cs | 47 ++++++++++ MyShop/MyShop.WebUI/MyShop.WebUI.csproj | 6 ++ MyShop/MyShop.WebUI/Views/Admin/Index.cshtml | 20 ++++ .../Views/OrderManager/Index.cshtml | 48 ++++++++++ .../Views/OrderManager/OrderItems.cshtml | 45 +++++++++ .../Views/OrderManager/UpdateOrder.cshtml | 91 +++++++++++++++++++ .../MyShop.WebUI/Views/Shared/_Layout.cshtml | 3 +- 10 files changed, 291 insertions(+), 2 deletions(-) create mode 100644 MyShop/MyShop.WebUI/Controllers/AdminController.cs create mode 100644 MyShop/MyShop.WebUI/Controllers/OrderManagerController.cs create mode 100644 MyShop/MyShop.WebUI/Views/Admin/Index.cshtml create mode 100644 MyShop/MyShop.WebUI/Views/OrderManager/Index.cshtml create mode 100644 MyShop/MyShop.WebUI/Views/OrderManager/OrderItems.cshtml create mode 100644 MyShop/MyShop.WebUI/Views/OrderManager/UpdateOrder.cshtml diff --git a/MyShop/MyShop.Core/Contracts/IOrderService.cs b/MyShop/MyShop.Core/Contracts/IOrderService.cs index e6db503..d98847a 100644 --- a/MyShop/MyShop.Core/Contracts/IOrderService.cs +++ b/MyShop/MyShop.Core/Contracts/IOrderService.cs @@ -11,5 +11,8 @@ namespace MyShop.Core.Contracts public interface IOrderService { void CreateOrder(Order baseOrder, List basketItems); + List GetOrderList(); + Order GetOrder(string Id); + void UpdateOrder(Order updatedOrder); } } diff --git a/MyShop/MyShop.Services/OrderService.cs b/MyShop/MyShop.Services/OrderService.cs index 25c0a9d..6b43726 100644 --- a/MyShop/MyShop.Services/OrderService.cs +++ b/MyShop/MyShop.Services/OrderService.cs @@ -32,5 +32,18 @@ public void CreateOrder(Order baseOrder, List basketItems) orderContext.Insert(baseOrder); orderContext.Commit(); } + + public List GetOrderList() { + return orderContext.Collection().ToList(); + } + + public Order GetOrder(string Id) { + return orderContext.Find(Id); + } + + public void UpdateOrder(Order updatedOrder) { + orderContext.Update(updatedOrder); + orderContext.Commit(); + } } } diff --git a/MyShop/MyShop.WebUI/Controllers/AdminController.cs b/MyShop/MyShop.WebUI/Controllers/AdminController.cs new file mode 100644 index 0000000..7b4f512 --- /dev/null +++ b/MyShop/MyShop.WebUI/Controllers/AdminController.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.Mvc; + +namespace MyShop.WebUI.Controllers +{ + public class AdminController : Controller + { + // GET: Admin + public ActionResult Index() + { + return View(); + } + } +} \ No newline at end of file diff --git a/MyShop/MyShop.WebUI/Controllers/OrderManagerController.cs b/MyShop/MyShop.WebUI/Controllers/OrderManagerController.cs new file mode 100644 index 0000000..becd9d1 --- /dev/null +++ b/MyShop/MyShop.WebUI/Controllers/OrderManagerController.cs @@ -0,0 +1,47 @@ +using MyShop.Core.Contracts; +using MyShop.Core.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.Mvc; + +namespace MyShop.WebUI.Controllers +{ + public class OrderManagerController : Controller + { + IOrderService orderService; + + public OrderManagerController(IOrderService OrderService) { + this.orderService = OrderService; + } + // GET: OrderManager + public ActionResult Index() + { + List orders = orderService.GetOrderList(); + + return View(orders); + } + + public ActionResult UpdateOrder(string Id) { + ViewBag.StatusList = new List() { + "Order Created", + "Payment Processed", + "Order Shipped", + "Order Complete" + }; + Order order = orderService.GetOrder(Id); + return View(order); + } + + [HttpPost] + public ActionResult UpdateOrder(Order updatedOrder, string Id) { + Order order = orderService.GetOrder(Id); + + order.OrderStatus = updatedOrder.OrderStatus; + orderService.UpdateOrder(order); + + return RedirectToAction("Index"); + } + } +} \ No newline at end of file diff --git a/MyShop/MyShop.WebUI/MyShop.WebUI.csproj b/MyShop/MyShop.WebUI/MyShop.WebUI.csproj index 4013151..028bf63 100644 --- a/MyShop/MyShop.WebUI/MyShop.WebUI.csproj +++ b/MyShop/MyShop.WebUI/MyShop.WebUI.csproj @@ -208,9 +208,11 @@ + + @@ -306,6 +308,10 @@ + + + + diff --git a/MyShop/MyShop.WebUI/Views/Admin/Index.cshtml b/MyShop/MyShop.WebUI/Views/Admin/Index.cshtml new file mode 100644 index 0000000..8138965 --- /dev/null +++ b/MyShop/MyShop.WebUI/Views/Admin/Index.cshtml @@ -0,0 +1,20 @@ +@{ + ViewBag.Title = "Admin"; +} + +

Admin Pages

+ +
+

Product Management

+
+ @Html.ActionLink("Product Categories", "Index", "ProductCategoryManager", null, new { @class="list-group-item" }) + @Html.ActionLink("Product", "Index", "ProductManager", null, new { @class = "list-group-item" }) +
+
+
+

Order Management

+
+ @Html.ActionLink("Orders", "Index", "OrderManager", null, new { @class = "list-group-item" }) +
+
+
diff --git a/MyShop/MyShop.WebUI/Views/OrderManager/Index.cshtml b/MyShop/MyShop.WebUI/Views/OrderManager/Index.cshtml new file mode 100644 index 0000000..66c0497 --- /dev/null +++ b/MyShop/MyShop.WebUI/Views/OrderManager/Index.cshtml @@ -0,0 +1,48 @@ +@model IEnumerable + + + + + + + + + + + + +@foreach (var item in Model) { + + + + + + + + + +} + +
+ @Html.DisplayNameFor(model => model.CreatedAt) + + @Html.DisplayNameFor(model => model.FirstName) + + @Html.DisplayNameFor(model => model.Surname) + + @Html.DisplayNameFor(model => model.Email) + + @Html.DisplayNameFor(model => model.OrderStatus) +
+ @Html.DisplayFor(modelItem => item.CreatedAt) + + @Html.DisplayFor(modelItem => item.FirstName) + + @Html.DisplayFor(modelItem => item.Surname) + + @Html.DisplayFor(modelItem => item.Email) + + @Html.DisplayFor(modelItem => item.OrderStatus) + + @Html.ActionLink("Manage Order", "UpdateOrder", new { id=item.Id }) +
diff --git a/MyShop/MyShop.WebUI/Views/OrderManager/OrderItems.cshtml b/MyShop/MyShop.WebUI/Views/OrderManager/OrderItems.cshtml new file mode 100644 index 0000000..76b0f4b --- /dev/null +++ b/MyShop/MyShop.WebUI/Views/OrderManager/OrderItems.cshtml @@ -0,0 +1,45 @@ +@model IEnumerable + + + + + + + + + + +@foreach (var item in Model) { + + + + + + + +} + + + + + + +
+ @Html.DisplayNameFor(model => model.ProductName) + + @Html.DisplayNameFor(model => model.Price) + + @Html.DisplayNameFor(model => model.Quanity) + Line Order
+ @Html.DisplayFor(modelItem => item.ProductName) + + @Html.DisplayFor(modelItem => item.Price) + + @Html.DisplayFor(modelItem => item.Quanity) + + @String.Format("{0:c}", item.Price * item.Quanity) +
+ Order Total + + @String.Format("{0:c}", (from p in Model select p.Quanity * p.Price).Sum()) +
diff --git a/MyShop/MyShop.WebUI/Views/OrderManager/UpdateOrder.cshtml b/MyShop/MyShop.WebUI/Views/OrderManager/UpdateOrder.cshtml new file mode 100644 index 0000000..5ef5889 --- /dev/null +++ b/MyShop/MyShop.WebUI/Views/OrderManager/UpdateOrder.cshtml @@ -0,0 +1,91 @@ +@model MyShop.Core.Models.Order + +@using (Html.BeginForm()) +{ + @Html.AntiForgeryToken() + +
+

Order

+
+ @Html.HiddenFor(model => model.Id) + +
+
+ @Html.LabelFor(model => model.OrderStatus, htmlAttributes: new { @class = "control-label col-md-2" }) +
+ @Html.DropDownListFor(model => model.OrderStatus, new SelectList(ViewBag.StatusList), new { @class = "form-control" }) +
+
+ +
+ @Html.LabelFor(model => model.CreatedAt, htmlAttributes: new { @class = "control-label col-md-2" }) +
+ @Html.DisplayFor(model => model.CreatedAt, new { htmlAttributes = new { @class = "form-control" } }) +
+
+ +
+ @Html.LabelFor(model => model.FirstName, htmlAttributes: new { @class = "control-label col-md-2" }) +
+ @Html.DisplayFor(model => model.FirstName, new { htmlAttributes = new { @class = "form-control" } }) +
+
+ +
+ @Html.LabelFor(model => model.Surname, htmlAttributes: new { @class = "control-label col-md-2" }) +
+ @Html.DisplayFor(model => model.Surname, new { htmlAttributes = new { @class = "form-control" } }) +
+
+ +
+ @Html.LabelFor(model => model.Email, htmlAttributes: new { @class = "control-label col-md-2" }) +
+ @Html.DisplayFor(model => model.Email, new { htmlAttributes = new { @class = "form-control" } }) +
+
+ +
+
+
+ @Html.LabelFor(model => model.Street, htmlAttributes: new { @class = "control-label col-md-2" }) +
+ @Html.DisplayFor(model => model.Street, new { htmlAttributes = new { @class = "form-control" } }) +
+
+ +
+ @Html.LabelFor(model => model.City, htmlAttributes: new { @class = "control-label col-md-2" }) +
+ @Html.DisplayFor(model => model.City, new { htmlAttributes = new { @class = "form-control" } }) +
+
+ +
+ @Html.LabelFor(model => model.State, htmlAttributes: new { @class = "control-label col-md-2" }) +
+ @Html.DisplayFor(model => model.State, new { htmlAttributes = new { @class = "form-control" } }) +
+
+ +
+ @Html.LabelFor(model => model.ZipCode, htmlAttributes: new { @class = "control-label col-md-2" }) +
+ @Html.DisplayFor(model => model.ZipCode, new { htmlAttributes = new { @class = "form-control" } }) +
+
+
+ +
+
+ +
+
+
+ + @Html.Partial("OrderItems", Model.OrderItems) +} + +
+ @Html.ActionLink("Back to List", "Index") +
diff --git a/MyShop/MyShop.WebUI/Views/Shared/_Layout.cshtml b/MyShop/MyShop.WebUI/Views/Shared/_Layout.cshtml index 7a5ce9c..9a0c45b 100644 --- a/MyShop/MyShop.WebUI/Views/Shared/_Layout.cshtml +++ b/MyShop/MyShop.WebUI/Views/Shared/_Layout.cshtml @@ -22,8 +22,7 @@
  • @Html.ActionLink("Home", "Index", "Home")
    • -
  • @Html.ActionLink("Product Admin", "Index", "ProductManager")
    • -
  • @Html.ActionLink("Category Admin", "Index", "ProductCategoryManager")
    • +
  • @Html.ActionLink("Admin", "Index", "Admin")
@Html.Partial("_LoginPartial") @{ From 47f64bb8bc04d9532cee74fb0c72a4c45ebc410f Mon Sep 17 00:00:00 2001 From: Brett Hargreaves Date: Sat, 13 Jan 2018 15:19:09 +0000 Subject: [PATCH 04/13] Secured the admin pages --- MyShop/MyShop.WebUI/Controllers/AdminController.cs | 1 + MyShop/MyShop.WebUI/Controllers/ManageController.cs | 1 + MyShop/MyShop.WebUI/Controllers/OrderManagerController.cs | 1 + .../Controllers/ProductCategoryManagerController.cs | 1 + MyShop/MyShop.WebUI/Controllers/ProductManagerController.cs | 1 + MyShop/MyShop.WebUI/MyShop.WebUI.csproj | 1 + MyShop/MyShop.WebUI/Views/Shared/_Layout.cshtml | 3 +++ 7 files changed, 9 insertions(+) diff --git a/MyShop/MyShop.WebUI/Controllers/AdminController.cs b/MyShop/MyShop.WebUI/Controllers/AdminController.cs index 7b4f512..012445c 100644 --- a/MyShop/MyShop.WebUI/Controllers/AdminController.cs +++ b/MyShop/MyShop.WebUI/Controllers/AdminController.cs @@ -6,6 +6,7 @@ namespace MyShop.WebUI.Controllers { + [Authorize(Roles ="Admin")] public class AdminController : Controller { // GET: Admin diff --git a/MyShop/MyShop.WebUI/Controllers/ManageController.cs b/MyShop/MyShop.WebUI/Controllers/ManageController.cs index 76266fa..8d14d87 100644 --- a/MyShop/MyShop.WebUI/Controllers/ManageController.cs +++ b/MyShop/MyShop.WebUI/Controllers/ManageController.cs @@ -18,6 +18,7 @@ public class ManageController : Controller public ManageController() { + } public ApplicationSignInManager SignInManager diff --git a/MyShop/MyShop.WebUI/Controllers/OrderManagerController.cs b/MyShop/MyShop.WebUI/Controllers/OrderManagerController.cs index becd9d1..42de4e9 100644 --- a/MyShop/MyShop.WebUI/Controllers/OrderManagerController.cs +++ b/MyShop/MyShop.WebUI/Controllers/OrderManagerController.cs @@ -8,6 +8,7 @@ namespace MyShop.WebUI.Controllers { + [Authorize(Roles = "Admin")] public class OrderManagerController : Controller { IOrderService orderService; diff --git a/MyShop/MyShop.WebUI/Controllers/ProductCategoryManagerController.cs b/MyShop/MyShop.WebUI/Controllers/ProductCategoryManagerController.cs index bec7555..16eb0f7 100644 --- a/MyShop/MyShop.WebUI/Controllers/ProductCategoryManagerController.cs +++ b/MyShop/MyShop.WebUI/Controllers/ProductCategoryManagerController.cs @@ -9,6 +9,7 @@ namespace MyShop.WebUI.Controllers { + [Authorize(Roles = "Admin")] public class ProductCategoryManagerController : Controller { IRepository context; diff --git a/MyShop/MyShop.WebUI/Controllers/ProductManagerController.cs b/MyShop/MyShop.WebUI/Controllers/ProductManagerController.cs index e11c863..b3d1d80 100644 --- a/MyShop/MyShop.WebUI/Controllers/ProductManagerController.cs +++ b/MyShop/MyShop.WebUI/Controllers/ProductManagerController.cs @@ -11,6 +11,7 @@ namespace MyShop.WebUI.Controllers { + [Authorize(Roles = "Admin")] public class ProductManagerController : Controller { IRepository context; diff --git a/MyShop/MyShop.WebUI/MyShop.WebUI.csproj b/MyShop/MyShop.WebUI/MyShop.WebUI.csproj index 028bf63..ffde975 100644 --- a/MyShop/MyShop.WebUI/MyShop.WebUI.csproj +++ b/MyShop/MyShop.WebUI/MyShop.WebUI.csproj @@ -316,6 +316,7 @@ + diff --git a/MyShop/MyShop.WebUI/Views/Shared/_Layout.cshtml b/MyShop/MyShop.WebUI/Views/Shared/_Layout.cshtml index 9a0c45b..f9ad8b0 100644 --- a/MyShop/MyShop.WebUI/Views/Shared/_Layout.cshtml +++ b/MyShop/MyShop.WebUI/Views/Shared/_Layout.cshtml @@ -22,7 +22,10 @@
  • @Html.ActionLink("Home", "Index", "Home")
    • +@if (Request.IsAuthenticated && User.IsInRole("Admin")) +{
  • @Html.ActionLink("Admin", "Index", "Admin")
    • +}
@Html.Partial("_LoginPartial") @{ From c967568b0ea5bc0dc37d7d2076cb6ad838c6a8db Mon Sep 17 00:00:00 2001 From: completecoder <32646665+completecoder@users.noreply.github.com> Date: Sat, 9 Feb 2019 08:13:06 +0000 Subject: [PATCH 05/13] Updated README --- README.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5e87b70..e56e629 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,7 @@ -# MyShop -My Shop eCommerce Demo +# My Source Code +This repository contains my completed and working source code for the project in my ASP.NET MVC Training course. + +Please follow my Blog at https://blog.completecoder.net for useful articles +and my facebook page at https://www.facebook.com/completecoder/ + +Finally, I have a new YouTube channel coming soon, so please follow one of the above to be updated when it's released! From 25e6098b113dffcc545f4fc493e01f7d34dd31f7 Mon Sep 17 00:00:00 2001 From: completecoder <32646665+completecoder@users.noreply.github.com> Date: Wed, 8 Jan 2020 16:26:45 +0000 Subject: [PATCH 06/13] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e56e629..32ee1ee 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # My Source Code This repository contains my completed and working source code for the project in my ASP.NET MVC Training course. -Please follow my Blog at https://blog.completecoder.net for useful articles -and my facebook page at https://www.facebook.com/completecoder/ +Please follow my Blog at https://completecloud.guru for useful articles +and my facebook page at https://www.facebook.com/completecloud.guru/ Finally, I have a new YouTube channel coming soon, so please follow one of the above to be updated when it's released! From 182d57ecd1296a09f70eb6ca16d178fbc71db146 Mon Sep 17 00:00:00 2001 From: carinedj Date: Mon, 16 Sep 2024 15:10:10 +0200 Subject: [PATCH 07/13] Sync with gitHub --- MyShop/MyShop.DataAccess.SQL/DataContext.cs | 10 +++++----- MyShop/MyShop.WebUI.Tests/MyShop.WebUI.Tests.csproj | 3 +++ MyShop/MyShop.WebUI.Tests/packages.config | 1 + MyShop/MyShop.WebUI/Controllers/HomeController.cs | 1 + MyShop/MyShop.WebUI/Views/ProductManager/Create.cshtml | 2 +- MyShop/MyShop.WebUI/Views/ProductManager/Edit.cshtml | 2 +- MyShop/MyShop.sln | 4 ++-- 7 files changed, 14 insertions(+), 9 deletions(-) diff --git a/MyShop/MyShop.DataAccess.SQL/DataContext.cs b/MyShop/MyShop.DataAccess.SQL/DataContext.cs index b26d07c..b8319c1 100644 --- a/MyShop/MyShop.DataAccess.SQL/DataContext.cs +++ b/MyShop/MyShop.DataAccess.SQL/DataContext.cs @@ -17,10 +17,10 @@ public DataContext() public DbSet Products { get; set; } public DbSet ProductCategories { get; set; } - public DbSet Baskets { get; set; } - public DbSet BasketItems { get; set; } - public DbSet Customers { get; set; } - public DbSet Orders { get; set; } - public DbSet OrderItems { get; set; } + //public DbSet Baskets { get; set; } + //public DbSet BasketItems { get; set; } + //public DbSet Customers { get; set; } + //public DbSet Orders { get; set; } + //public DbSet OrderItems { get; set; } } } diff --git a/MyShop/MyShop.WebUI.Tests/MyShop.WebUI.Tests.csproj b/MyShop/MyShop.WebUI.Tests/MyShop.WebUI.Tests.csproj index 8b6d9b6..6e1317e 100644 --- a/MyShop/MyShop.WebUI.Tests/MyShop.WebUI.Tests.csproj +++ b/MyShop/MyShop.WebUI.Tests/MyShop.WebUI.Tests.csproj @@ -1,4 +1,5 @@  + Debug @@ -25,6 +26,7 @@ DEBUG;TRACE prompt 4 + Off pdbonly @@ -122,6 +124,7 @@ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 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 - - - dbo - - \ No newline at end of file diff --git a/MyShop/MyShop.DataAccess.SQL/Migrations/201801101446455_AddedOrders.Designer.cs b/MyShop/MyShop.DataAccess.SQL/Migrations/201801101446455_AddedOrders.Designer.cs deleted file mode 100644 index 9140edf..0000000 --- a/MyShop/MyShop.DataAccess.SQL/Migrations/201801101446455_AddedOrders.Designer.cs +++ /dev/null @@ -1,29 +0,0 @@ -// -namespace MyShop.DataAccess.SQL.Migrations -{ - using System.CodeDom.Compiler; - using System.Data.Entity.Migrations; - using System.Data.Entity.Migrations.Infrastructure; - using System.Resources; - - [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] - public sealed partial class AddedOrders : IMigrationMetadata - { - private readonly ResourceManager Resources = new ResourceManager(typeof(AddedOrders)); - - string IMigrationMetadata.Id - { - get { return "201801101446455_AddedOrders"; } - } - - string IMigrationMetadata.Source - { - get { return null; } - } - - string IMigrationMetadata.Target - { - get { return Resources.GetString("Target"); } - } - } -} diff --git a/MyShop/MyShop.DataAccess.SQL/Migrations/201801101446455_AddedOrders.cs b/MyShop/MyShop.DataAccess.SQL/Migrations/201801101446455_AddedOrders.cs deleted file mode 100644 index e5cf09d..0000000 --- a/MyShop/MyShop.DataAccess.SQL/Migrations/201801101446455_AddedOrders.cs +++ /dev/null @@ -1,54 +0,0 @@ -namespace MyShop.DataAccess.SQL.Migrations -{ - using System; - using System.Data.Entity.Migrations; - - public partial class AddedOrders : DbMigration - { - public override void Up() - { - CreateTable( - "dbo.OrderItems", - c => new - { - Id = c.String(nullable: false, maxLength: 128), - OrderId = c.String(maxLength: 128), - ProductId = c.String(), - ProductName = c.String(), - Price = c.Decimal(nullable: false, precision: 18, scale: 2), - Image = c.String(), - Quanity = c.Int(nullable: false), - CreatedAt = c.DateTimeOffset(nullable: false, precision: 7), - }) - .PrimaryKey(t => t.Id) - .ForeignKey("dbo.Orders", t => t.OrderId) - .Index(t => t.OrderId); - - CreateTable( - "dbo.Orders", - c => new - { - Id = c.String(nullable: false, maxLength: 128), - FirstName = c.String(), - Surname = c.String(), - Email = c.String(), - Street = c.String(), - City = c.String(), - State = c.String(), - ZipCode = c.String(), - OrderStatus = c.String(), - CreatedAt = c.DateTimeOffset(nullable: false, precision: 7), - }) - .PrimaryKey(t => t.Id); - - } - - public override void Down() - { - DropForeignKey("dbo.OrderItems", "OrderId", "dbo.Orders"); - DropIndex("dbo.OrderItems", new[] { "OrderId" }); - DropTable("dbo.Orders"); - DropTable("dbo.OrderItems"); - } - } -} diff --git a/MyShop/MyShop.DataAccess.SQL/Migrations/201801101446455_AddedOrders.resx b/MyShop/MyShop.DataAccess.SQL/Migrations/201801101446455_AddedOrders.resx deleted file mode 100644 index 683873b..0000000 --- a/MyShop/MyShop.DataAccess.SQL/Migrations/201801101446455_AddedOrders.resx +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 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 - - - dbo - - \ No newline at end of file diff --git a/MyShop/MyShop.DataAccess.SQL/Migrations/201711071327340_Initial.Designer.cs b/MyShop/MyShop.DataAccess.SQL/Migrations/202409170919450_Initial.Designer.cs similarity index 93% rename from MyShop/MyShop.DataAccess.SQL/Migrations/201711071327340_Initial.Designer.cs rename to MyShop/MyShop.DataAccess.SQL/Migrations/202409170919450_Initial.Designer.cs index 41c1d99..c133c6f 100644 --- a/MyShop/MyShop.DataAccess.SQL/Migrations/201711071327340_Initial.Designer.cs +++ b/MyShop/MyShop.DataAccess.SQL/Migrations/202409170919450_Initial.Designer.cs @@ -13,7 +13,7 @@ public sealed partial class Initial : IMigrationMetadata string IMigrationMetadata.Id { - get { return "201711071327340_Initial"; } + get { return "202409170919450_Initial"; } } string IMigrationMetadata.Source diff --git a/MyShop/MyShop.DataAccess.SQL/Migrations/201711091321341_AddBasket.cs b/MyShop/MyShop.DataAccess.SQL/Migrations/202409170919450_Initial.cs similarity index 96% rename from MyShop/MyShop.DataAccess.SQL/Migrations/201711091321341_AddBasket.cs rename to MyShop/MyShop.DataAccess.SQL/Migrations/202409170919450_Initial.cs index c49304a..4560e16 100644 --- a/MyShop/MyShop.DataAccess.SQL/Migrations/201711091321341_AddBasket.cs +++ b/MyShop/MyShop.DataAccess.SQL/Migrations/202409170919450_Initial.cs @@ -3,7 +3,7 @@ namespace MyShop.DataAccess.SQL.Migrations using System; using System.Data.Entity.Migrations; - public partial class AddBasket : DbMigration + public partial class Initial : DbMigration { public override void Up() { diff --git a/MyShop/MyShop.DataAccess.SQL/Migrations/201711091321341_AddBasket.resx b/MyShop/MyShop.DataAccess.SQL/Migrations/202409170919450_Initial.resx similarity index 100% rename from MyShop/MyShop.DataAccess.SQL/Migrations/201711091321341_AddBasket.resx rename to MyShop/MyShop.DataAccess.SQL/Migrations/202409170919450_Initial.resx diff --git a/MyShop/MyShop.DataAccess.SQL/Migrations/201711091321341_AddBasket.Designer.cs b/MyShop/MyShop.DataAccess.SQL/Migrations/202409170922120_AddBasket.Designer.cs similarity index 93% rename from MyShop/MyShop.DataAccess.SQL/Migrations/201711091321341_AddBasket.Designer.cs rename to MyShop/MyShop.DataAccess.SQL/Migrations/202409170922120_AddBasket.Designer.cs index eafc335..bf91e8d 100644 --- a/MyShop/MyShop.DataAccess.SQL/Migrations/201711091321341_AddBasket.Designer.cs +++ b/MyShop/MyShop.DataAccess.SQL/Migrations/202409170922120_AddBasket.Designer.cs @@ -13,7 +13,7 @@ public sealed partial class AddBasket : IMigrationMetadata string IMigrationMetadata.Id { - get { return "201711091321341_AddBasket"; } + get { return "202409170922120_AddBasket"; } } string IMigrationMetadata.Source diff --git a/MyShop/MyShop.DataAccess.SQL/Migrations/202409170922120_AddBasket.cs b/MyShop/MyShop.DataAccess.SQL/Migrations/202409170922120_AddBasket.cs new file mode 100644 index 0000000..6bd019b --- /dev/null +++ b/MyShop/MyShop.DataAccess.SQL/Migrations/202409170922120_AddBasket.cs @@ -0,0 +1,16 @@ +namespace MyShop.DataAccess.SQL.Migrations +{ + using System; + using System.Data.Entity.Migrations; + + public partial class AddBasket : DbMigration + { + public override void Up() + { + } + + public override void Down() + { + } + } +} diff --git a/MyShop/MyShop.DataAccess.SQL/Migrations/201711071327340_Initial.resx b/MyShop/MyShop.DataAccess.SQL/Migrations/202409170922120_AddBasket.resx similarity index 72% rename from MyShop/MyShop.DataAccess.SQL/Migrations/201711071327340_Initial.resx rename to MyShop/MyShop.DataAccess.SQL/Migrations/202409170922120_AddBasket.resx index d610280..ab9f8cd 100644 --- a/MyShop/MyShop.DataAccess.SQL/Migrations/201711071327340_Initial.resx +++ b/MyShop/MyShop.DataAccess.SQL/Migrations/202409170922120_AddBasket.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 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 dbo diff --git a/MyShop/MyShop.DataAccess.SQL/MyShop.DataAccess.SQL.csproj b/MyShop/MyShop.DataAccess.SQL/MyShop.DataAccess.SQL.csproj index eddc306..28b284f 100644 --- a/MyShop/MyShop.DataAccess.SQL/MyShop.DataAccess.SQL.csproj +++ b/MyShop/MyShop.DataAccess.SQL/MyShop.DataAccess.SQL.csproj @@ -48,21 +48,13 @@ - - - 201711071327340_Initial.cs + + + 202409170919450_Initial.cs - - - 201711091321341_AddBasket.cs - - - - 201801032024566_AddCustomer.cs - - - - 201801101446455_AddedOrders.cs + + + 202409170922120_AddBasket.cs @@ -79,17 +71,11 @@ - - 201711071327340_Initial.cs - - - 201711091321341_AddBasket.cs - - - 201801032024566_AddCustomer.cs + + 202409170919450_Initial.cs - - 201801101446455_AddedOrders.cs + + 202409170922120_AddBasket.cs From 935f5983ab79be72b806042216f8775f73dcfb63 Mon Sep 17 00:00:00 2001 From: carinedj Date: Tue, 17 Sep 2024 14:39:52 +0200 Subject: [PATCH 11/13] Push to my github --- MyShop/MyShop.WebUI/Views/Shared/_Layout.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MyShop/MyShop.WebUI/Views/Shared/_Layout.cshtml b/MyShop/MyShop.WebUI/Views/Shared/_Layout.cshtml index f9ad8b0..b1165b5 100644 --- a/MyShop/MyShop.WebUI/Views/Shared/_Layout.cshtml +++ b/MyShop/MyShop.WebUI/Views/Shared/_Layout.cshtml @@ -3,7 +3,7 @@ - @ViewBag.Title - My ASP.NET Application + @ViewBag.Title - My TEST ASP.NET Application @Styles.Render("~/Content/css") @Scripts.Render("~/bundles/modernizr") From d7e7d8001a85aacc5f946af1e1045305c4c3ddff Mon Sep 17 00:00:00 2001 From: carinedj Date: Thu, 19 Sep 2024 11:32:27 +0200 Subject: [PATCH 12/13] changes --- MyShop/MyShop.WebUI/Controllers/HomeController.cs | 13 ++++++++----- MyShop/MyShop.WebUI/MyShop.WebUI.csproj | 1 - MyShop/MyShop.WebUI/Views/Home/Details.cshtml | 10 +++++----- MyShop/MyShop.WebUI/Views/Home/Index.cshtml | 2 +- MyShop/MyShop.WebUI/Views/Shared/_Layout.cshtml | 11 +++-------- 5 files changed, 17 insertions(+), 20 deletions(-) diff --git a/MyShop/MyShop.WebUI/Controllers/HomeController.cs b/MyShop/MyShop.WebUI/Controllers/HomeController.cs index f6612ad..0760bfc 100644 --- a/MyShop/MyShop.WebUI/Controllers/HomeController.cs +++ b/MyShop/MyShop.WebUI/Controllers/HomeController.cs @@ -20,17 +20,17 @@ public HomeController(IRepository productContext, IRepository products; List categories = productCategories.Collection().ToList(); - //var categories = productCategories.Collection().ToList(); if (Category == null) { products = context.Collection().ToList(); } - else { + else + { products = context.Collection().Where(p => p.Category == Category).ToList(); } @@ -38,16 +38,19 @@ public ActionResult Index(string Category=null) model.Products = products; model.ProductCategories = categories; + return View(model); } - public ActionResult Details(string Id) { + public ActionResult Details(string Id) + { Product product = context.Find(Id); if (product == null) { return HttpNotFound(); } - else { + else + { return View(product); } } diff --git a/MyShop/MyShop.WebUI/MyShop.WebUI.csproj b/MyShop/MyShop.WebUI/MyShop.WebUI.csproj index ffde975..95c4839 100644 --- a/MyShop/MyShop.WebUI/MyShop.WebUI.csproj +++ b/MyShop/MyShop.WebUI/MyShop.WebUI.csproj @@ -271,7 +271,6 @@ - diff --git a/MyShop/MyShop.WebUI/Views/Home/Details.cshtml b/MyShop/MyShop.WebUI/Views/Home/Details.cshtml index 99d2e45..3a0cfe0 100644 --- a/MyShop/MyShop.WebUI/Views/Home/Details.cshtml +++ b/MyShop/MyShop.WebUI/Views/Home/Details.cshtml @@ -4,15 +4,15 @@ ViewBag.Title = Model.Name + " Details"; } -

@Html.DisplayFor(model=>model.Name)

+

@Html.DisplayFor(model => model.Name)

- +
- +
@Html.DisplayNameFor(model => model.Description) @@ -37,5 +37,5 @@
@Html.ActionLink("Back to List", "Index")
-
-
+
+
\ No newline at end of file diff --git a/MyShop/MyShop.WebUI/Views/Home/Index.cshtml b/MyShop/MyShop.WebUI/Views/Home/Index.cshtml index c661cfa..b9558fd 100644 --- a/MyShop/MyShop.WebUI/Views/Home/Index.cshtml +++ b/MyShop/MyShop.WebUI/Views/Home/Index.cshtml @@ -1,4 +1,4 @@ -@model MyShop.Core.ViewModels.ProductListViewModel +@model MyShop.Core.ViewModels.ProductListViewModel @{ ViewBag.Title = "Home Page"; } diff --git a/MyShop/MyShop.WebUI/Views/Shared/_Layout.cshtml b/MyShop/MyShop.WebUI/Views/Shared/_Layout.cshtml index f9ad8b0..7914d68 100644 --- a/MyShop/MyShop.WebUI/Views/Shared/_Layout.cshtml +++ b/MyShop/MyShop.WebUI/Views/Shared/_Layout.cshtml @@ -22,15 +22,10 @@
  • @Html.ActionLink("Home", "Index", "Home")
    • -@if (Request.IsAuthenticated && User.IsInRole("Admin")) -{ -
  • @Html.ActionLink("Admin", "Index", "Admin")
    • -} +
  • @Html.ActionLink("About", "About", "Home")
    • +
  • @Html.ActionLink("Contact", "Contact", "Home")
@Html.Partial("_LoginPartial") - @{ - Html.RenderAction("BasketSummary", "Basket"); - }
@@ -46,4 +41,4 @@ @Scripts.Render("~/bundles/bootstrap") @RenderSection("scripts", required: false) - + \ No newline at end of file From 99c53e6fa0d8e5dc9e802be23a8c579f310b0969 Mon Sep 17 00:00:00 2001 From: carinedj Date: Thu, 19 Sep 2024 15:36:48 +0200 Subject: [PATCH 13/13] CustomerModel changes --- MyShop/MyShop.DataAccess.SQL/DataContext.cs | 7 +- .../Migrations/202409170919450_Initial.cs | 43 ------ .../202409191004213_AddCustomer.Designer.cs | 29 ++++ .../Migrations/202409191004213_AddCustomer.cs | 16 +++ ....resx => 202409191004213_AddCustomer.resx} | 2 +- ...cs => 202409191228545_Initial.Designer.cs} | 2 +- .../Migrations/202409191228545_Initial.cs | 16 +++ .../Migrations/202409191228545_Initial.resx | 126 ++++++++++++++++++ .../MyShop.DataAccess.SQL.csproj | 21 ++- 9 files changed, 207 insertions(+), 55 deletions(-) delete mode 100644 MyShop/MyShop.DataAccess.SQL/Migrations/202409170919450_Initial.cs create mode 100644 MyShop/MyShop.DataAccess.SQL/Migrations/202409191004213_AddCustomer.Designer.cs create mode 100644 MyShop/MyShop.DataAccess.SQL/Migrations/202409191004213_AddCustomer.cs rename MyShop/MyShop.DataAccess.SQL/Migrations/{202409170919450_Initial.resx => 202409191004213_AddCustomer.resx} (70%) rename MyShop/MyShop.DataAccess.SQL/Migrations/{202409170919450_Initial.Designer.cs => 202409191228545_Initial.Designer.cs} (93%) create mode 100644 MyShop/MyShop.DataAccess.SQL/Migrations/202409191228545_Initial.cs create mode 100644 MyShop/MyShop.DataAccess.SQL/Migrations/202409191228545_Initial.resx diff --git a/MyShop/MyShop.DataAccess.SQL/DataContext.cs b/MyShop/MyShop.DataAccess.SQL/DataContext.cs index b71d2d3..70cc391 100644 --- a/MyShop/MyShop.DataAccess.SQL/DataContext.cs +++ b/MyShop/MyShop.DataAccess.SQL/DataContext.cs @@ -11,7 +11,8 @@ namespace MyShop.DataAccess.SQL public class DataContext : DbContext { public DataContext() - : base("DefaultConnection") { + : base("DefaultConnection") + { } @@ -19,8 +20,8 @@ public DataContext() public DbSet ProductCategories { get; set; } public DbSet Baskets { get; set; } public DbSet BasketItems { get; set; } - //public DbSet Customers { get; set; } + public DbSet Customers { get; set; } //public DbSet Orders { get; set; } //public DbSet OrderItems { get; set; } } -} +} \ No newline at end of file diff --git a/MyShop/MyShop.DataAccess.SQL/Migrations/202409170919450_Initial.cs b/MyShop/MyShop.DataAccess.SQL/Migrations/202409170919450_Initial.cs deleted file mode 100644 index 4560e16..0000000 --- a/MyShop/MyShop.DataAccess.SQL/Migrations/202409170919450_Initial.cs +++ /dev/null @@ -1,43 +0,0 @@ -namespace MyShop.DataAccess.SQL.Migrations -{ - using System; - using System.Data.Entity.Migrations; - - public partial class Initial : DbMigration - { - public override void Up() - { - CreateTable( - "dbo.BasketItems", - c => new - { - Id = c.String(nullable: false, maxLength: 128), - BasketId = c.String(maxLength: 128), - ProductId = c.String(), - Quanity = c.Int(nullable: false), - CreatedAt = c.DateTimeOffset(nullable: false, precision: 7), - }) - .PrimaryKey(t => t.Id) - .ForeignKey("dbo.Baskets", t => t.BasketId) - .Index(t => t.BasketId); - - CreateTable( - "dbo.Baskets", - c => new - { - Id = c.String(nullable: false, maxLength: 128), - CreatedAt = c.DateTimeOffset(nullable: false, precision: 7), - }) - .PrimaryKey(t => t.Id); - - } - - public override void Down() - { - DropForeignKey("dbo.BasketItems", "BasketId", "dbo.Baskets"); - DropIndex("dbo.BasketItems", new[] { "BasketId" }); - DropTable("dbo.Baskets"); - DropTable("dbo.BasketItems"); - } - } -} diff --git a/MyShop/MyShop.DataAccess.SQL/Migrations/202409191004213_AddCustomer.Designer.cs b/MyShop/MyShop.DataAccess.SQL/Migrations/202409191004213_AddCustomer.Designer.cs new file mode 100644 index 0000000..f50cb3e --- /dev/null +++ b/MyShop/MyShop.DataAccess.SQL/Migrations/202409191004213_AddCustomer.Designer.cs @@ -0,0 +1,29 @@ +// +namespace MyShop.DataAccess.SQL.Migrations +{ + using System.CodeDom.Compiler; + using System.Data.Entity.Migrations; + using System.Data.Entity.Migrations.Infrastructure; + using System.Resources; + + [GeneratedCode("EntityFramework.Migrations", "6.2.0-61023")] + public sealed partial class AddCustomer : IMigrationMetadata + { + private readonly ResourceManager Resources = new ResourceManager(typeof(AddCustomer)); + + string IMigrationMetadata.Id + { + get { return "202409191004213_AddCustomer"; } + } + + string IMigrationMetadata.Source + { + get { return null; } + } + + string IMigrationMetadata.Target + { + get { return Resources.GetString("Target"); } + } + } +} diff --git a/MyShop/MyShop.DataAccess.SQL/Migrations/202409191004213_AddCustomer.cs b/MyShop/MyShop.DataAccess.SQL/Migrations/202409191004213_AddCustomer.cs new file mode 100644 index 0000000..4fb6bff --- /dev/null +++ b/MyShop/MyShop.DataAccess.SQL/Migrations/202409191004213_AddCustomer.cs @@ -0,0 +1,16 @@ +namespace MyShop.DataAccess.SQL.Migrations +{ + using System; + using System.Data.Entity.Migrations; + + public partial class AddCustomer : DbMigration + { + public override void Up() + { + } + + public override void Down() + { + } + } +} diff --git a/MyShop/MyShop.DataAccess.SQL/Migrations/202409170919450_Initial.resx b/MyShop/MyShop.DataAccess.SQL/Migrations/202409191004213_AddCustomer.resx similarity index 70% rename from MyShop/MyShop.DataAccess.SQL/Migrations/202409170919450_Initial.resx rename to MyShop/MyShop.DataAccess.SQL/Migrations/202409191004213_AddCustomer.resx index ab9f8cd..f458e03 100644 --- a/MyShop/MyShop.DataAccess.SQL/Migrations/202409170919450_Initial.resx +++ b/MyShop/MyShop.DataAccess.SQL/Migrations/202409191004213_AddCustomer.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 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 dbo diff --git a/MyShop/MyShop.DataAccess.SQL/Migrations/202409170919450_Initial.Designer.cs b/MyShop/MyShop.DataAccess.SQL/Migrations/202409191228545_Initial.Designer.cs similarity index 93% rename from MyShop/MyShop.DataAccess.SQL/Migrations/202409170919450_Initial.Designer.cs rename to MyShop/MyShop.DataAccess.SQL/Migrations/202409191228545_Initial.Designer.cs index c133c6f..37f5aa2 100644 --- a/MyShop/MyShop.DataAccess.SQL/Migrations/202409170919450_Initial.Designer.cs +++ b/MyShop/MyShop.DataAccess.SQL/Migrations/202409191228545_Initial.Designer.cs @@ -13,7 +13,7 @@ public sealed partial class Initial : IMigrationMetadata string IMigrationMetadata.Id { - get { return "202409170919450_Initial"; } + get { return "202409191228545_Initial"; } } string IMigrationMetadata.Source diff --git a/MyShop/MyShop.DataAccess.SQL/Migrations/202409191228545_Initial.cs b/MyShop/MyShop.DataAccess.SQL/Migrations/202409191228545_Initial.cs new file mode 100644 index 0000000..55da6cf --- /dev/null +++ b/MyShop/MyShop.DataAccess.SQL/Migrations/202409191228545_Initial.cs @@ -0,0 +1,16 @@ +namespace MyShop.DataAccess.SQL.Migrations +{ + using System; + using System.Data.Entity.Migrations; + + public partial class Initial : DbMigration + { + public override void Up() + { + } + + public override void Down() + { + } + } +} diff --git a/MyShop/MyShop.DataAccess.SQL/Migrations/202409191228545_Initial.resx b/MyShop/MyShop.DataAccess.SQL/Migrations/202409191228545_Initial.resx new file mode 100644 index 0000000..f458e03 --- /dev/null +++ b/MyShop/MyShop.DataAccess.SQL/Migrations/202409191228545_Initial.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 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 + + + dbo + + \ No newline at end of file diff --git a/MyShop/MyShop.DataAccess.SQL/MyShop.DataAccess.SQL.csproj b/MyShop/MyShop.DataAccess.SQL/MyShop.DataAccess.SQL.csproj index 28b284f..feb4a3f 100644 --- a/MyShop/MyShop.DataAccess.SQL/MyShop.DataAccess.SQL.csproj +++ b/MyShop/MyShop.DataAccess.SQL/MyShop.DataAccess.SQL.csproj @@ -48,14 +48,18 @@ - - - 202409170919450_Initial.cs - 202409170922120_AddBasket.cs + + + 202409191004213_AddCustomer.cs + + + + 202409191228545_Initial.cs + @@ -71,12 +75,15 @@ - - 202409170919450_Initial.cs - 202409170922120_AddBasket.cs + + 202409191004213_AddCustomer.cs + + + 202409191228545_Initial.cs + \ No newline at end of file