From 93a05ee7f292046c7a972a26e20017a375e02d02 Mon Sep 17 00:00:00 2001
From: Chris Mills <crmills@fsu.edu>
Date: Wed, 19 Feb 2025 14:22:56 -0500
Subject: [PATCH 1/8] added shopping cart service and item wrapper for product

---
 Library.eCommerce/Models/Item.cs              | 28 +++++++++++++++
 .../Services/ProductServiceProxy.cs           | 30 ++++++++--------
 .../Services/ShoppingCartService.cs           | 36 +++++++++++++++++++
 .../InventoryManagementViewModel.cs           | 13 +++----
 Maui.eCommerce/ViewModels/ProductViewModel.cs | 15 ++++----
 5 files changed, 95 insertions(+), 27 deletions(-)
 create mode 100644 Library.eCommerce/Models/Item.cs
 create mode 100644 Library.eCommerce/Services/ShoppingCartService.cs

diff --git a/Library.eCommerce/Models/Item.cs b/Library.eCommerce/Models/Item.cs
new file mode 100644
index 0000000..59999e8
--- /dev/null
+++ b/Library.eCommerce/Models/Item.cs
@@ -0,0 +1,28 @@
+using Spring2025_Samples.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Library.eCommerce.Models
+{
+    public class Item
+    {
+        public int Id { get; set; }
+        public Product Product { get; set; }
+        public int Quantity { get; set; }
+
+        public string Display { 
+            get
+            {
+                return Product?.Display ?? string.Empty;
+            }
+        }
+
+        public Item()
+        {
+            Product = new Product();
+        }
+    }
+}
diff --git a/Library.eCommerce/Services/ProductServiceProxy.cs b/Library.eCommerce/Services/ProductServiceProxy.cs
index 0137a8c..bba63a3 100644
--- a/Library.eCommerce/Services/ProductServiceProxy.cs
+++ b/Library.eCommerce/Services/ProductServiceProxy.cs
@@ -1,4 +1,5 @@
-using Spring2025_Samples.Models;
+using Library.eCommerce.Models;
+using Spring2025_Samples.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -11,11 +12,11 @@ public class ProductServiceProxy
     {
         private ProductServiceProxy()
         {
-            Products = new List<Product?>
+            Products = new List<Item?>
             {
-                new Product{Id = 1, Name ="Product 1"},
-                new Product{Id = 2, Name ="Product 2"},
-                new Product{Id = 3, Name ="Product 3"}
+                new Item{ Product = new Product{Id = 1, Name ="Product 1"}, Id = 1, Quantity = 1 },
+                new Item{ Product = new Product{Id = 2, Name ="Product 2"}, Id = 2 , Quantity = 2 },
+                new Item{ Product = new Product{Id = 3, Name ="Product 3"}, Id=3 , Quantity = 3 }
             };
         }
 
@@ -50,35 +51,36 @@ public static ProductServiceProxy Current
             }
         }
 
-        public List<Product?> Products { get; private set; }
+        public List<Item?> Products { get; private set; }
 
 
-        public Product AddOrUpdate(Product product)
+        public Item AddOrUpdate(Item item)
         {
-            if(product.Id == 0)
+            if(item.Id == 0)
             {
-                product.Id = LastKey + 1;
-                Products.Add(product);
+                item.Id = LastKey + 1;
+                item.Product.Id = item.Id;
+                Products.Add(item);
             }
 
 
-            return product;
+            return item;
         }
 
-        public Product? Delete(int id)
+        public Item? Delete(int id)
         {
             if(id == 0)
             {
                 return null;
             }
 
-            Product? product = Products.FirstOrDefault(p => p.Id == id);
+            Item? product = Products.FirstOrDefault(p => p.Id == id);
             Products.Remove(product);
 
             return product;
         }
 
-        public Product? GetById(int id)
+        public Item? GetById(int id)
         {
             return Products.FirstOrDefault(p => p.Id == id);
         }
diff --git a/Library.eCommerce/Services/ShoppingCartService.cs b/Library.eCommerce/Services/ShoppingCartService.cs
new file mode 100644
index 0000000..c603e67
--- /dev/null
+++ b/Library.eCommerce/Services/ShoppingCartService.cs
@@ -0,0 +1,36 @@
+using Spring2025_Samples.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Library.eCommerce.Services
+{
+    public class ShoppingCartService
+    {
+        private List<Product> items;
+        public List<Product> CartItems
+        {
+            get
+            {
+                return items;
+            }
+        }
+        public static ShoppingCartService Current {  
+            get
+            {
+                if(instance == null)
+                {
+                    instance = new ShoppingCartService();
+                }
+
+                return instance;
+            } 
+        }
+        private static ShoppingCartService? instance;
+        private ShoppingCartService() { 
+            items = new List<Product>();
+        }
+    }
+}
diff --git a/Maui.eCommerce/ViewModels/InventoryManagementViewModel.cs b/Maui.eCommerce/ViewModels/InventoryManagementViewModel.cs
index 2d5a259..0d0f245 100644
--- a/Maui.eCommerce/ViewModels/InventoryManagementViewModel.cs
+++ b/Maui.eCommerce/ViewModels/InventoryManagementViewModel.cs
@@ -1,4 +1,5 @@
-using Library.eCommerce.Services;
+using Library.eCommerce.Models;
+using Library.eCommerce.Services;
 using Spring2025_Samples.Models;
 using System;
 using System.Collections.Generic;
@@ -13,7 +14,7 @@ namespace Maui.eCommerce.ViewModels
 {
     public class InventoryManagementViewModel : INotifyPropertyChanged
     {
-        public Product? SelectedProduct { get; set; }
+        public Item? SelectedProduct { get; set; }
         public string? Query { get; set; }
         private ProductServiceProxy _svc = ProductServiceProxy.Current;
 
@@ -34,16 +35,16 @@ public void RefreshProductList()
             NotifyPropertyChanged(nameof(Products));
         }
 
-        public ObservableCollection<Product?> Products
+        public ObservableCollection<Item?> Products
         {
             get
             {
-                var filteredList = _svc.Products.Where(p => p?.Name?.ToLower().Contains(Query?.ToLower() ?? string.Empty) ?? false);
-                return new ObservableCollection<Product?>(filteredList);
+                var filteredList = _svc.Products.Where(p => p?.Product?.Name?.ToLower().Contains(Query?.ToLower() ?? string.Empty) ?? false);
+                return new ObservableCollection<Item?>(filteredList);
             }
         }
 
-        public Product? Delete()
+        public Item? Delete()
         {
             var item = _svc.Delete(SelectedProduct?.Id ?? 0);
             NotifyPropertyChanged("Products");
diff --git a/Maui.eCommerce/ViewModels/ProductViewModel.cs b/Maui.eCommerce/ViewModels/ProductViewModel.cs
index 6b094b8..b835f46 100644
--- a/Maui.eCommerce/ViewModels/ProductViewModel.cs
+++ b/Maui.eCommerce/ViewModels/ProductViewModel.cs
@@ -1,4 +1,5 @@
-using Library.eCommerce.Services;
+using Library.eCommerce.Models;
+using Library.eCommerce.Services;
 using Spring2025_Samples.Models;
 using System;
 using System.Collections.Generic;
@@ -13,19 +14,19 @@ public class ProductViewModel
         public string? Name { 
             get
             {
-                return Model?.Name ?? string.Empty;
+                return Model?.Product?.Name ?? string.Empty;
             }
 
             set
             {
-                if(Model != null && Model.Name != value)
+                if(Model != null && Model.Product?.Name != value)
                 {
-                    Model.Name = value;
+                    Model.Product.Name = value;
                 }
             }
         }
 
-        public Product? Model { get; set; }
+        public Item? Model { get; set; }
 
         public void AddOrUpdate()
         {
@@ -33,10 +34,10 @@ public void AddOrUpdate()
         }
 
         public ProductViewModel() {
-            Model = new Product();
+            Model = new Item();
         }
 
-        public ProductViewModel(Product? model)
+        public ProductViewModel(Item? model)
         {
             Model = model;
         }

From 31ecc2c822be2caeeb59df817d5742a91e06f258 Mon Sep 17 00:00:00 2001
From: Chris Mills <crmills@fsu.edu>
Date: Mon, 24 Feb 2025 13:10:33 -0500
Subject: [PATCH 2/8] refactor shopping cart service

---
 Library.eCommerce/Services/ShoppingCartService.cs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Library.eCommerce/Services/ShoppingCartService.cs b/Library.eCommerce/Services/ShoppingCartService.cs
index c603e67..c5c9447 100644
--- a/Library.eCommerce/Services/ShoppingCartService.cs
+++ b/Library.eCommerce/Services/ShoppingCartService.cs
@@ -1,4 +1,5 @@
-using Spring2025_Samples.Models;
+using Library.eCommerce.Models;
+using Spring2025_Samples.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -9,8 +10,9 @@ namespace Library.eCommerce.Services
 {
     public class ShoppingCartService
     {
-        private List<Product> items;
-        public List<Product> CartItems
+        private ProductServiceProxy _prodSvc;
+        private List<Item> items;
+        public List<Item> CartItems
         {
             get
             {
@@ -30,7 +32,7 @@ public static ShoppingCartService Current {
         }
         private static ShoppingCartService? instance;
         private ShoppingCartService() { 
-            items = new List<Product>();
+            items = new List<Item>();
         }
     }
 }

From c24e340c06c28e95d7a802798b6084a2b6e8a764 Mon Sep 17 00:00:00 2001
From: Chris Mills <crmills@fsu.edu>
Date: Mon, 24 Feb 2025 13:45:00 -0500
Subject: [PATCH 3/8] add quantity to the product details screen

---
 Library.eCommerce/Models/Item.cs                 |  2 +-
 .../Services/ShoppingCartService.cs              |  6 ------
 Maui.eCommerce/ViewModels/ProductViewModel.cs    | 16 ++++++++++++++++
 .../Views/InventoryManagementView.xaml.cs        |  2 +-
 Maui.eCommerce/Views/ProductDetails.xaml         |  7 +++++++
 5 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/Library.eCommerce/Models/Item.cs b/Library.eCommerce/Models/Item.cs
index 59999e8..6a8aaf7 100644
--- a/Library.eCommerce/Models/Item.cs
+++ b/Library.eCommerce/Models/Item.cs
@@ -11,7 +11,7 @@ public class Item
     {
         public int Id { get; set; }
         public Product Product { get; set; }
-        public int Quantity { get; set; }
+        public int? Quantity { get; set; }
 
         public string Display { 
             get
diff --git a/Library.eCommerce/Services/ShoppingCartService.cs b/Library.eCommerce/Services/ShoppingCartService.cs
index c5c9447..3e7cffd 100644
--- a/Library.eCommerce/Services/ShoppingCartService.cs
+++ b/Library.eCommerce/Services/ShoppingCartService.cs
@@ -1,10 +1,4 @@
 using Library.eCommerce.Models;
-using Spring2025_Samples.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Library.eCommerce.Services
 {
diff --git a/Maui.eCommerce/ViewModels/ProductViewModel.cs b/Maui.eCommerce/ViewModels/ProductViewModel.cs
index b835f46..7b9bffb 100644
--- a/Maui.eCommerce/ViewModels/ProductViewModel.cs
+++ b/Maui.eCommerce/ViewModels/ProductViewModel.cs
@@ -26,6 +26,22 @@ public string? Name {
             }
         }
 
+        public int? Quantity
+        {
+            get
+            {
+                return Model?.Quantity;
+            }
+
+            set
+            {
+                if( Model != null && Model.Quantity != value)
+                {
+                    Model.Quantity = value;
+                }
+            }
+        }
+
         public Item? Model { get; set; }
 
         public void AddOrUpdate()
diff --git a/Maui.eCommerce/Views/InventoryManagementView.xaml.cs b/Maui.eCommerce/Views/InventoryManagementView.xaml.cs
index f486963..1cd3c4a 100644
--- a/Maui.eCommerce/Views/InventoryManagementView.xaml.cs
+++ b/Maui.eCommerce/Views/InventoryManagementView.xaml.cs
@@ -32,7 +32,7 @@ private void ContentPage_NavigatedTo(object sender, NavigatedToEventArgs e)
     }
 
     private void EditClicked(object sender, EventArgs e)
-    {//TODO: ?????????????
+    {
         var productId = (BindingContext as InventoryManagementViewModel)?.SelectedProduct?.Id;
         Shell.Current.GoToAsync($"//Product?productId={productId}");
     }
diff --git a/Maui.eCommerce/Views/ProductDetails.xaml b/Maui.eCommerce/Views/ProductDetails.xaml
index 3e2c98a..67fad38 100644
--- a/Maui.eCommerce/Views/ProductDetails.xaml
+++ b/Maui.eCommerce/Views/ProductDetails.xaml
@@ -13,6 +13,13 @@
         <Entry
             Text="{Binding Name}"
             />
+        <Label 
+            Text="Quantity:"
+            VerticalOptions="Center" 
+            HorizontalOptions="Center" />
+        <Entry
+            Text="{Binding Quantity}"
+            />
         <Button Text="Ok" Clicked="OkClicked"/>
         <Button Text="Go Back" Clicked="GoBackClicked"/>
     </VerticalStackLayout>

From 7b6e2f82ecac691d237e048e063da67cbfbed195 Mon Sep 17 00:00:00 2001
From: Chris Mills <crmills@fsu.edu>
Date: Mon, 24 Feb 2025 14:22:11 -0500
Subject: [PATCH 4/8] adding inventory to the shopping view

---
 Library.eCommerce/Models/Item.cs              |  5 ++++
 Maui.eCommerce/AppShell.xaml                  |  4 +++
 Maui.eCommerce/MainPage.xaml                  |  3 +-
 Maui.eCommerce/MainPage.xaml.cs               |  5 ++++
 Maui.eCommerce/Maui.eCommerce.csproj          |  3 ++
 .../ViewModels/ShoppingManagementViewModel.cs | 24 +++++++++++++++
 .../Views/ShoppingManagementView.xaml         | 30 +++++++++++++++++++
 .../Views/ShoppingManagementView.xaml.cs      | 17 +++++++++++
 8 files changed, 90 insertions(+), 1 deletion(-)
 create mode 100644 Maui.eCommerce/ViewModels/ShoppingManagementViewModel.cs
 create mode 100644 Maui.eCommerce/Views/ShoppingManagementView.xaml
 create mode 100644 Maui.eCommerce/Views/ShoppingManagementView.xaml.cs

diff --git a/Library.eCommerce/Models/Item.cs b/Library.eCommerce/Models/Item.cs
index 6a8aaf7..e040136 100644
--- a/Library.eCommerce/Models/Item.cs
+++ b/Library.eCommerce/Models/Item.cs
@@ -13,6 +13,11 @@ public class Item
         public Product Product { get; set; }
         public int? Quantity { get; set; }
 
+        public override string ToString()
+        {
+            return $"{Product} Quantity:{Quantity}";
+        }
+
         public string Display { 
             get
             {
diff --git a/Maui.eCommerce/AppShell.xaml b/Maui.eCommerce/AppShell.xaml
index 6dfbb3b..71666d7 100644
--- a/Maui.eCommerce/AppShell.xaml
+++ b/Maui.eCommerce/AppShell.xaml
@@ -20,4 +20,8 @@
         Title="Inventory"
         ContentTemplate="{DataTemplate views:ProductDetails}"
         Route="Product" />
+    <ShellContent
+        Title="Shop"
+        ContentTemplate="{DataTemplate views:ShoppingManagementView}"
+        Route="ShoppingManagement" />
 </Shell>
diff --git a/Maui.eCommerce/MainPage.xaml b/Maui.eCommerce/MainPage.xaml
index 978a47c..f132d58 100644
--- a/Maui.eCommerce/MainPage.xaml
+++ b/Maui.eCommerce/MainPage.xaml
@@ -12,7 +12,8 @@
             Text="Inventory Management"
                 Clicked="InventoryClicked"/>
             <Button
-            Text="Shop"/>
+            Text="Shop"
+                Clicked="ShopClicked"/>
         </VerticalStackLayout>
     </ScrollView>
 
diff --git a/Maui.eCommerce/MainPage.xaml.cs b/Maui.eCommerce/MainPage.xaml.cs
index 2b7fdb4..f5d59f3 100644
--- a/Maui.eCommerce/MainPage.xaml.cs
+++ b/Maui.eCommerce/MainPage.xaml.cs
@@ -16,6 +16,11 @@ private void InventoryClicked(object sender, EventArgs e)
         {
             Shell.Current.GoToAsync("//InventoryManagement");
         }
+
+        private void ShopClicked(object sender, EventArgs e)
+        {
+            Shell.Current.GoToAsync("//ShoppingManagement");
+        }
     }
 
 }
diff --git a/Maui.eCommerce/Maui.eCommerce.csproj b/Maui.eCommerce/Maui.eCommerce.csproj
index 50ec32b..4cd7d17 100644
--- a/Maui.eCommerce/Maui.eCommerce.csproj
+++ b/Maui.eCommerce/Maui.eCommerce.csproj
@@ -73,6 +73,9 @@
 	  <MauiXaml Update="Views\ProductDetails.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="Views\ShoppingManagementView.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	</ItemGroup>
 
 </Project>
diff --git a/Maui.eCommerce/ViewModels/ShoppingManagementViewModel.cs b/Maui.eCommerce/ViewModels/ShoppingManagementViewModel.cs
new file mode 100644
index 0000000..b1a8444
--- /dev/null
+++ b/Maui.eCommerce/ViewModels/ShoppingManagementViewModel.cs
@@ -0,0 +1,24 @@
+using Library.eCommerce.Models;
+using Library.eCommerce.Services;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Maui.eCommerce.ViewModels
+{
+    public class ShoppingManagementViewModel
+    {
+        private ProductServiceProxy _invSvc = ProductServiceProxy.Current;
+
+        public ObservableCollection<Item?> Inventory
+        {
+            get
+            {
+                return new ObservableCollection<Item?>(_invSvc.Products);
+            }
+        }
+    }
+}
diff --git a/Maui.eCommerce/Views/ShoppingManagementView.xaml b/Maui.eCommerce/Views/ShoppingManagementView.xaml
new file mode 100644
index 0000000..e74a4b4
--- /dev/null
+++ b/Maui.eCommerce/Views/ShoppingManagementView.xaml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Maui.eCommerce.Views.ShoppingManagementView"
+             Title="ShoppingManagementView">
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition/><!--STORE-->
+            <ColumnDefinition/><!--USER SHOPPING CART-->
+        </Grid.ColumnDefinitions>
+
+        <!--STORE-->
+        <Grid Grid.Column="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="10*"/>
+                <RowDefinition/>
+            </Grid.RowDefinitions>
+            <ListView Grid.Row="0"
+                ItemsSource="{Binding Inventory}"
+                SelectedItem="{Binding SelectedItem}"
+                />
+            <Button Grid.Row="1" Text="+" Clicked="AddToCartClicked"/>
+        </Grid>
+
+        <!--USER SHOPPING CART-->
+        <Grid Grid.Column="1">
+            
+        </Grid>
+    </Grid>
+</ContentPage>
\ No newline at end of file
diff --git a/Maui.eCommerce/Views/ShoppingManagementView.xaml.cs b/Maui.eCommerce/Views/ShoppingManagementView.xaml.cs
new file mode 100644
index 0000000..a11a1e9
--- /dev/null
+++ b/Maui.eCommerce/Views/ShoppingManagementView.xaml.cs
@@ -0,0 +1,17 @@
+using Maui.eCommerce.ViewModels;
+
+namespace Maui.eCommerce.Views;
+
+public partial class ShoppingManagementView : ContentPage
+{
+	public ShoppingManagementView()
+	{
+		InitializeComponent();
+		BindingContext = new ShoppingManagementViewModel();
+	}
+
+    private void AddToCartClicked(object sender, EventArgs e)
+    {
+
+    }
+}
\ No newline at end of file

From c40759594014f9d1f3f49abff1ed0a2c69e2be8b Mon Sep 17 00:00:00 2001
From: crmillsfsu <97139671+crmillsfsu@users.noreply.github.com>
Date: Mon, 3 Mar 2025 16:09:49 -0500
Subject: [PATCH 5/8] Adding ability to add to the shopping cart at the same
 time as removing from the inventory

---
 Library.eCommerce/Models/Item.cs              |  8 +++++
 Library.eCommerce/Models/Product.cs           |  6 ++++
 .../Services/ProductServiceProxy.cs           |  6 ++++
 .../Services/ShoppingCartService.cs           | 31 ++++++++++++++++++-
 Maui.eCommerce/ViewModels/ProductViewModel.cs | 11 +++++++
 .../ViewModels/ShoppingManagementViewModel.cs | 30 +++++++++++++++++-
 Maui.eCommerce/Views/ProductDetails.xaml.cs   |  1 +
 .../Views/ShoppingManagementView.xaml         | 24 +++++++++++++-
 .../Views/ShoppingManagementView.xaml.cs      |  2 +-
 9 files changed, 115 insertions(+), 4 deletions(-)

diff --git a/Library.eCommerce/Models/Item.cs b/Library.eCommerce/Models/Item.cs
index e040136..db15bba 100644
--- a/Library.eCommerce/Models/Item.cs
+++ b/Library.eCommerce/Models/Item.cs
@@ -28,6 +28,14 @@ public string Display {
         public Item()
         {
             Product = new Product();
+            Quantity = 0;
+        }
+
+        public Item(Item i)
+        {
+            Product = new Product(i.Product);
+            Quantity = i.Quantity;
+            Id = i.Id;
         }
     }
 }
diff --git a/Library.eCommerce/Models/Product.cs b/Library.eCommerce/Models/Product.cs
index bd0a9e7..ca797dc 100644
--- a/Library.eCommerce/Models/Product.cs
+++ b/Library.eCommerce/Models/Product.cs
@@ -25,6 +25,12 @@ public Product()
             Name = string.Empty;
         }
 
+        public Product(Product p)
+        {
+            Name = p.Name;
+            Id = p.Id;
+        }
+
         public override string ToString()
         {
             return Display ?? string.Empty;
diff --git a/Library.eCommerce/Services/ProductServiceProxy.cs b/Library.eCommerce/Services/ProductServiceProxy.cs
index bba63a3..580e3c9 100644
--- a/Library.eCommerce/Services/ProductServiceProxy.cs
+++ b/Library.eCommerce/Services/ProductServiceProxy.cs
@@ -61,6 +61,12 @@ public Item AddOrUpdate(Item item)
                 item.Id = LastKey + 1;
                 item.Product.Id = item.Id;
                 Products.Add(item);
+            } else
+            {
+                var existingItem = Products.FirstOrDefault(p => p.Id == item.Id);
+                var index = Products.IndexOf(existingItem);
+                Products.RemoveAt(index);
+                Products.Insert(index,new Item(item));
             }
 
 
diff --git a/Library.eCommerce/Services/ShoppingCartService.cs b/Library.eCommerce/Services/ShoppingCartService.cs
index 3e7cffd..1b24e2b 100644
--- a/Library.eCommerce/Services/ShoppingCartService.cs
+++ b/Library.eCommerce/Services/ShoppingCartService.cs
@@ -4,7 +4,7 @@ namespace Library.eCommerce.Services
 {
     public class ShoppingCartService
     {
-        private ProductServiceProxy _prodSvc;
+        private ProductServiceProxy _prodSvc = ProductServiceProxy.Current;
         private List<Item> items;
         public List<Item> CartItems
         {
@@ -28,5 +28,34 @@ public static ShoppingCartService Current {
         private ShoppingCartService() { 
             items = new List<Item>();
         }
+
+        public Item? AddOrUpdate(Item item)
+        {
+            var existingInvItem = _prodSvc.GetById(item.Id);
+            if(existingInvItem == null || existingInvItem.Quantity == 0) {
+                return null;
+            }
+
+            if (existingInvItem != null)
+            {
+                existingInvItem.Quantity--;
+            }
+
+            var existingItem = CartItems.FirstOrDefault(i => i.Id == item.Id);
+            if(existingItem == null)
+            {
+                //add
+                var newItem = new Item(item);
+                newItem.Quantity = 1;
+                CartItems.Add(newItem);
+            } else
+            {
+                //update
+                existingItem.Quantity++;
+            }
+
+
+            return existingInvItem;
+        }
     }
 }
diff --git a/Maui.eCommerce/ViewModels/ProductViewModel.cs b/Maui.eCommerce/ViewModels/ProductViewModel.cs
index 7b9bffb..c08fa64 100644
--- a/Maui.eCommerce/ViewModels/ProductViewModel.cs
+++ b/Maui.eCommerce/ViewModels/ProductViewModel.cs
@@ -11,6 +11,7 @@ namespace Maui.eCommerce.ViewModels
 {
     public class ProductViewModel
     {
+        private Item? cachedModel { get; set; }
         public string? Name { 
             get
             {
@@ -49,13 +50,23 @@ public void AddOrUpdate()
             ProductServiceProxy.Current.AddOrUpdate(Model);
         }
 
+        public void Undo()
+        {
+            ProductServiceProxy.Current.AddOrUpdate(cachedModel);
+        }
+
         public ProductViewModel() {
             Model = new Item();
+            cachedModel = null;
         }
 
         public ProductViewModel(Item? model)
         {
             Model = model;
+            if (model != null)
+            {
+                cachedModel = new Item(model);
+            }
         }
     }
 }
diff --git a/Maui.eCommerce/ViewModels/ShoppingManagementViewModel.cs b/Maui.eCommerce/ViewModels/ShoppingManagementViewModel.cs
index b1a8444..99d21f6 100644
--- a/Maui.eCommerce/ViewModels/ShoppingManagementViewModel.cs
+++ b/Maui.eCommerce/ViewModels/ShoppingManagementViewModel.cs
@@ -3,15 +3,19 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.ComponentModel;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace Maui.eCommerce.ViewModels
 {
-    public class ShoppingManagementViewModel
+    public class ShoppingManagementViewModel : INotifyPropertyChanged
     {
         private ProductServiceProxy _invSvc = ProductServiceProxy.Current;
+        private ShoppingCartService _cartSvc = ShoppingCartService.Current;
+       public Item? SelectedItem { get; set;  }
 
         public ObservableCollection<Item?> Inventory
         {
@@ -20,5 +24,29 @@ public ObservableCollection<Item?> Inventory
                 return new ObservableCollection<Item?>(_invSvc.Products);
             }
         }
+
+        public event PropertyChangedEventHandler? PropertyChanged;
+        public void NotifyPropertyChanged([CallerMemberName] string propertyName = "")
+        {
+            if (propertyName is null)
+            {
+                throw new ArgumentNullException(nameof(propertyName));
+            }
+
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+
+        public void PurchaseItem()
+        {
+            if (SelectedItem != null)
+            {
+                var updatedItem = _cartSvc.AddOrUpdate(SelectedItem);
+
+                if(updatedItem != null && updatedItem.Quantity > 0) {
+                    NotifyPropertyChanged(nameof(Inventory));
+                }
+
+            }
+        }
     }
 }
diff --git a/Maui.eCommerce/Views/ProductDetails.xaml.cs b/Maui.eCommerce/Views/ProductDetails.xaml.cs
index 317982a..eb8c74e 100644
--- a/Maui.eCommerce/Views/ProductDetails.xaml.cs
+++ b/Maui.eCommerce/Views/ProductDetails.xaml.cs
@@ -17,6 +17,7 @@ public ProductDetails()
 
     private void GoBackClicked(object sender, EventArgs e)
     {
+        (BindingContext as ProductViewModel).Undo();
 		Shell.Current.GoToAsync("//InventoryManagement");
     }
 
diff --git a/Maui.eCommerce/Views/ShoppingManagementView.xaml b/Maui.eCommerce/Views/ShoppingManagementView.xaml
index e74a4b4..a1a67e5 100644
--- a/Maui.eCommerce/Views/ShoppingManagementView.xaml
+++ b/Maui.eCommerce/Views/ShoppingManagementView.xaml
@@ -18,7 +18,29 @@
             <ListView Grid.Row="0"
                 ItemsSource="{Binding Inventory}"
                 SelectedItem="{Binding SelectedItem}"
-                />
+             >
+                <ListView.ItemTemplate>
+                    <DataTemplate>
+                        <ViewCell>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition/>
+                                <ColumnDefinition Width="5*"/>
+                                <ColumnDefinition/>
+                                <ColumnDefinition/>
+                                <ColumnDefinition/>
+                            </Grid.ColumnDefinitions>
+                            <Label Grid.Column="0" Text="{Binding Id}"/>
+                            <Label Grid.Column="1" Text="{Binding Product.Name}"/>
+                            <Label Grid.Column="2" Text="x"/>
+                            <Label Grid.Column="3" Text="{Binding Quantity}"/>
+                                <Button Grid.Column="4" Text="+"/>
+                            </Grid>
+                        </ViewCell>
+                    </DataTemplate>
+
+                </ListView.ItemTemplate>
+            </ListView>
             <Button Grid.Row="1" Text="+" Clicked="AddToCartClicked"/>
         </Grid>
 
diff --git a/Maui.eCommerce/Views/ShoppingManagementView.xaml.cs b/Maui.eCommerce/Views/ShoppingManagementView.xaml.cs
index a11a1e9..afd8119 100644
--- a/Maui.eCommerce/Views/ShoppingManagementView.xaml.cs
+++ b/Maui.eCommerce/Views/ShoppingManagementView.xaml.cs
@@ -12,6 +12,6 @@ public ShoppingManagementView()
 
     private void AddToCartClicked(object sender, EventArgs e)
     {
-
+		(BindingContext as ShoppingManagementViewModel).PurchaseItem();
     }
 }
\ No newline at end of file

From ecaba0c7cc891f81a94cf2c327874d052283cfd0 Mon Sep 17 00:00:00 2001
From: crmillsfsu <97139671+crmillsfsu@users.noreply.github.com>
Date: Fri, 21 Mar 2025 08:46:43 -0400
Subject: [PATCH 6/8] lots of changes before merging back to main

---
 Api.eCommerce/Api.eCommerce.sln               | 25 ++++++++++
 .../Api.eCommerce/Api.eCommerce.csproj        | 19 ++++++++
 .../Api.eCommerce/Api.eCommerce.http          |  6 +++
 .../Controllers/InventoryController.cs        | 31 ++++++++++++
 Api.eCommerce/Api.eCommerce/Program.cs        | 25 ++++++++++
 .../Properties/launchSettings.json            | 41 ++++++++++++++++
 .../Api.eCommerce/WeatherForecast.cs          | 13 +++++
 .../appsettings.Development.json              |  8 ++++
 Api.eCommerce/Api.eCommerce/appsettings.json  |  9 ++++
 Library.eCommerce/DTO/ProductDTO.cs           | 48 +++++++++++++++++++
 Library.eCommerce/Library.eCommerce.csproj    |  4 ++
 Library.eCommerce/Models/Item.cs              | 24 ++++++++--
 Library.eCommerce/Models/Product.cs           | 17 ++++++-
 .../Services/ProductServiceProxy.cs           |  9 ++--
 .../Services/ShoppingCartService.cs           | 26 ++++++++++
 Maui.eCommerce/Maui.eCommerce.csproj          |  4 +-
 .../ViewModels/ShoppingManagementViewModel.cs | 42 ++++++++++++++--
 .../Views/ShoppingManagementView.xaml         | 21 +++++++-
 .../Views/ShoppingManagementView.xaml.cs      |  9 ++++
 19 files changed, 364 insertions(+), 17 deletions(-)
 create mode 100644 Api.eCommerce/Api.eCommerce.sln
 create mode 100644 Api.eCommerce/Api.eCommerce/Api.eCommerce.csproj
 create mode 100644 Api.eCommerce/Api.eCommerce/Api.eCommerce.http
 create mode 100644 Api.eCommerce/Api.eCommerce/Controllers/InventoryController.cs
 create mode 100644 Api.eCommerce/Api.eCommerce/Program.cs
 create mode 100644 Api.eCommerce/Api.eCommerce/Properties/launchSettings.json
 create mode 100644 Api.eCommerce/Api.eCommerce/WeatherForecast.cs
 create mode 100644 Api.eCommerce/Api.eCommerce/appsettings.Development.json
 create mode 100644 Api.eCommerce/Api.eCommerce/appsettings.json
 create mode 100644 Library.eCommerce/DTO/ProductDTO.cs

diff --git a/Api.eCommerce/Api.eCommerce.sln b/Api.eCommerce/Api.eCommerce.sln
new file mode 100644
index 0000000..8d1def1
--- /dev/null
+++ b/Api.eCommerce/Api.eCommerce.sln
@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.9.34723.18
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Api.eCommerce", "Api.eCommerce\Api.eCommerce.csproj", "{F7676AFD-7712-44DE-8F6E-558221D34E23}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{F7676AFD-7712-44DE-8F6E-558221D34E23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F7676AFD-7712-44DE-8F6E-558221D34E23}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F7676AFD-7712-44DE-8F6E-558221D34E23}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F7676AFD-7712-44DE-8F6E-558221D34E23}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {B695E2FA-3851-4437-854F-908FEA78AEE7}
+	EndGlobalSection
+EndGlobal
diff --git a/Api.eCommerce/Api.eCommerce/Api.eCommerce.csproj b/Api.eCommerce/Api.eCommerce/Api.eCommerce.csproj
new file mode 100644
index 0000000..4d13065
--- /dev/null
+++ b/Api.eCommerce/Api.eCommerce/Api.eCommerce.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="Library.eCommerce">
+      <HintPath>..\..\Library.eCommerce\bin\Debug\net8.0\Library.eCommerce.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
+</Project>
diff --git a/Api.eCommerce/Api.eCommerce/Api.eCommerce.http b/Api.eCommerce/Api.eCommerce/Api.eCommerce.http
new file mode 100644
index 0000000..c0be77b
--- /dev/null
+++ b/Api.eCommerce/Api.eCommerce/Api.eCommerce.http
@@ -0,0 +1,6 @@
+@Api.eCommerce_HostAddress = http://localhost:5149
+
+GET {{Api.eCommerce_HostAddress}}/weatherforecast/
+Accept: application/json
+
+###
diff --git a/Api.eCommerce/Api.eCommerce/Controllers/InventoryController.cs b/Api.eCommerce/Api.eCommerce/Controllers/InventoryController.cs
new file mode 100644
index 0000000..0d41ede
--- /dev/null
+++ b/Api.eCommerce/Api.eCommerce/Controllers/InventoryController.cs
@@ -0,0 +1,31 @@
+using Library.eCommerce.DTO;
+using Library.eCommerce.Models;
+using Microsoft.AspNetCore.Mvc;
+using Spring2025_Samples.Models;
+
+namespace Api.eCommerce.Controllers
+{
+    [ApiController]
+    [Route("[controller]")]
+    public class InventoryController : ControllerBase
+    {
+
+        private readonly ILogger<InventoryController> _logger;
+
+        public InventoryController(ILogger<InventoryController> logger)
+        {
+            _logger = logger;
+        }
+
+        [HttpGet]
+        public IEnumerable<Item?> Get()
+        {
+            return new List<Item?>
+            {
+                new Item{ Product = new ProductDTO{Id = 1, Name ="Product 1"}, Id = 1, Quantity = 1 },
+                new Item{ Product = new ProductDTO{Id = 2, Name ="Product 2"}, Id = 2 , Quantity = 2 },
+                new Item{ Product = new ProductDTO{Id = 3, Name ="Product 3"}, Id=3 , Quantity = 3 }
+            };
+        }
+    }
+}
diff --git a/Api.eCommerce/Api.eCommerce/Program.cs b/Api.eCommerce/Api.eCommerce/Program.cs
new file mode 100644
index 0000000..48863a6
--- /dev/null
+++ b/Api.eCommerce/Api.eCommerce/Program.cs
@@ -0,0 +1,25 @@
+var builder = WebApplication.CreateBuilder(args);
+
+// Add services to the container.
+
+builder.Services.AddControllers();
+// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
+builder.Services.AddEndpointsApiExplorer();
+builder.Services.AddSwaggerGen();
+
+var app = builder.Build();
+
+// Configure the HTTP request pipeline.
+if (app.Environment.IsDevelopment())
+{
+    app.UseSwagger();
+    app.UseSwaggerUI();
+}
+
+app.UseHttpsRedirection();
+
+app.UseAuthorization();
+
+app.MapControllers();
+
+app.Run();
diff --git a/Api.eCommerce/Api.eCommerce/Properties/launchSettings.json b/Api.eCommerce/Api.eCommerce/Properties/launchSettings.json
new file mode 100644
index 0000000..d0100fd
--- /dev/null
+++ b/Api.eCommerce/Api.eCommerce/Properties/launchSettings.json
@@ -0,0 +1,41 @@
+{
+  "$schema": "http://json.schemastore.org/launchsettings.json",
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:48399",
+      "sslPort": 44355
+    }
+  },
+  "profiles": {
+    "http": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "applicationUrl": "http://localhost:5149",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "https": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "applicationUrl": "https://localhost:7009;http://localhost:5149",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}
diff --git a/Api.eCommerce/Api.eCommerce/WeatherForecast.cs b/Api.eCommerce/Api.eCommerce/WeatherForecast.cs
new file mode 100644
index 0000000..1d2b25d
--- /dev/null
+++ b/Api.eCommerce/Api.eCommerce/WeatherForecast.cs
@@ -0,0 +1,13 @@
+namespace Api.eCommerce
+{
+    public class WeatherForecast
+    {
+        public DateOnly Date { get; set; }
+
+        public int TemperatureC { get; set; }
+
+        public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
+
+        public string? Summary { get; set; }
+    }
+}
diff --git a/Api.eCommerce/Api.eCommerce/appsettings.Development.json b/Api.eCommerce/Api.eCommerce/appsettings.Development.json
new file mode 100644
index 0000000..0c208ae
--- /dev/null
+++ b/Api.eCommerce/Api.eCommerce/appsettings.Development.json
@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  }
+}
diff --git a/Api.eCommerce/Api.eCommerce/appsettings.json b/Api.eCommerce/Api.eCommerce/appsettings.json
new file mode 100644
index 0000000..10f68b8
--- /dev/null
+++ b/Api.eCommerce/Api.eCommerce/appsettings.json
@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "AllowedHosts": "*"
+}
diff --git a/Library.eCommerce/DTO/ProductDTO.cs b/Library.eCommerce/DTO/ProductDTO.cs
new file mode 100644
index 0000000..ade23a4
--- /dev/null
+++ b/Library.eCommerce/DTO/ProductDTO.cs
@@ -0,0 +1,48 @@
+using Spring2025_Samples.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Library.eCommerce.DTO
+{
+    public class ProductDTO
+    {
+        public int Id { get; set; }
+
+        public string? Name { get; set; }
+
+        public string? Display
+        {
+            get
+            {
+                return $"{Id}. {Name}";
+            }
+        }
+
+
+
+        public ProductDTO()
+        {
+            Name = string.Empty;
+        }
+
+        public ProductDTO(Product p)
+        {
+            Name = p.Name;
+            Id = p.Id;
+        }
+
+        public ProductDTO(ProductDTO p)
+        {
+            Name = p.Name;
+            Id = p.Id;
+        }
+
+        public override string ToString()
+        {
+            return Display ?? string.Empty;
+        }
+    }
+}
diff --git a/Library.eCommerce/Library.eCommerce.csproj b/Library.eCommerce/Library.eCommerce.csproj
index fa71b7a..bcd45d6 100644
--- a/Library.eCommerce/Library.eCommerce.csproj
+++ b/Library.eCommerce/Library.eCommerce.csproj
@@ -6,4 +6,8 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.7" />
+  </ItemGroup>
+
 </Project>
diff --git a/Library.eCommerce/Models/Item.cs b/Library.eCommerce/Models/Item.cs
index db15bba..cb3caf4 100644
--- a/Library.eCommerce/Models/Item.cs
+++ b/Library.eCommerce/Models/Item.cs
@@ -1,18 +1,23 @@
-using Spring2025_Samples.Models;
+using Library.eCommerce.DTO;
+using Library.eCommerce.Services;
+using Spring2025_Samples.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows.Input;
 
 namespace Library.eCommerce.Models
 {
     public class Item
     {
         public int Id { get; set; }
-        public Product Product { get; set; }
+        public ProductDTO Product { get; set; }
         public int? Quantity { get; set; }
 
+        public ICommand? AddCommand { get; set; }
+
         public override string ToString()
         {
             return $"{Product} Quantity:{Quantity}";
@@ -21,21 +26,30 @@ public override string ToString()
         public string Display { 
             get
             {
-                return Product?.Display ?? string.Empty;
+                return $"{Product?.Display ?? string.Empty} {Quantity}";
             }
         }
 
         public Item()
         {
-            Product = new Product();
+            Product = new ProductDTO();
             Quantity = 0;
+
+            AddCommand = new Command(DoAdd);
+        }
+
+        private void DoAdd()
+        {
+            ShoppingCartService.Current.AddOrUpdate(this);
         }
 
         public Item(Item i)
         {
-            Product = new Product(i.Product);
+            Product = new ProductDTO(i.Product);
             Quantity = i.Quantity;
             Id = i.Id;
+
+            AddCommand = new Command(DoAdd);
         }
     }
 }
diff --git a/Library.eCommerce/Models/Product.cs b/Library.eCommerce/Models/Product.cs
index ca797dc..4a5b436 100644
--- a/Library.eCommerce/Models/Product.cs
+++ b/Library.eCommerce/Models/Product.cs
@@ -1,4 +1,5 @@
-using System;
+using Library.eCommerce.DTO;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -20,6 +21,13 @@ public string? Display
             }
         }
 
+        public string LegacyProperty1 { get; set; }
+        public string LegacyProperty2 { get; set; }
+        public string LegacyProperty3 { get; set; }
+        public string LegacyProperty4 { get; set; }
+        public string LegacyProperty5 { get; set; }
+        public string LegacyProperty6 { get; set; }
+
         public Product()
         {
             Name = string.Empty;
@@ -35,5 +43,12 @@ public override string ToString()
         {
             return Display ?? string.Empty;
         }
+
+        public Product(ProductDTO p)
+        {
+            Name = p.Name;
+            Id = p.Id;
+            LegacyProperty1 = string.Empty;
+        }
     }
 }
diff --git a/Library.eCommerce/Services/ProductServiceProxy.cs b/Library.eCommerce/Services/ProductServiceProxy.cs
index 580e3c9..a2594e3 100644
--- a/Library.eCommerce/Services/ProductServiceProxy.cs
+++ b/Library.eCommerce/Services/ProductServiceProxy.cs
@@ -1,4 +1,5 @@
-using Library.eCommerce.Models;
+using Library.eCommerce.DTO;
+using Library.eCommerce.Models;
 using Spring2025_Samples.Models;
 using System;
 using System.Collections.Generic;
@@ -14,9 +15,9 @@ private ProductServiceProxy()
         {
             Products = new List<Item?>
             {
-                new Item{ Product = new Product{Id = 1, Name ="Product 1"}, Id = 1, Quantity = 1 },
-                new Item{ Product = new Product{Id = 2, Name ="Product 2"}, Id = 2 , Quantity = 2 },
-                new Item{ Product = new Product{Id = 3, Name ="Product 3"}, Id=3 , Quantity = 3 }
+                new Item{ Product = new ProductDTO{Id = 1, Name ="Product 1"}, Id = 1, Quantity = 1 },
+                new Item{ Product = new ProductDTO{Id = 2, Name ="Product 2"}, Id = 2 , Quantity = 2 },
+                new Item{ Product = new ProductDTO{Id = 3, Name ="Product 3"}, Id=3 , Quantity = 3 }
             };
         }
 
diff --git a/Library.eCommerce/Services/ShoppingCartService.cs b/Library.eCommerce/Services/ShoppingCartService.cs
index 1b24e2b..c3a6f93 100644
--- a/Library.eCommerce/Services/ShoppingCartService.cs
+++ b/Library.eCommerce/Services/ShoppingCartService.cs
@@ -57,5 +57,31 @@ private ShoppingCartService() {
 
             return existingInvItem;
         }
+
+        public Item? ReturnItem(Item? item)
+        {
+            if (item?.Id <= 0 || item == null)
+            {
+                return null;
+            }
+
+            var itemToReturn = CartItems.FirstOrDefault(c => c.Id == item.Id);
+            if (itemToReturn != null)
+            {
+                itemToReturn.Quantity--;
+                var inventoryItem = _prodSvc.Products.FirstOrDefault(p => p.Id == itemToReturn.Id); ;
+                if(inventoryItem == null)
+                {
+                    _prodSvc.AddOrUpdate(new Item(itemToReturn));
+                } else
+                {
+                    inventoryItem.Quantity++;
+                }
+            }
+
+
+            return itemToReturn;
+        }
+
     }
 }
diff --git a/Maui.eCommerce/Maui.eCommerce.csproj b/Maui.eCommerce/Maui.eCommerce.csproj
index 4cd7d17..a3d3c3d 100644
--- a/Maui.eCommerce/Maui.eCommerce.csproj
+++ b/Maui.eCommerce/Maui.eCommerce.csproj
@@ -57,8 +57,8 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
-		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
+		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.7"/>
+		<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.7"/>
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
 	</ItemGroup>
 
diff --git a/Maui.eCommerce/ViewModels/ShoppingManagementViewModel.cs b/Maui.eCommerce/ViewModels/ShoppingManagementViewModel.cs
index 99d21f6..0d39f8e 100644
--- a/Maui.eCommerce/ViewModels/ShoppingManagementViewModel.cs
+++ b/Maui.eCommerce/ViewModels/ShoppingManagementViewModel.cs
@@ -15,13 +15,26 @@ public class ShoppingManagementViewModel : INotifyPropertyChanged
     {
         private ProductServiceProxy _invSvc = ProductServiceProxy.Current;
         private ShoppingCartService _cartSvc = ShoppingCartService.Current;
-       public Item? SelectedItem { get; set;  }
+       public Item? SelectedItem { get; set; }
+       public Item? SelectedCartItem { get; set; }
 
         public ObservableCollection<Item?> Inventory
         {
             get
             {
-                return new ObservableCollection<Item?>(_invSvc.Products);
+                return new ObservableCollection<Item?>(_invSvc.Products
+                    .Where(i => i?.Quantity > 0)
+                    );
+            }
+        }
+
+        public ObservableCollection<Item?> ShoppingCart
+        {
+            get
+            {
+                return new ObservableCollection<Item?>(_cartSvc.CartItems
+                    .Where(i => i?.Quantity > 0)
+                    );
             }
         }
 
@@ -36,17 +49,40 @@ public void NotifyPropertyChanged([CallerMemberName] string propertyName = "")
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
 
+        public void RefreshUX()
+        {
+            NotifyPropertyChanged(nameof(Inventory));
+            NotifyPropertyChanged(nameof(ShoppingCart));
+        }
+
         public void PurchaseItem()
         {
             if (SelectedItem != null)
             {
+                var shouldRefresh = SelectedItem.Quantity >= 1;
                 var updatedItem = _cartSvc.AddOrUpdate(SelectedItem);
 
-                if(updatedItem != null && updatedItem.Quantity > 0) {
+                if(updatedItem != null && shouldRefresh) {
                     NotifyPropertyChanged(nameof(Inventory));
+                    NotifyPropertyChanged(nameof(ShoppingCart));
                 }
 
             }
         }
+
+        public void ReturnItem()
+        {
+            if (SelectedCartItem != null) {
+                var shouldRefresh = SelectedCartItem.Quantity >= 1;
+                
+                var updatedItem = _cartSvc.ReturnItem(SelectedCartItem);
+
+                if (updatedItem != null && shouldRefresh)
+                {
+                    NotifyPropertyChanged(nameof(Inventory));
+                    NotifyPropertyChanged(nameof(ShoppingCart));
+                }
+            }
+        }
     }
 }
diff --git a/Maui.eCommerce/Views/ShoppingManagementView.xaml b/Maui.eCommerce/Views/ShoppingManagementView.xaml
index a1a67e5..30cec49 100644
--- a/Maui.eCommerce/Views/ShoppingManagementView.xaml
+++ b/Maui.eCommerce/Views/ShoppingManagementView.xaml
@@ -34,7 +34,7 @@
                             <Label Grid.Column="1" Text="{Binding Product.Name}"/>
                             <Label Grid.Column="2" Text="x"/>
                             <Label Grid.Column="3" Text="{Binding Quantity}"/>
-                                <Button Grid.Column="4" Text="+"/>
+                                <Button Grid.Column="4" Text="+" Command="{Binding AddCommand}" Clicked="InlineAddClicked"/>
                             </Grid>
                         </ViewCell>
                     </DataTemplate>
@@ -46,7 +46,24 @@
 
         <!--USER SHOPPING CART-->
         <Grid Grid.Column="1">
-            
+            <Grid.RowDefinitions>
+                <RowDefinition Height="10*"/>
+                <RowDefinition/>
+            </Grid.RowDefinitions>
+            <ListView Grid.Row="0"
+                ItemsSource="{Binding ShoppingCart}"
+                SelectedItem="{Binding SelectedCartItem}"
+                >
+                <!--<ListView.ItemTemplate>
+                    <DataTemplate>
+                        <ViewCell>
+
+                        </ViewCell>
+                    </DataTemplate>
+
+                </ListView.ItemTemplate>-->
+            </ListView>
+            <Button Grid.Row="1" Text="-" Clicked="RemoveFromCartClicked"/>
         </Grid>
     </Grid>
 </ContentPage>
\ No newline at end of file
diff --git a/Maui.eCommerce/Views/ShoppingManagementView.xaml.cs b/Maui.eCommerce/Views/ShoppingManagementView.xaml.cs
index afd8119..ce58d57 100644
--- a/Maui.eCommerce/Views/ShoppingManagementView.xaml.cs
+++ b/Maui.eCommerce/Views/ShoppingManagementView.xaml.cs
@@ -10,8 +10,17 @@ public ShoppingManagementView()
 		BindingContext = new ShoppingManagementViewModel();
 	}
 
+    private void RemoveFromCartClicked(object sender, EventArgs e)
+    {
+        (BindingContext as ShoppingManagementViewModel).ReturnItem();
+    }
     private void AddToCartClicked(object sender, EventArgs e)
     {
 		(BindingContext as ShoppingManagementViewModel).PurchaseItem();
     }
+
+    private void InlineAddClicked(object sender, EventArgs e)
+    {
+        (BindingContext as ShoppingManagementViewModel).RefreshUX();
+    }
 }
\ No newline at end of file

From 3fb8d0baf8b8f90aed5e4addf13125f2dbf79469 Mon Sep 17 00:00:00 2001
From: sgaiso <jptjasc@gmail.com>
Date: Wed, 26 Mar 2025 16:29:30 -0400
Subject: [PATCH 7/8] Finished most

---
 Library.eCommerce/Models/Item.cs              |  3 ++
 .../Services/ProductServiceProxy.cs           |  6 +--
 .../Services/ShoppingCartService.cs           |  4 ++
 Maui.eCommerce/AppShell.xaml                  |  4 ++
 Maui.eCommerce/Maui.eCommerce.csproj          |  7 ++-
 Maui.eCommerce/ViewModels/ProductViewModel.cs | 14 ++++++
 .../ViewModels/ShoppingManagementViewModel.cs | 21 ++++++++-
 .../ViewModels/TotalCostViewModel.cs          | 44 +++++++++++++++++++
 Maui.eCommerce/Views/CheckoutView.xaml        | 16 +++++++
 Maui.eCommerce/Views/CheckoutView.xaml.cs     | 23 ++++++++++
 Maui.eCommerce/Views/ProductDetails.xaml      |  7 +++
 .../Views/ShoppingManagementView.xaml         |  3 ++
 .../Views/ShoppingManagementView.xaml.cs      |  6 +++
 13 files changed, 151 insertions(+), 7 deletions(-)
 create mode 100644 Maui.eCommerce/ViewModels/TotalCostViewModel.cs
 create mode 100644 Maui.eCommerce/Views/CheckoutView.xaml
 create mode 100644 Maui.eCommerce/Views/CheckoutView.xaml.cs

diff --git a/Library.eCommerce/Models/Item.cs b/Library.eCommerce/Models/Item.cs
index cb3caf4..8495064 100644
--- a/Library.eCommerce/Models/Item.cs
+++ b/Library.eCommerce/Models/Item.cs
@@ -16,6 +16,8 @@ public class Item
         public ProductDTO Product { get; set; }
         public int? Quantity { get; set; }
 
+        public int Price { get; set; } 
+
         public ICommand? AddCommand { get; set; }
 
         public override string ToString()
@@ -48,6 +50,7 @@ public Item(Item i)
             Product = new ProductDTO(i.Product);
             Quantity = i.Quantity;
             Id = i.Id;
+            Price = i.Price;
 
             AddCommand = new Command(DoAdd);
         }
diff --git a/Library.eCommerce/Services/ProductServiceProxy.cs b/Library.eCommerce/Services/ProductServiceProxy.cs
index a2594e3..1c1b0eb 100644
--- a/Library.eCommerce/Services/ProductServiceProxy.cs
+++ b/Library.eCommerce/Services/ProductServiceProxy.cs
@@ -15,9 +15,9 @@ private ProductServiceProxy()
         {
             Products = new List<Item?>
             {
-                new Item{ Product = new ProductDTO{Id = 1, Name ="Product 1"}, Id = 1, Quantity = 1 },
-                new Item{ Product = new ProductDTO{Id = 2, Name ="Product 2"}, Id = 2 , Quantity = 2 },
-                new Item{ Product = new ProductDTO{Id = 3, Name ="Product 3"}, Id=3 , Quantity = 3 }
+                new Item{ Product = new ProductDTO{Id = 1, Name ="Product 1"}, Id = 1, Quantity = 1, Price = 5 },
+                new Item{ Product = new ProductDTO{Id = 2, Name ="Product 2"}, Id = 2 , Quantity = 2,Price = 50 },
+                new Item{ Product = new ProductDTO{Id = 3, Name ="Product 3"}, Id=3 , Quantity = 3, Price = 500 }
             };
         }
 
diff --git a/Library.eCommerce/Services/ShoppingCartService.cs b/Library.eCommerce/Services/ShoppingCartService.cs
index c3a6f93..474f64d 100644
--- a/Library.eCommerce/Services/ShoppingCartService.cs
+++ b/Library.eCommerce/Services/ShoppingCartService.cs
@@ -6,6 +6,7 @@ public class ShoppingCartService
     {
         private ProductServiceProxy _prodSvc = ProductServiceProxy.Current;
         private List<Item> items;
+        public double CheckoutPrice;
         public List<Item> CartItems
         {
             get
@@ -29,6 +30,9 @@ private ShoppingCartService() {
             items = new List<Item>();
         }
 
+        public void ClearList() { items = new List<Item>(); }
+        //Sets the list to an empty, new, list
+
         public Item? AddOrUpdate(Item item)
         {
             var existingInvItem = _prodSvc.GetById(item.Id);
diff --git a/Maui.eCommerce/AppShell.xaml b/Maui.eCommerce/AppShell.xaml
index 71666d7..38fae71 100644
--- a/Maui.eCommerce/AppShell.xaml
+++ b/Maui.eCommerce/AppShell.xaml
@@ -24,4 +24,8 @@
         Title="Shop"
         ContentTemplate="{DataTemplate views:ShoppingManagementView}"
         Route="ShoppingManagement" />
+    <ShellContent
+        Title="Shop"
+        ContentTemplate="{DataTemplate views:CheckoutView}"
+        Route="CheckoutPage"    />
 </Shell>
diff --git a/Maui.eCommerce/Maui.eCommerce.csproj b/Maui.eCommerce/Maui.eCommerce.csproj
index a3d3c3d..d8b082c 100644
--- a/Maui.eCommerce/Maui.eCommerce.csproj
+++ b/Maui.eCommerce/Maui.eCommerce.csproj
@@ -57,8 +57,8 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.7"/>
-		<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.7"/>
+		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.7" />
+		<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.7" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
 	</ItemGroup>
 
@@ -67,6 +67,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
+	  <MauiXaml Update="Views\CheckoutView.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Views\InventoryManagementView.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
diff --git a/Maui.eCommerce/ViewModels/ProductViewModel.cs b/Maui.eCommerce/ViewModels/ProductViewModel.cs
index c08fa64..60a6bb5 100644
--- a/Maui.eCommerce/ViewModels/ProductViewModel.cs
+++ b/Maui.eCommerce/ViewModels/ProductViewModel.cs
@@ -43,6 +43,20 @@ public int? Quantity
             }
         }
 
+        public int? Price
+        {
+            get
+            {
+                return Model?.Price;
+            }
+            set
+            {
+                if (Model != null && Model.Price != value)
+                {
+                    Model.Price = value ?? 0;
+                }
+            }
+        }
         public Item? Model { get; set; }
 
         public void AddOrUpdate()
diff --git a/Maui.eCommerce/ViewModels/ShoppingManagementViewModel.cs b/Maui.eCommerce/ViewModels/ShoppingManagementViewModel.cs
index 0d39f8e..b5e35e5 100644
--- a/Maui.eCommerce/ViewModels/ShoppingManagementViewModel.cs
+++ b/Maui.eCommerce/ViewModels/ShoppingManagementViewModel.cs
@@ -13,8 +13,8 @@ namespace Maui.eCommerce.ViewModels
 {
     public class ShoppingManagementViewModel : INotifyPropertyChanged
     {
-        private ProductServiceProxy _invSvc = ProductServiceProxy.Current;
-        private ShoppingCartService _cartSvc = ShoppingCartService.Current;
+       private ProductServiceProxy _invSvc = ProductServiceProxy.Current;
+       private ShoppingCartService _cartSvc = ShoppingCartService.Current;
        public Item? SelectedItem { get; set; }
        public Item? SelectedCartItem { get; set; }
 
@@ -84,5 +84,22 @@ public void ReturnItem()
                 }
             }
         }
+        //Do stuff on list, then the next page will be a readout
+        public void Checkout()  
+        {
+            int totalCost = 0;
+            foreach (var item in ShoppingCart)
+            {
+                totalCost += item?.Price ?? 0;
+            }
+            _cartSvc.ClearList();
+
+            if (totalCost > 0)
+            {
+                NotifyPropertyChanged(nameof(ShoppingCart));
+            }
+            _cartSvc.CheckoutPrice = totalCost;
+            NotifyPropertyChanged(nameof(_cartSvc.CheckoutPrice));
+        }
     }
 }
diff --git a/Maui.eCommerce/ViewModels/TotalCostViewModel.cs b/Maui.eCommerce/ViewModels/TotalCostViewModel.cs
new file mode 100644
index 0000000..d32dca8
--- /dev/null
+++ b/Maui.eCommerce/ViewModels/TotalCostViewModel.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Text;
+using System.Threading.Tasks;
+using Library.eCommerce.Services;
+
+namespace Maui.eCommerce.ViewModels
+{
+    public class TotalCostViewModel : INotifyPropertyChanged
+    {
+        private ShoppingCartService __svc = ShoppingCartService.Current;
+
+        public event PropertyChangedEventHandler? PropertyChanged;
+
+        public double CheckoutCost
+        {
+            get {
+                return Math.Round(__svc.CheckoutPrice + (__svc.CheckoutPrice * .07), 2);
+                }
+            set 
+            { 
+                __svc.CheckoutPrice = value;
+            }
+        }
+
+        public void NotifyPropertyChanged([CallerMemberName] string propertyName = "")
+        {
+            if (propertyName is null)
+            {
+                throw new ArgumentNullException(nameof(propertyName));
+            }
+
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+
+        public void RefreshUI()
+        {
+            NotifyPropertyChanged(nameof(CheckoutCost));
+        }
+    }
+}
diff --git a/Maui.eCommerce/Views/CheckoutView.xaml b/Maui.eCommerce/Views/CheckoutView.xaml
new file mode 100644
index 0000000..e7d67f7
--- /dev/null
+++ b/Maui.eCommerce/Views/CheckoutView.xaml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="Maui.eCommerce.Views.CheckoutView"
+             Title="CheckoutView">
+    <VerticalStackLayout>
+        <Label 
+            Text="You Spent: $"
+            VerticalOptions="Center" 
+            HorizontalOptions="Center" />
+        <Label Text="{Binding CheckoutCost}"
+            VerticalOptions="Center" 
+            HorizontalOptions="Center" />
+        <Button Text="Go Home" Clicked="GoHome"/>
+    </VerticalStackLayout>
+</ContentPage>
\ No newline at end of file
diff --git a/Maui.eCommerce/Views/CheckoutView.xaml.cs b/Maui.eCommerce/Views/CheckoutView.xaml.cs
new file mode 100644
index 0000000..b7a87b5
--- /dev/null
+++ b/Maui.eCommerce/Views/CheckoutView.xaml.cs
@@ -0,0 +1,23 @@
+using Spring2025_Samples.Models;
+using Maui.eCommerce.ViewModels;
+using System.ComponentModel;
+namespace Maui.eCommerce.Views;
+
+//[QueryProperty(nameof(TotalPrice), "PriceKey")]
+
+public partial class CheckoutView : ContentPage
+{
+//	public int TotalPrice { get; set; }
+    public CheckoutView()
+	{
+		InitializeComponent();
+        BindingContext = new TotalCostViewModel();
+
+    }
+
+    public void GoHome(object sender, EventArgs e)
+    {
+        (BindingContext as TotalCostViewModel).RefreshUI();
+        Shell.Current.GoToAsync($"//MainPage");        
+    }
+}
\ No newline at end of file
diff --git a/Maui.eCommerce/Views/ProductDetails.xaml b/Maui.eCommerce/Views/ProductDetails.xaml
index 67fad38..4328c48 100644
--- a/Maui.eCommerce/Views/ProductDetails.xaml
+++ b/Maui.eCommerce/Views/ProductDetails.xaml
@@ -20,6 +20,13 @@
         <Entry
             Text="{Binding Quantity}"
             />
+        <Label
+            Text="Price:"
+            VerticalOptions="Center"
+            HorizontalOptions="Center" />
+        <Entry
+            Text="{Binding Price}"
+            />
         <Button Text="Ok" Clicked="OkClicked"/>
         <Button Text="Go Back" Clicked="GoBackClicked"/>
     </VerticalStackLayout>
diff --git a/Maui.eCommerce/Views/ShoppingManagementView.xaml b/Maui.eCommerce/Views/ShoppingManagementView.xaml
index 30cec49..1c0ea33 100644
--- a/Maui.eCommerce/Views/ShoppingManagementView.xaml
+++ b/Maui.eCommerce/Views/ShoppingManagementView.xaml
@@ -3,6 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="Maui.eCommerce.Views.ShoppingManagementView"
              Title="ShoppingManagementView">
+    <VerticalStackLayout>
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition/><!--STORE-->
@@ -66,4 +67,6 @@
             <Button Grid.Row="1" Text="-" Clicked="RemoveFromCartClicked"/>
         </Grid>
     </Grid>
+        <Button Text="Checkout" Clicked="GoToCheckoutClicked" />
+    </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/Maui.eCommerce/Views/ShoppingManagementView.xaml.cs b/Maui.eCommerce/Views/ShoppingManagementView.xaml.cs
index ce58d57..e88b1bf 100644
--- a/Maui.eCommerce/Views/ShoppingManagementView.xaml.cs
+++ b/Maui.eCommerce/Views/ShoppingManagementView.xaml.cs
@@ -23,4 +23,10 @@ private void InlineAddClicked(object sender, EventArgs e)
     {
         (BindingContext as ShoppingManagementViewModel).RefreshUX();
     }
+
+    public void GoToCheckoutClicked(object sender, EventArgs e)
+    {
+        (BindingContext as ShoppingManagementViewModel).Checkout();
+        Shell.Current.GoToAsync($"//CheckoutPage");
+    }
 }
\ No newline at end of file

From be573658afc7ff5822e0b14a338a6486ddb74c15 Mon Sep 17 00:00:00 2001
From: Jas Chawla <126195012+SgainsO@users.noreply.github.com>
Date: Sun, 30 Mar 2025 22:55:21 -0400
Subject: [PATCH 8/8] Finished Essentially

---
 Library.eCommerce/Models/Item.cs              |  2 +-
 .../ViewModels/ShoppingManagementViewModel.cs | 29 ++++++++------
 .../ViewModels/TotalCostViewModel.cs          | 38 ++++++++++++++++++-
 Maui.eCommerce/Views/CheckoutView.xaml        | 27 +++++++++++++
 Maui.eCommerce/Views/CheckoutView.xaml.cs     |  8 +++-
 .../Views/ShoppingManagementView.xaml.cs      |  2 +-
 Spring2025_Samples.sln                        |  3 +-
 Spring2025_Samples/Spring2025_Samples.csproj  |  4 ++
 8 files changed, 94 insertions(+), 19 deletions(-)

diff --git a/Library.eCommerce/Models/Item.cs b/Library.eCommerce/Models/Item.cs
index 8495064..dbb9a21 100644
--- a/Library.eCommerce/Models/Item.cs
+++ b/Library.eCommerce/Models/Item.cs
@@ -28,7 +28,7 @@ public override string ToString()
         public string Display { 
             get
             {
-                return $"{Product?.Display ?? string.Empty} {Quantity}";
+                return $"{Product?.Display ?? string.Empty} x{Quantity} ${Price}";
             }
         }
 
diff --git a/Maui.eCommerce/ViewModels/ShoppingManagementViewModel.cs b/Maui.eCommerce/ViewModels/ShoppingManagementViewModel.cs
index b5e35e5..3ab37e3 100644
--- a/Maui.eCommerce/ViewModels/ShoppingManagementViewModel.cs
+++ b/Maui.eCommerce/ViewModels/ShoppingManagementViewModel.cs
@@ -87,19 +87,24 @@ public void ReturnItem()
         //Do stuff on list, then the next page will be a readout
         public void Checkout()  
         {
-            int totalCost = 0;
-            foreach (var item in ShoppingCart)
-            {
-                totalCost += item?.Price ?? 0;
-            }
-            _cartSvc.ClearList();
+            /*    int totalCost = 0;
+                foreach (var item in ShoppingCart)
+                {
+                    totalCost += item?.Price ?? 0;
+                }
+        //        _cartSvc.ClearList();
+
+                if (totalCost > 0)
+                {
+                    NotifyPropertyChanged(nameof(ShoppingCart));
+                }
+                _cartSvc.CheckoutPrice = totalCost;
+                NotifyPropertyChanged(nameof(_cartSvc.CheckoutPrice));
+            */
+        //    _cartSvc.ClearList();
+            NotifyPropertyChanged(nameof(ShoppingCart));
 
-            if (totalCost > 0)
-            {
-                NotifyPropertyChanged(nameof(ShoppingCart));
-            }
-            _cartSvc.CheckoutPrice = totalCost;
-            NotifyPropertyChanged(nameof(_cartSvc.CheckoutPrice));
         }
+
     }
 }
diff --git a/Maui.eCommerce/ViewModels/TotalCostViewModel.cs b/Maui.eCommerce/ViewModels/TotalCostViewModel.cs
index d32dca8..89f381f 100644
--- a/Maui.eCommerce/ViewModels/TotalCostViewModel.cs
+++ b/Maui.eCommerce/ViewModels/TotalCostViewModel.cs
@@ -1,10 +1,12 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading.Tasks;
+using Library.eCommerce.Models;
 using Library.eCommerce.Services;
 
 namespace Maui.eCommerce.ViewModels
@@ -15,14 +17,40 @@ public class TotalCostViewModel : INotifyPropertyChanged
 
         public event PropertyChangedEventHandler? PropertyChanged;
 
+
         public double CheckoutCost
         {
             get {
-                return Math.Round(__svc.CheckoutPrice + (__svc.CheckoutPrice * .07), 2);
+                var rounded = Math.Round(__svc.CheckoutPrice + (__svc.CheckoutPrice * .07), 2);
+                return rounded;
                 }
             set 
-            { 
+            {
                 __svc.CheckoutPrice = value;
+
+            }
+        }
+
+        public ObservableCollection<Item?> ShoppingCart
+        {
+            get
+            {
+                int totalCost = 0;
+                foreach (var item in __svc.CartItems)
+                {
+                    totalCost += item?.Price ?? 0;
+                }
+                CheckoutCost = totalCost;
+                NotifyPropertyChanged(nameof(CheckoutCost));
+
+                var toRet =  new ObservableCollection<Item?>(__svc.CartItems
+                    .Where(i => i?.Quantity > 0)
+                    );
+    //            __svc.CartItems.Clear();
+
+                
+
+                return toRet;
             }
         }
 
@@ -39,6 +67,12 @@ public void NotifyPropertyChanged([CallerMemberName] string propertyName = "")
         public void RefreshUI()
         {
             NotifyPropertyChanged(nameof(CheckoutCost));
+            NotifyPropertyChanged(nameof(ShoppingCart));
+        }
+        public void ClearOnLeave()
+        {
+            __svc.CartItems.Clear();
+            CheckoutCost = 0;
         }
     }
 }
diff --git a/Maui.eCommerce/Views/CheckoutView.xaml b/Maui.eCommerce/Views/CheckoutView.xaml
index e7d67f7..f8e62b1 100644
--- a/Maui.eCommerce/Views/CheckoutView.xaml
+++ b/Maui.eCommerce/Views/CheckoutView.xaml
@@ -4,6 +4,7 @@
              x:Class="Maui.eCommerce.Views.CheckoutView"
              Title="CheckoutView">
     <VerticalStackLayout>
+		<Button Text="CheckOut" Clicked="CheckOutClicked"/>
         <Label 
             Text="You Spent: $"
             VerticalOptions="Center" 
@@ -11,6 +12,32 @@
         <Label Text="{Binding CheckoutCost}"
             VerticalOptions="Center" 
             HorizontalOptions="Center" />
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition/>
+            </Grid.ColumnDefinitions>
+
+            <Grid Grid.Column="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="7*"/>
+                <RowDefinition/>
+            </Grid.RowDefinitions>
+            <ListView Grid.Row="0"
+                ItemsSource="{Binding ShoppingCart}"
+                >
+                <!--<ListView.ItemTemplate>
+                    <DataTemplate>
+                        <ViewCell>
+
+                        </ViewCell>
+                    </DataTemplate>
+
+                </ListView.ItemTemplate>-->
+            </ListView>
+        </Grid>
+        </Grid>
+
+
         <Button Text="Go Home" Clicked="GoHome"/>
     </VerticalStackLayout>
 </ContentPage>
\ No newline at end of file
diff --git a/Maui.eCommerce/Views/CheckoutView.xaml.cs b/Maui.eCommerce/Views/CheckoutView.xaml.cs
index b7a87b5..4212cfd 100644
--- a/Maui.eCommerce/Views/CheckoutView.xaml.cs
+++ b/Maui.eCommerce/Views/CheckoutView.xaml.cs
@@ -12,7 +12,7 @@ public CheckoutView()
 	{
 		InitializeComponent();
         BindingContext = new TotalCostViewModel();
-
+    //    (BindingContext as TotalCostViewModel).setDefaults();
     }
 
     public void GoHome(object sender, EventArgs e)
@@ -20,4 +20,10 @@ public void GoHome(object sender, EventArgs e)
         (BindingContext as TotalCostViewModel).RefreshUI();
         Shell.Current.GoToAsync($"//MainPage");        
     }
+
+    public void CheckOutClicked(object sender, EventArgs e)
+    {
+        (BindingContext as TotalCostViewModel).RefreshUI();
+        (BindingContext as TotalCostViewModel).ClearOnLeave();
+    }
 }
\ No newline at end of file
diff --git a/Maui.eCommerce/Views/ShoppingManagementView.xaml.cs b/Maui.eCommerce/Views/ShoppingManagementView.xaml.cs
index e88b1bf..225fc79 100644
--- a/Maui.eCommerce/Views/ShoppingManagementView.xaml.cs
+++ b/Maui.eCommerce/Views/ShoppingManagementView.xaml.cs
@@ -26,7 +26,7 @@ private void InlineAddClicked(object sender, EventArgs e)
 
     public void GoToCheckoutClicked(object sender, EventArgs e)
     {
-        (BindingContext as ShoppingManagementViewModel).Checkout();
         Shell.Current.GoToAsync($"//CheckoutPage");
+        (BindingContext as ShoppingManagementViewModel).Checkout();
     }
 }
\ No newline at end of file
diff --git a/Spring2025_Samples.sln b/Spring2025_Samples.sln
index 84ad8aa..5d49b62 100644
--- a/Spring2025_Samples.sln
+++ b/Spring2025_Samples.sln
@@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spring2025_Samples", "Sprin
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Library.eCommerce", "Library.eCommerce\Library.eCommerce.csproj", "{B113257B-6F53-4B61-B796-F733AAF021AA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Maui.eCommerce", "Maui.eCommerce\Maui.eCommerce.csproj", "{0335E701-5D1D-449A-8615-BDC200AE7C4D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maui.eCommerce", "Maui.eCommerce\Maui.eCommerce.csproj", "{0335E701-5D1D-449A-8615-BDC200AE7C4D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -16,7 +16,6 @@ Global
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{8B000EBC-E610-4D5F-ABEE-E9CECF89C2D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8B000EBC-E610-4D5F-ABEE-E9CECF89C2D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8B000EBC-E610-4D5F-ABEE-E9CECF89C2D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8B000EBC-E610-4D5F-ABEE-E9CECF89C2D3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B113257B-6F53-4B61-B796-F733AAF021AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
diff --git a/Spring2025_Samples/Spring2025_Samples.csproj b/Spring2025_Samples/Spring2025_Samples.csproj
index 1f7d354..1e77c21 100644
--- a/Spring2025_Samples/Spring2025_Samples.csproj
+++ b/Spring2025_Samples/Spring2025_Samples.csproj
@@ -7,6 +7,10 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Remove="Program.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Library.eCommerce\Library.eCommerce.csproj" />
   </ItemGroup>