Menu Option & Display WIP

ProRestaurant/Classes/Enums.cs

@@ -12,4 +12,12 @@ namespace ProRestaurant.Classes
         RestaurantUser,        
         Customer
     }
+
+    public enum OptionType
+    {
+        Single,
+        SingleRequired,
+        Multiple, 
+        MultipleLimit
+    }
 }

ProRestaurant/Containers/Category.cs

@@ -0,0 +1,7 @@
+namespace ProRestaurant.Containers
+{
+    public class Category
+    {
+        public string Description { get; set; }
+    }
+}

ProRestaurant/Containers/MenuCategoryContainer.cs

@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+
+namespace ProRestaurant.Containers
+{
+    public class MenuCategoryContainer
+    {
+        public string Category { get; set; }
+        public List<MenuItemContainer> Items { get; set; }
+    }
+}

ProRestaurant/Containers/MenuItemContainer.cs

@@ -0,0 +1,12 @@
+namespace ProRestaurant.Containers
+{
+    public class MenuItemContainer
+    {
+        public int MenuId { get; set; }
+        public int CategoryId { get; set; }
+        public string Name { get; set; }
+        public string Description { get; set; }
+        public string Price { get; set; }
+        public string Image { get; set; }
+    }
+}

ProRestaurant/Containers/OptionTypeContainer.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace ProRestaurant.Containers
+{
+    public class OptionTypeContainer
+    {
+        public int Id { get; set; }
+        public string Description { get; set; }
+    }
+}

ProRestaurant/Containers/RestaurantCard.cs

@@ -0,0 +1,13 @@
+namespace ProRestaurant.Containers
+{
+    public class RestaurantCard
+    {
+        public int Id { get; set; }
+        public string Logo { get; set; }
+        public string Name { get; set; }
+        public string Suburb { get; set; }
+        public string SubText { get; set; }
+        public string DeliveryTime { get; set; }
+        public string DeliveryFee { get; set; }
+    }
+}

ProRestaurant/Containers/RestaurantContainer.cs

@@ -15,28 +15,32 @@ namespace ProRestaurant.Containers
         public string Result { get; set; }        
     }
 
-    public class RestaurantCard
+    public class MenuContainer
     {
         public int Id { get; set; }
-        public string Logo { get; set; }
         public string Name { get; set; }
-        public string Suburb { get; set; }
-        public string SubText { get; set; }
-        public string DeliveryTime { get; set; }
-        public string DeliveryFee { get; set; }
+        public string Description { get; set; }
+        public string DisplayPrice { get; set; }
+        public decimal Price { get; set; }
+        public string Image { get; set; }
+
+        public List<OptionContainer> Options { get; set; }
     }
 
-    public class RestaurantDetails : Restaurant
+    public class OptionContainer
     {
-        public List<string> SelectedMethodsOfPayments { get; set; }
-        public List<Category> SavedCategories { get; set; }
-        public List<TradingHoursContainer> SavedTradingHours { get; set; }
-        public int DeliveryFrom { get; set; }
-        public int DeliveryTo { get; set; }
+        public string Description { get; set; }
+        public string SubTitle { get; set; }
+        public string OptionType { get; set; }
+        public int Limit { get; set; }
+        public bool IsBasePrice { get; set; }          
+        public string SpecialInstructions { get; set; }
+        public List<OptionItemContainer> Options { get; set; }
     }
 
-    public class Category
+    public class OptionItemContainer
     {
         public string Description { get; set; }
+        public decimal Price { get; set; }        
     }
 }

ProRestaurant/Containers/RestaurantDetails.cs

@@ -0,0 +1,14 @@
+using ProRestaurant.Models.Restaurants;
+using System.Collections.Generic;
+
+namespace ProRestaurant.Containers
+{
+    public class RestaurantDetails : Restaurant
+    {
+        public List<string> SelectedMethodsOfPayments { get; set; }
+        public List<Category> SavedCategories { get; set; }
+        public List<TradingHoursContainer> SavedTradingHours { get; set; }
+        public int DeliveryFrom { get; set; }
+        public int DeliveryTo { get; set; }
+    }
+}

ProRestaurant/Containers/RestaurantMenuContainer.cs

@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+
+namespace ProRestaurant.Containers
+{
+    public class RestaurantMenuContainer
+    {
+        public int Id { get; set; }
+        public string Name { get; set; }
+        public string Categories { get; set; }
+        public string DeliveryTime { get; set; }
+        public string DeliveryFee { get; set; }
+        public string Suburb { get; set; }
+        public string City { get; set; }
+        public string Province { get; set; }
+        public string PostalCode { get; set; }
+        public decimal Latitude { get; set; }
+        public decimal Longitude { get; set; }
+        public string Logo { get; set; }
+        public List<string> CategoryList { get; set; }
+        public List<TradingHourContainer> TradingHours { get; set; }
+        public List<MenuCategoryContainer> MenuList { get; set; }
+    }
+}

ProRestaurant/Containers/TradingHourContainer.cs

@@ -0,0 +1,8 @@
+namespace ProRestaurant.Containers
+{
+    public class TradingHourContainer
+    {
+        public string Description { get; set; }
+        public string Time { get; set; }
+    }
+}

ProRestaurant/Controllers/Restaurants/MenuController.cs

@@ -0,0 +1,29 @@
+using Microsoft.AspNetCore.Mvc;
+using ProRestaurant.Repository.Restaurants;
+
+namespace ProRestaurant.Controllers.Restaurants
+{
+    [Route("api/[controller]")]
+    [ApiController]
+    public class MenuController : ControllerBase
+    {
+        private readonly IMenuRepository repo;
+
+        public MenuController(IMenuRepository _repo)
+        {
+            repo = _repo;
+        }
+                
+        [HttpGet("{id}")]
+        public IActionResult Get(int id)
+        {
+            return new OkObjectResult(repo.GetMenu(id));
+        }
+
+        [HttpGet("GetOptions/{menuId}/{categoryId}")]
+        public IActionResult GetOptions(int menuId, int categoryId)
+        {
+            return new OkObjectResult(repo.GetOptions(menuId, categoryId));
+        }
+    }
+}

ProRestaurant/Controllers/Restaurants/MenuItemController.cs

@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Transactions;
+using Microsoft.AspNetCore.Mvc;
+using ProRestaurant.Models.Restaurants;
+using ProRestaurant.Repository.Restaurants;
+
+// For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
+
+namespace ProRestaurant.Controllers.Restaurants
+{
+    [Route("api/[controller]")]
+    [ApiController]
+    public class MenuItemController : ControllerBase
+    {
+        private readonly IMenuItemRepository repo;
+
+        public MenuItemController(IMenuItemRepository _repo)
+        {
+            repo = _repo;
+        }
+
+        [HttpGet("{id}")]
+        public IActionResult Get(int id)
+        {
+            return new OkObjectResult(repo.GetMenuItems(r => r.RestaurantId == id));
+        }
+
+        [HttpGet("GetMenuItem/{id}")]
+        public IActionResult GetMenuItem(int id)
+        {
+            return new OkObjectResult(repo.GetMenuItem(id));
+        }
+
+        [HttpPost]
+        public IActionResult Post([FromBody] MenuItem item)
+        {
+            using (var scope = new TransactionScope())
+            {
+                repo.Insert(item);
+                scope.Complete();
+                return CreatedAtAction(nameof(Get), new { id = item.Id }, item);
+            }
+        }
+
+        [HttpPut]
+        public IActionResult Put([FromBody] MenuItem item)
+        {
+            if (item != null)
+            {
+                using (var scope = new TransactionScope())
+                {
+                    repo.Update(item);
+                    scope.Complete();
+                    return new OkResult();
+                }
+            }
+            return new NoContentResult();
+        }
+
+        [HttpDelete("{id}")]
+        public IActionResult Delete(int id)
+        {
+            repo.Remove(repo.GetMenuItems(u => u.Id == id).FirstOrDefault());
+            return new OkResult();
+        }
+    }
+}

ProRestaurant/Controllers/Restaurants/MenuOptionsController.cs

@@ -0,0 +1,77 @@
+using Microsoft.AspNetCore.Mvc;
+using ProRestaurant.Models.Restaurants;
+using ProRestaurant.Repository.Restaurants;
+using System.Transactions;
+
+namespace ProRestaurant.Controllers.Restaurants
+{
+    [Route("api/[controller]")]
+    [ApiController]
+    public class MenuOptionsController : ControllerBase
+    {
+        public readonly IMenuOptionRepository repo;
+
+        public MenuOptionsController(IMenuOptionRepository _repo)
+        {
+            repo = _repo;
+        }
+
+        [HttpGet("{id}")]
+        public IActionResult Get(int id)
+        {
+            return new OkObjectResult(repo.GetMenuOption(id));
+        }
+
+        [HttpGet("GetRestaurantMenuOptions/{id}")]
+        public IActionResult GetRestaurantMenuOptions(int id)
+        {
+            return new OkObjectResult(repo.GetRestaurantMenuOptions(id));
+        }
+
+        [HttpGet("GetOptionTypes")]
+        public IActionResult GetOptionTypes()
+        {
+            return new OkObjectResult(repo.GetOptionTypes());
+        }
+
+        [HttpPost]
+        public IActionResult Post([FromBody] MenuOption value)
+        {
+            using (var scope = new TransactionScope())
+            {
+                repo.Insert(value);
+                scope.Complete();
+                return CreatedAtAction(nameof(Get), new { id = value.Id }, value);
+            }
+        }        
+
+        [HttpPut]
+        public IActionResult Put([FromBody] MenuOption value)
+        {
+            if (value != null)
+            {
+                using (var scope = new TransactionScope())
+                {
+                    repo.Update(value);
+                    scope.Complete();
+                    return new OkResult();
+                }
+            }
+            return new NoContentResult();
+        }
+        
+        [HttpDelete("{id}")]
+        public IActionResult Delete(int id)
+        {
+            repo.Delete(repo.GetMenuOption(id));
+            return new OkResult();
+        }
+
+        [HttpDelete("DeleteMenuOptionItem/{id}")]
+        public IActionResult DeleteMenuOptionItem(int id)
+        {
+            repo.DeleteItem(id);
+            return new OkResult();
+        }
+    }
+}

ProRestaurant/DBContexts/DBContext.cs

@@ -1,11 +1,9 @@
-using Microsoft.CodeAnalysis;
-using Microsoft.EntityFrameworkCore;
-using Npgsql;
+using Microsoft.EntityFrameworkCore;
+using ProRestaurant.Containers;
 using ProRestaurant.Models;
 using ProRestaurant.Models.Accounts;
 using ProRestaurant.Models.Misc;
 using ProRestaurant.Models.Restaurants;
-using System.Data.SqlClient;
 using System.Linq;
 
 namespace ProRestaurant.DBContexts
@@ -16,20 +14,7 @@ namespace ProRestaurant.DBContexts
         private bool UseSQL = false;
         public DBContext(DbContextOptions<DBContext> options) 
             : base(options)
-        {
-            foreach (var extention in options.Extensions)
-            {
-                if (extention.GetType().ToString() == "Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure.Internal.NpgsqlOptionsExtension")
-                {
-                    connectionString = ((Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure.Internal.NpgsqlOptionsExtension)extention).ConnectionString;
-                    UseSQL = false;
-                }
-                if (extention.GetType().ToString() == "Microsoft.EntityFrameworkCore.SqlServer.Infrastructure.Internal.SqlServerOptionsExtension")
-                {
-                    connectionString = ((Microsoft.EntityFrameworkCore.SqlServer.Infrastructure.Internal.SqlServerOptionsExtension)extention).ConnectionString;
-                    UseSQL = true;
-                }
-            }
+        {            
         }
 
         #region Accounts
@@ -43,6 +28,8 @@ namespace ProRestaurant.DBContexts
         public DbSet<TradingHours> TradingHours { get; set; }
         public DbSet<MenuCategory> MenuCategories { get; set; }
         public DbSet<MenuItem> MenuItems { get; set; }
+        public DbSet<MenuOption> MenuOptions { get; set; }
+        public DbSet<MenuOptionItem> MenuOptionItems { get; set; }
         public DbSet<RestaurantUser> RestaurantUsers { get; set; }
         public DbSet<RestaurantCategory> RestaurantCategories { get; set; }
         #endregion
@@ -52,8 +39,7 @@ namespace ProRestaurant.DBContexts
         #endregion
 
         public override int SaveChanges()
-        {
-            bool isBaseObject = false;
+        {            
             foreach (var item in ChangeTracker
                                     .Entries()
                                     .Where(x => x.State == EntityState.Modified || x.State == EntityState.Added)
@@ -61,13 +47,11 @@ namespace ProRestaurant.DBContexts
                                     .ToList())
             {
                 if (item is BaseObject)
-                {
-                    isBaseObject = true;
+                {                    
                     (item as BaseObject).UpdateModified(string.Empty);
                 }
-            }
-            if (isBaseObject)
-                UpdateSoftDeleteStatuses();
+            }            
+            UpdateSoftDeleteStatuses();
 
             return base.SaveChanges();
         }
@@ -75,22 +59,28 @@ namespace ProRestaurant.DBContexts
         private void UpdateSoftDeleteStatuses()
         {            
             foreach (var entry in ChangeTracker.Entries())
-            {                
-                switch (entry.State)
+            {
+                var props = (from p in entry.CurrentValues.Properties
+                             select p.Name).ToList();
+
+                if (props.Contains("IsDeleted"))
                 {
-                    case EntityState.Added:
-                        entry.CurrentValues["IsDeleted"] = false;
-                        break;
-                    case EntityState.Deleted:
-                        entry.State = EntityState.Modified;
-                        entry.CurrentValues["IsDeleted"] = true;
-                        break;
+                    switch (entry.State)
+                    {
+                        case EntityState.Added:
+                            entry.CurrentValues["IsDeleted"] = false;
+                            break;
+                        case EntityState.Deleted:
+                            entry.State = EntityState.Modified;
+                            entry.CurrentValues["IsDeleted"] = true;
+                            break;
+                    }
                 }
             }
         }
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
-        {
+        {            
             modelBuilder.Entity<User>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);
             modelBuilder.Entity<UserAddress>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);
             modelBuilder.Entity<DriverDetail>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);
@@ -98,45 +88,9 @@ namespace ProRestaurant.DBContexts
             modelBuilder.Entity<TradingHours>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);
             modelBuilder.Entity<MenuCategory>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);
             modelBuilder.Entity<MenuItem>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);
+            modelBuilder.Entity<MenuOption>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);
+            modelBuilder.Entity<MenuOptionItem>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);
             modelBuilder.Entity<RestaurantUser>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);            
         }
-
-        public int GetNextID(string tableName)
-        {
-            int returnValue = 0;
-            if (!UseSQL)
-            {
-                NpgsqlConnection connection = new NpgsqlConnection(connectionString);
-                connection.Open();
-
-                NpgsqlCommand cmd = connection.CreateCommand();
-                cmd.CommandText = string.Format("select MAX(\"Id\") from \"{0}\"", tableName);
-                NpgsqlDataReader reader = cmd.ExecuteReader();                
-
-                while (reader.Read())
-                {
-                    returnValue = int.Parse(reader[0] == null ? "0" : reader[0].ToString() == "" ? "0" : reader[0].ToString());
-                }
-
-                connection.Close();
-            }
-            else
-            {
-                SqlConnection connection = new SqlConnection(connectionString);
-                connection.Open();
-
-                SqlCommand cmd = connection.CreateCommand();
-                cmd.CommandText = string.Format("select MAX(\"Id\") from \"{0}\"", tableName);
-                SqlDataReader reader = cmd.ExecuteReader();                
-
-                while (reader.Read())
-                {
-                    returnValue = int.Parse(reader[0] == null ? "0" : reader[0].ToString() == "" ? "0" : reader[0].ToString());
-                }
-
-                connection.Close();
-            }
-            return returnValue + 1;
-        }
     }
 }

ProRestaurant/Migrations/20200608091919_ReInitDB.Designer.cs

@@ -1,369 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using ProRestaurant.DBContexts;
-
-namespace ProRestaurant.Migrations
-{
-    [DbContext(typeof(DBContext))]
-    [Migration("20200608091919_ReInitDB")]
-    partial class ReInitDB
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.0-rtm-35687")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128)
-                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-            modelBuilder.Entity("ProRestaurant.Models.Accounts.DriverDetail", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<string>("Photo");
-
-                    b.Property<string>("RegistrationNumber");
-
-                    b.Property<int>("UserId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId")
-                        .IsUnique();
-
-                    b.ToTable("DriverDetails");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Accounts.User", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("Cellphone");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("EmailAddress");
-
-                    b.Property<string>("FirstName");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<string>("Password");
-
-                    b.Property<string>("Surname");
-
-                    b.Property<int>("SystemRole");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Users");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Accounts.UserAddress", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("City");
-
-                    b.Property<string>("ComplexName");
-
-                    b.Property<string>("Country");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("GoogleMapUrl");
-
-                    b.Property<bool>("IsDefault");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<decimal>("Latitude");
-
-                    b.Property<decimal>("Longitude");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<string>("PostalCode");
-
-                    b.Property<string>("Provice");
-
-                    b.Property<string>("SteetNumber");
-
-                    b.Property<string>("StreetName");
-
-                    b.Property<string>("Suburb");
-
-                    b.Property<string>("UnitNumber");
-
-                    b.Property<int>("UserId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("UserAddresses");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Misc.Locations", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("ImageStore");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Locations");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuCategory", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("Description");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<int>("RestaurantId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RestaurantId");
-
-                    b.ToTable("MenuCategories");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuItem", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<int>("CategoryId");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("Description");
-
-                    b.Property<string>("Image");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<decimal>("Price");
-
-                    b.Property<int>("RestaurantId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RestaurantId");
-
-                    b.ToTable("MenuItems");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.Restaurant", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<bool>("Chain");
-
-                    b.Property<string>("City");
-
-                    b.Property<string>("Country");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<decimal>("DeliveryFee");
-
-                    b.Property<decimal>("DeliveryRadius");
-
-                    b.Property<string>("GoogleMapUrl");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<decimal>("Latitude");
-
-                    b.Property<string>("Logo");
-
-                    b.Property<decimal>("Longitude");
-
-                    b.Property<string>("MethodsOfPayment");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("PostalCode");
-
-                    b.Property<string>("Provice");
-
-                    b.Property<string>("ShopNumber");
-
-                    b.Property<string>("ShoppingCentre");
-
-                    b.Property<string>("StreetName");
-
-                    b.Property<string>("StreetNumber");
-
-                    b.Property<string>("Suburb");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Restaurants");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantUser", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<int>("RestaurantId");
-
-                    b.Property<int>("UserId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RestaurantId");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("RestaurantUsers");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.TradingHours", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<bool>("Closed");
-
-                    b.Property<DateTime>("ClosingTime");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("Description");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<DateTime>("OpeningTime");
-
-                    b.Property<int>("RestaurantId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RestaurantId");
-
-                    b.ToTable("TradingHours");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Accounts.DriverDetail", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Accounts.User", "User")
-                        .WithOne("DriverDetails")
-                        .HasForeignKey("ProRestaurant.Models.Accounts.DriverDetail", "UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Accounts.UserAddress", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Accounts.User", "User")
-                        .WithMany("Addresses")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuCategory", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
-                        .WithMany()
-                        .HasForeignKey("RestaurantId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuItem", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
-                        .WithMany()
-                        .HasForeignKey("RestaurantId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantUser", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
-                        .WithMany("Users")
-                        .HasForeignKey("RestaurantId")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("ProRestaurant.Models.Accounts.User", "User")
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.TradingHours", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
-                        .WithMany("TradingHours")
-                        .HasForeignKey("RestaurantId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

ProRestaurant/Migrations/20200608113150_001.Designer.cs

@@ -1,371 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using ProRestaurant.DBContexts;
-
-namespace ProRestaurant.Migrations
-{
-    [DbContext(typeof(DBContext))]
-    [Migration("20200608113150_001")]
-    partial class _001
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.0-rtm-35687")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128)
-                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-            modelBuilder.Entity("ProRestaurant.Models.Accounts.DriverDetail", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<string>("Photo");
-
-                    b.Property<string>("RegistrationNumber");
-
-                    b.Property<int>("UserId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId")
-                        .IsUnique();
-
-                    b.ToTable("DriverDetails");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Accounts.User", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("Cellphone");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("EmailAddress");
-
-                    b.Property<string>("FirstName");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<string>("Password");
-
-                    b.Property<string>("Surname");
-
-                    b.Property<int>("SystemRole");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Users");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Accounts.UserAddress", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("City");
-
-                    b.Property<string>("ComplexName");
-
-                    b.Property<string>("Country");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("GoogleMapUrl");
-
-                    b.Property<bool>("IsDefault");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<decimal>("Latitude");
-
-                    b.Property<decimal>("Longitude");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<string>("PostalCode");
-
-                    b.Property<string>("Provice");
-
-                    b.Property<string>("SteetNumber");
-
-                    b.Property<string>("StreetName");
-
-                    b.Property<string>("Suburb");
-
-                    b.Property<string>("UnitNumber");
-
-                    b.Property<int>("UserId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("UserAddresses");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Misc.Locations", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("ImageStore");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Locations");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuCategory", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("Description");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<int>("RestaurantId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RestaurantId");
-
-                    b.ToTable("MenuCategories");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuItem", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<int>("CategoryId");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("Description");
-
-                    b.Property<string>("Image");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<decimal>("Price");
-
-                    b.Property<int>("RestaurantId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RestaurantId");
-
-                    b.ToTable("MenuItems");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.Restaurant", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<bool>("Chain");
-
-                    b.Property<string>("City");
-
-                    b.Property<string>("Country");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<decimal>("DeliveryFee");
-
-                    b.Property<decimal>("DeliveryRadius");
-
-                    b.Property<string>("GoogleMapUrl");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<decimal>("Latitude");
-
-                    b.Property<string>("Logo");
-
-                    b.Property<decimal>("Longitude");
-
-                    b.Property<string>("MethodsOfPayment");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("PostalCode");
-
-                    b.Property<string>("Provice");
-
-                    b.Property<string>("ShopNumber");
-
-                    b.Property<string>("ShoppingCentre");
-
-                    b.Property<string>("StreetName");
-
-                    b.Property<string>("StreetNumber");
-
-                    b.Property<string>("Suburb");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Restaurants");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantUser", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<int>("RestaurantId");
-
-                    b.Property<int>("UserId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RestaurantId");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("RestaurantUsers");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.TradingHours", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<bool>("Closed");
-
-                    b.Property<DateTime>("ClosingTime");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("Description");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<bool>("Opened24H");
-
-                    b.Property<DateTime>("OpeningTime");
-
-                    b.Property<int>("RestaurantId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RestaurantId");
-
-                    b.ToTable("TradingHours");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Accounts.DriverDetail", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Accounts.User", "User")
-                        .WithOne("DriverDetails")
-                        .HasForeignKey("ProRestaurant.Models.Accounts.DriverDetail", "UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Accounts.UserAddress", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Accounts.User", "User")
-                        .WithMany("Addresses")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuCategory", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
-                        .WithMany()
-                        .HasForeignKey("RestaurantId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuItem", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
-                        .WithMany()
-                        .HasForeignKey("RestaurantId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantUser", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
-                        .WithMany("Users")
-                        .HasForeignKey("RestaurantId")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("ProRestaurant.Models.Accounts.User", "User")
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.TradingHours", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
-                        .WithMany("TradingHours")
-                        .HasForeignKey("RestaurantId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

ProRestaurant/Migrations/20200608113150_001.cs

@@ -1,23 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace ProRestaurant.Migrations
-{
-    public partial class _001 : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<bool>(
-                name: "Opened24H",
-                table: "TradingHours",
-                nullable: false,
-                defaultValue: false);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "Opened24H",
-                table: "TradingHours");
-        }
-    }
-}

ProRestaurant/Migrations/20200608133845_002.Designer.cs

@@ -1,388 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using ProRestaurant.DBContexts;
-
-namespace ProRestaurant.Migrations
-{
-    [DbContext(typeof(DBContext))]
-    [Migration("20200608133845_002")]
-    partial class _002
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.0-rtm-35687")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128)
-                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-            modelBuilder.Entity("ProRestaurant.Models.Accounts.DriverDetail", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<string>("Photo");
-
-                    b.Property<string>("RegistrationNumber");
-
-                    b.Property<int>("UserId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId")
-                        .IsUnique();
-
-                    b.ToTable("DriverDetails");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Accounts.User", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("Cellphone");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("EmailAddress");
-
-                    b.Property<string>("FirstName");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<string>("Password");
-
-                    b.Property<string>("Surname");
-
-                    b.Property<int>("SystemRole");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Users");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Accounts.UserAddress", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("City");
-
-                    b.Property<string>("ComplexName");
-
-                    b.Property<string>("Country");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("GoogleMapUrl");
-
-                    b.Property<bool>("IsDefault");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<decimal>("Latitude");
-
-                    b.Property<decimal>("Longitude");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<string>("PostalCode");
-
-                    b.Property<string>("Provice");
-
-                    b.Property<string>("SteetNumber");
-
-                    b.Property<string>("StreetName");
-
-                    b.Property<string>("Suburb");
-
-                    b.Property<string>("UnitNumber");
-
-                    b.Property<int>("UserId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("UserAddresses");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Misc.Locations", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("ImageStore");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Locations");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuCategory", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("Description");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<int>("RestaurantId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RestaurantId");
-
-                    b.ToTable("MenuCategories");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuItem", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<int>("CategoryId");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("Description");
-
-                    b.Property<string>("Image");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<decimal>("Price");
-
-                    b.Property<int>("RestaurantId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RestaurantId");
-
-                    b.ToTable("MenuItems");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.Restaurant", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("Categories");
-
-                    b.Property<bool>("Chain");
-
-                    b.Property<string>("City");
-
-                    b.Property<string>("Country");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<decimal>("DeliveryFee");
-
-                    b.Property<decimal>("DeliveryRadius");
-
-                    b.Property<string>("DeliveryTime");
-
-                    b.Property<string>("GoogleMapUrl");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<decimal>("Latitude");
-
-                    b.Property<string>("Logo");
-
-                    b.Property<decimal>("Longitude");
-
-                    b.Property<string>("MethodsOfPayment");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("PostalCode");
-
-                    b.Property<string>("Provice");
-
-                    b.Property<string>("ShopNumber");
-
-                    b.Property<string>("ShoppingCentre");
-
-                    b.Property<string>("StreetName");
-
-                    b.Property<string>("StreetNumber");
-
-                    b.Property<string>("Suburb");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Restaurants");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantCategory", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("Description");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("RestaurantCategories");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantUser", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<int>("RestaurantId");
-
-                    b.Property<int>("UserId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RestaurantId");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("RestaurantUsers");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.TradingHours", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<bool>("Closed");
-
-                    b.Property<DateTime>("ClosingTime");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("Description");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<bool>("Opened24H");
-
-                    b.Property<DateTime>("OpeningTime");
-
-                    b.Property<int>("RestaurantId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RestaurantId");
-
-                    b.ToTable("TradingHours");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Accounts.DriverDetail", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Accounts.User", "User")
-                        .WithOne("DriverDetails")
-                        .HasForeignKey("ProRestaurant.Models.Accounts.DriverDetail", "UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Accounts.UserAddress", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Accounts.User", "User")
-                        .WithMany("Addresses")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuCategory", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
-                        .WithMany()
-                        .HasForeignKey("RestaurantId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuItem", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
-                        .WithMany()
-                        .HasForeignKey("RestaurantId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantUser", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
-                        .WithMany("Users")
-                        .HasForeignKey("RestaurantId")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("ProRestaurant.Models.Accounts.User", "User")
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.TradingHours", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
-                        .WithMany("TradingHours")
-                        .HasForeignKey("RestaurantId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

ProRestaurant/Migrations/20200608133845_002.cs

@@ -1,48 +0,0 @@
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace ProRestaurant.Migrations
-{
-    public partial class _002 : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<string>(
-                name: "Categories",
-                table: "Restaurants",
-                nullable: true);
-
-            migrationBuilder.AddColumn<string>(
-                name: "DeliveryTime",
-                table: "Restaurants",
-                nullable: true);
-
-            migrationBuilder.CreateTable(
-                name: "RestaurantCategories",
-                columns: table => new
-                {
-                    Id = table.Column<int>(nullable: false)
-                        .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
-                    Description = table.Column<string>(nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_RestaurantCategories", x => x.Id);
-                });
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "RestaurantCategories");
-
-            migrationBuilder.DropColumn(
-                name: "Categories",
-                table: "Restaurants");
-
-            migrationBuilder.DropColumn(
-                name: "DeliveryTime",
-                table: "Restaurants");
-        }
-    }
-}

ProRestaurant/Migrations/20200608133952_003.Designer.cs

@@ -1,386 +0,0 @@
-// <auto-generated />
-using System;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using ProRestaurant.DBContexts;
-
-namespace ProRestaurant.Migrations
-{
-    [DbContext(typeof(DBContext))]
-    [Migration("20200608133952_003")]
-    partial class _003
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.0-rtm-35687")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128)
-                .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-            modelBuilder.Entity("ProRestaurant.Models.Accounts.DriverDetail", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<string>("Photo");
-
-                    b.Property<string>("RegistrationNumber");
-
-                    b.Property<int>("UserId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId")
-                        .IsUnique();
-
-                    b.ToTable("DriverDetails");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Accounts.User", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("Cellphone");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("EmailAddress");
-
-                    b.Property<string>("FirstName");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<string>("Password");
-
-                    b.Property<string>("Surname");
-
-                    b.Property<int>("SystemRole");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Users");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Accounts.UserAddress", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("City");
-
-                    b.Property<string>("ComplexName");
-
-                    b.Property<string>("Country");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("GoogleMapUrl");
-
-                    b.Property<bool>("IsDefault");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<decimal>("Latitude");
-
-                    b.Property<decimal>("Longitude");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<string>("PostalCode");
-
-                    b.Property<string>("Provice");
-
-                    b.Property<string>("SteetNumber");
-
-                    b.Property<string>("StreetName");
-
-                    b.Property<string>("Suburb");
-
-                    b.Property<string>("UnitNumber");
-
-                    b.Property<int>("UserId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("UserAddresses");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Misc.Locations", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("ImageStore");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Locations");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuCategory", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("Description");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<int>("RestaurantId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RestaurantId");
-
-                    b.ToTable("MenuCategories");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuItem", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<int>("CategoryId");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("Description");
-
-                    b.Property<string>("Image");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<decimal>("Price");
-
-                    b.Property<int>("RestaurantId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RestaurantId");
-
-                    b.ToTable("MenuItems");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.Restaurant", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("Categories");
-
-                    b.Property<string>("City");
-
-                    b.Property<string>("Country");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<decimal>("DeliveryFee");
-
-                    b.Property<decimal>("DeliveryRadius");
-
-                    b.Property<string>("DeliveryTime");
-
-                    b.Property<string>("GoogleMapUrl");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<decimal>("Latitude");
-
-                    b.Property<string>("Logo");
-
-                    b.Property<decimal>("Longitude");
-
-                    b.Property<string>("MethodsOfPayment");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<string>("Name");
-
-                    b.Property<string>("PostalCode");
-
-                    b.Property<string>("Provice");
-
-                    b.Property<string>("ShopNumber");
-
-                    b.Property<string>("ShoppingCentre");
-
-                    b.Property<string>("StreetName");
-
-                    b.Property<string>("StreetNumber");
-
-                    b.Property<string>("Suburb");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Restaurants");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantCategory", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<string>("Description");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("RestaurantCategories");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantUser", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<int>("RestaurantId");
-
-                    b.Property<int>("UserId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RestaurantId");
-
-                    b.HasIndex("UserId");
-
-                    b.ToTable("RestaurantUsers");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.TradingHours", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
-                    b.Property<bool>("Closed");
-
-                    b.Property<DateTime>("ClosingTime");
-
-                    b.Property<DateTime>("Created");
-
-                    b.Property<string>("Description");
-
-                    b.Property<bool>("IsDeleted");
-
-                    b.Property<DateTime>("Modified");
-
-                    b.Property<string>("ModifiedBy");
-
-                    b.Property<bool>("Opened24H");
-
-                    b.Property<DateTime>("OpeningTime");
-
-                    b.Property<int>("RestaurantId");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("RestaurantId");
-
-                    b.ToTable("TradingHours");
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Accounts.DriverDetail", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Accounts.User", "User")
-                        .WithOne("DriverDetails")
-                        .HasForeignKey("ProRestaurant.Models.Accounts.DriverDetail", "UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Accounts.UserAddress", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Accounts.User", "User")
-                        .WithMany("Addresses")
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuCategory", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
-                        .WithMany()
-                        .HasForeignKey("RestaurantId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuItem", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
-                        .WithMany()
-                        .HasForeignKey("RestaurantId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantUser", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
-                        .WithMany("Users")
-                        .HasForeignKey("RestaurantId")
-                        .OnDelete(DeleteBehavior.Cascade);
-
-                    b.HasOne("ProRestaurant.Models.Accounts.User", "User")
-                        .WithMany()
-                        .HasForeignKey("UserId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-
-            modelBuilder.Entity("ProRestaurant.Models.Restaurants.TradingHours", b =>
-                {
-                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
-                        .WithMany("TradingHours")
-                        .HasForeignKey("RestaurantId")
-                        .OnDelete(DeleteBehavior.Cascade);
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

ProRestaurant/Migrations/20200609191325_004.cs

@@ -1,31 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace ProRestaurant.Migrations
-{
-    public partial class _004 : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<string>(
-                name: "Image",
-                table: "RestaurantCategories",
-                nullable: true);
-
-            migrationBuilder.AddColumn<string>(
-                name: "CategoryStore",
-                table: "Locations",
-                nullable: true);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "Image",
-                table: "RestaurantCategories");
-
-            migrationBuilder.DropColumn(
-                name: "CategoryStore",
-                table: "Locations");
-        }
-    }
-}

ProRestaurant/Migrations/20200611111141_005.cs

@@ -1,23 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace ProRestaurant.Migrations
-{
-    public partial class _005 : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AddColumn<bool>(
-                name: "IsComplex",
-                table: "UserAddresses",
-                nullable: false,
-                defaultValue: false);
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "IsComplex",
-                table: "UserAddresses");
-        }
-    }
-}

ProRestaurant/Migrations/20200611113345_007.cs

@@ -1,23 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace ProRestaurant.Migrations
-{
-    public partial class _007 : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.RenameColumn(
-                name: "SteetNumber",
-                table: "UserAddresses",
-                newName: "StreetNumber");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.RenameColumn(
-                name: "StreetNumber",
-                table: "UserAddresses",
-                newName: "SteetNumber");
-        }
-    }
-}

ProRestaurant/Migrations/20200611113345_007.Designer.cs → ProRestaurant/Migrations/20200630140752_Recreate Database.Designer.cs

@@ -10,8 +10,8 @@ using ProRestaurant.DBContexts;
 namespace ProRestaurant.Migrations
 {
     [DbContext(typeof(DBContext))]
-    [Migration("20200611113345_007")]
-    partial class _007
+    [Migration("20200630140752_Recreate Database")]
+    partial class RecreateDatabase
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
         {
@@ -191,6 +191,8 @@ namespace ProRestaurant.Migrations
 
                     b.Property<string>("ModifiedBy");
 
+                    b.Property<string>("Name");
+
                     b.Property<decimal>("Price");
 
                     b.Property<int>("RestaurantId");
@@ -202,6 +204,70 @@ namespace ProRestaurant.Migrations
                     b.ToTable("MenuItems");
                 });
 
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuOption", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<int>("CategoryId");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Description");
+
+                    b.Property<bool>("IsBasePrice");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<int>("MenuItemId");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<int>("OptionLimit");
+
+                    b.Property<int>("OptionType");
+
+                    b.Property<int>("Rank");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CategoryId");
+
+                    b.ToTable("MenuOptions");
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuOptionItem", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Description");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<int?>("MenuOptionId");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<decimal>("Price");
+
+                    b.Property<int>("Rank");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("MenuOptionId");
+
+                    b.ToTable("MenuOptionItems");
+                });
+
             modelBuilder.Entity("ProRestaurant.Models.Restaurants.Restaurant", b =>
                 {
                     b.Property<int>("Id")
@@ -366,6 +432,21 @@ namespace ProRestaurant.Migrations
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuOption", b =>
+                {
+                    b.HasOne("ProRestaurant.Models.Restaurants.MenuCategory", "Category")
+                        .WithMany("Options")
+                        .HasForeignKey("CategoryId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuOptionItem", b =>
+                {
+                    b.HasOne("ProRestaurant.Models.Restaurants.MenuOption", "MenuOption")
+                        .WithMany("Options")
+                        .HasForeignKey("MenuOptionId");
+                });
+
             modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantUser", b =>
                 {
                     b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")

ProRestaurant/Migrations/20200608091919_ReInitDB.cs → ProRestaurant/Migrations/20200630140752_Recreate Database.cs

@@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace ProRestaurant.Migrations
 {
-    public partial class ReInitDB : Migration
+    public partial class RecreateDatabase : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
@@ -14,13 +14,28 @@ namespace ProRestaurant.Migrations
                 {
                     Id = table.Column<int>(nullable: false)
                         .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
-                    ImageStore = table.Column<string>(nullable: true)
+                    ImageStore = table.Column<string>(nullable: true),
+                    CategoryStore = table.Column<string>(nullable: true)
                 },
                 constraints: table =>
                 {
                     table.PrimaryKey("PK_Locations", x => x.Id);
                 });
 
+            migrationBuilder.CreateTable(
+                name: "RestaurantCategories",
+                columns: table => new
+                {
+                    Id = table.Column<int>(nullable: false)
+                        .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
+                    Description = table.Column<string>(nullable: true),
+                    Image = table.Column<string>(nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_RestaurantCategories", x => x.Id);
+                });
+
             migrationBuilder.CreateTable(
                 name: "Restaurants",
                 columns: table => new
@@ -33,7 +48,6 @@ namespace ProRestaurant.Migrations
                     IsDeleted = table.Column<bool>(nullable: false),
                     Name = table.Column<string>(nullable: true),
                     Logo = table.Column<string>(nullable: true),
-                    Chain = table.Column<bool>(nullable: false),
                     DeliveryFee = table.Column<decimal>(nullable: false),
                     DeliveryRadius = table.Column<decimal>(nullable: false),
                     MethodsOfPayment = table.Column<string>(nullable: true),
@@ -48,7 +62,9 @@ namespace ProRestaurant.Migrations
                     City = table.Column<string>(nullable: true),
                     Provice = table.Column<string>(nullable: true),
                     Country = table.Column<string>(nullable: true),
-                    PostalCode = table.Column<string>(nullable: true)
+                    PostalCode = table.Column<string>(nullable: true),
+                    DeliveryTime = table.Column<string>(nullable: true),
+                    Categories = table.Column<string>(nullable: true)
                 },
                 constraints: table =>
                 {
@@ -114,6 +130,7 @@ namespace ProRestaurant.Migrations
                     RestaurantId = table.Column<int>(nullable: false),
                     CategoryId = table.Column<int>(nullable: false),
                     Image = table.Column<string>(nullable: true),
+                    Name = table.Column<string>(nullable: true),
                     Description = table.Column<string>(nullable: true),
                     Price = table.Column<decimal>(nullable: false)
                 },
@@ -142,7 +159,8 @@ namespace ProRestaurant.Migrations
                     Description = table.Column<string>(nullable: true),
                     OpeningTime = table.Column<DateTime>(nullable: false),
                     ClosingTime = table.Column<DateTime>(nullable: false),
-                    Closed = table.Column<bool>(nullable: false)
+                    Closed = table.Column<bool>(nullable: false),
+                    Opened24H = table.Column<bool>(nullable: false)
                 },
                 constraints: table =>
                 {
@@ -222,16 +240,17 @@ namespace ProRestaurant.Migrations
                     IsDeleted = table.Column<bool>(nullable: false),
                     UserId = table.Column<int>(nullable: false),
                     IsDefault = table.Column<bool>(nullable: false),
+                    IsComplex = table.Column<bool>(nullable: false),
                     GoogleMapUrl = table.Column<string>(nullable: true),
                     Latitude = table.Column<decimal>(nullable: false),
                     Longitude = table.Column<decimal>(nullable: false),
                     UnitNumber = table.Column<string>(nullable: true),
                     ComplexName = table.Column<string>(nullable: true),
-                    SteetNumber = table.Column<string>(nullable: true),
+                    StreetNumber = table.Column<string>(nullable: true),
                     StreetName = table.Column<string>(nullable: true),
                     Suburb = table.Column<string>(nullable: true),
                     City = table.Column<string>(nullable: true),
-                    Provice = table.Column<string>(nullable: true),
+                    Province = table.Column<string>(nullable: true),
                     Country = table.Column<string>(nullable: true),
                     PostalCode = table.Column<string>(nullable: true)
                 },
@@ -246,6 +265,61 @@ namespace ProRestaurant.Migrations
                         onDelete: ReferentialAction.Cascade);
                 });
 
+            migrationBuilder.CreateTable(
+                name: "MenuOptions",
+                columns: table => new
+                {
+                    Id = table.Column<int>(nullable: false)
+                        .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
+                    Created = table.Column<DateTime>(nullable: false),
+                    Modified = table.Column<DateTime>(nullable: false),
+                    ModifiedBy = table.Column<string>(nullable: true),
+                    IsDeleted = table.Column<bool>(nullable: false),
+                    CategoryId = table.Column<int>(nullable: false),
+                    Description = table.Column<string>(nullable: true),
+                    OptionType = table.Column<int>(nullable: false),
+                    OptionLimit = table.Column<int>(nullable: false),
+                    IsBasePrice = table.Column<bool>(nullable: false),
+                    Rank = table.Column<int>(nullable: false),
+                    MenuItemId = table.Column<int>(nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_MenuOptions", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_MenuOptions_MenuCategories_CategoryId",
+                        column: x => x.CategoryId,
+                        principalTable: "MenuCategories",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "MenuOptionItems",
+                columns: table => new
+                {
+                    Id = table.Column<int>(nullable: false)
+                        .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
+                    Created = table.Column<DateTime>(nullable: false),
+                    Modified = table.Column<DateTime>(nullable: false),
+                    ModifiedBy = table.Column<string>(nullable: true),
+                    IsDeleted = table.Column<bool>(nullable: false),
+                    MenuOptionId = table.Column<int>(nullable: true),
+                    Description = table.Column<string>(nullable: true),
+                    Price = table.Column<decimal>(nullable: false),
+                    Rank = table.Column<int>(nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_MenuOptionItems", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_MenuOptionItems_MenuOptions_MenuOptionId",
+                        column: x => x.MenuOptionId,
+                        principalTable: "MenuOptions",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Restrict);
+                });
+
             migrationBuilder.CreateIndex(
                 name: "IX_DriverDetails_UserId",
                 table: "DriverDetails",
@@ -262,6 +336,16 @@ namespace ProRestaurant.Migrations
                 table: "MenuItems",
                 column: "RestaurantId");
 
+            migrationBuilder.CreateIndex(
+                name: "IX_MenuOptionItems_MenuOptionId",
+                table: "MenuOptionItems",
+                column: "MenuOptionId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_MenuOptions_CategoryId",
+                table: "MenuOptions",
+                column: "CategoryId");
+
             migrationBuilder.CreateIndex(
                 name: "IX_RestaurantUsers_RestaurantId",
                 table: "RestaurantUsers",
@@ -292,10 +376,13 @@ namespace ProRestaurant.Migrations
                 name: "Locations");
 
             migrationBuilder.DropTable(
-                name: "MenuCategories");
+                name: "MenuItems");
 
             migrationBuilder.DropTable(
-                name: "MenuItems");
+                name: "MenuOptionItems");
+
+            migrationBuilder.DropTable(
+                name: "RestaurantCategories");
 
             migrationBuilder.DropTable(
                 name: "RestaurantUsers");
@@ -307,10 +394,16 @@ namespace ProRestaurant.Migrations
                 name: "UserAddresses");
 
             migrationBuilder.DropTable(
-                name: "Restaurants");
+                name: "MenuOptions");
 
             migrationBuilder.DropTable(
                 name: "Users");
+
+            migrationBuilder.DropTable(
+                name: "MenuCategories");
+
+            migrationBuilder.DropTable(
+                name: "Restaurants");
         }
     }
 }

ProRestaurant/Migrations/20200611112655_006.Designer.cs → ProRestaurant/Migrations/20200630143357_MenuItem Override added.Designer.cs

@@ -10,8 +10,8 @@ using ProRestaurant.DBContexts;
 namespace ProRestaurant.Migrations
 {
     [DbContext(typeof(DBContext))]
-    [Migration("20200611112655_006")]
-    partial class _006
+    [Migration("20200630143357_MenuItem Override added")]
+    partial class MenuItemOverrideadded
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
         {
@@ -114,10 +114,10 @@ namespace ProRestaurant.Migrations
 
                     b.Property<string>("Province");
 
-                    b.Property<string>("SteetNumber");
-
                     b.Property<string>("StreetName");
 
+                    b.Property<string>("StreetNumber");
+
                     b.Property<string>("Suburb");
 
                     b.Property<string>("UnitNumber");
@@ -191,6 +191,10 @@ namespace ProRestaurant.Migrations
 
                     b.Property<string>("ModifiedBy");
 
+                    b.Property<string>("Name");
+
+                    b.Property<bool>("OverrideOptions");
+
                     b.Property<decimal>("Price");
 
                     b.Property<int>("RestaurantId");
@@ -202,6 +206,70 @@ namespace ProRestaurant.Migrations
                     b.ToTable("MenuItems");
                 });
 
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuOption", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<int>("CategoryId");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Description");
+
+                    b.Property<bool>("IsBasePrice");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<int>("MenuItemId");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<int>("OptionLimit");
+
+                    b.Property<int>("OptionType");
+
+                    b.Property<int>("Rank");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CategoryId");
+
+                    b.ToTable("MenuOptions");
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuOptionItem", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Description");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<int?>("MenuOptionId");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<decimal>("Price");
+
+                    b.Property<int>("Rank");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("MenuOptionId");
+
+                    b.ToTable("MenuOptionItems");
+                });
+
             modelBuilder.Entity("ProRestaurant.Models.Restaurants.Restaurant", b =>
                 {
                     b.Property<int>("Id")
@@ -366,6 +434,21 @@ namespace ProRestaurant.Migrations
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuOption", b =>
+                {
+                    b.HasOne("ProRestaurant.Models.Restaurants.MenuCategory", "Category")
+                        .WithMany("Options")
+                        .HasForeignKey("CategoryId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuOptionItem", b =>
+                {
+                    b.HasOne("ProRestaurant.Models.Restaurants.MenuOption", "MenuOption")
+                        .WithMany("Options")
+                        .HasForeignKey("MenuOptionId");
+                });
+
             modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantUser", b =>
                 {
                     b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")

ProRestaurant/Migrations/20200608133952_003.cs → ProRestaurant/Migrations/20200630143357_MenuItem Override added.cs

@@ -2,22 +2,22 @@
 
 namespace ProRestaurant.Migrations
 {
-    public partial class _003 : Migration
+    public partial class MenuItemOverrideadded : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
-            migrationBuilder.DropColumn(
-                name: "Chain",
-                table: "Restaurants");
+            migrationBuilder.AddColumn<bool>(
+                name: "OverrideOptions",
+                table: "MenuItems",
+                nullable: false,
+                defaultValue: false);
         }
 
         protected override void Down(MigrationBuilder migrationBuilder)
         {
-            migrationBuilder.AddColumn<bool>(
-                name: "Chain",
-                table: "Restaurants",
-                nullable: false,
-                defaultValue: false);
+            migrationBuilder.DropColumn(
+                name: "OverrideOptions",
+                table: "MenuItems");
         }
     }
 }

ProRestaurant/Migrations/20200609191325_004.Designer.cs → ProRestaurant/Migrations/20200703060514_Province Spelling fix.Designer.cs

@@ -10,8 +10,8 @@ using ProRestaurant.DBContexts;
 namespace ProRestaurant.Migrations
 {
     [DbContext(typeof(DBContext))]
-    [Migration("20200609191325_004")]
-    partial class _004
+    [Migration("20200703060514_Province Spelling fix")]
+    partial class ProvinceSpellingfix
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
         {
@@ -96,6 +96,8 @@ namespace ProRestaurant.Migrations
 
                     b.Property<string>("GoogleMapUrl");
 
+                    b.Property<bool>("IsComplex");
+
                     b.Property<bool>("IsDefault");
 
                     b.Property<bool>("IsDeleted");
@@ -110,12 +112,12 @@ namespace ProRestaurant.Migrations
 
                     b.Property<string>("PostalCode");
 
-                    b.Property<string>("Provice");
-
-                    b.Property<string>("SteetNumber");
+                    b.Property<string>("Province");
 
                     b.Property<string>("StreetName");
 
+                    b.Property<string>("StreetNumber");
+
                     b.Property<string>("Suburb");
 
                     b.Property<string>("UnitNumber");
@@ -189,6 +191,10 @@ namespace ProRestaurant.Migrations
 
                     b.Property<string>("ModifiedBy");
 
+                    b.Property<string>("Name");
+
+                    b.Property<bool>("OverrideOptions");
+
                     b.Property<decimal>("Price");
 
                     b.Property<int>("RestaurantId");
@@ -200,6 +206,70 @@ namespace ProRestaurant.Migrations
                     b.ToTable("MenuItems");
                 });
 
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuOption", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<int>("CategoryId");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Description");
+
+                    b.Property<bool>("IsBasePrice");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<int>("MenuItemId");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<int>("OptionLimit");
+
+                    b.Property<int>("OptionType");
+
+                    b.Property<int>("Rank");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CategoryId");
+
+                    b.ToTable("MenuOptions");
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuOptionItem", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Description");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<int?>("MenuOptionId");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<decimal>("Price");
+
+                    b.Property<int>("Rank");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("MenuOptionId");
+
+                    b.ToTable("MenuOptionItems");
+                });
+
             modelBuilder.Entity("ProRestaurant.Models.Restaurants.Restaurant", b =>
                 {
                     b.Property<int>("Id")
@@ -240,7 +310,7 @@ namespace ProRestaurant.Migrations
 
                     b.Property<string>("PostalCode");
 
-                    b.Property<string>("Provice");
+                    b.Property<string>("Province");
 
                     b.Property<string>("ShopNumber");
 
@@ -364,6 +434,21 @@ namespace ProRestaurant.Migrations
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuOption", b =>
+                {
+                    b.HasOne("ProRestaurant.Models.Restaurants.MenuCategory", "Category")
+                        .WithMany("Options")
+                        .HasForeignKey("CategoryId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuOptionItem", b =>
+                {
+                    b.HasOne("ProRestaurant.Models.Restaurants.MenuOption", "MenuOption")
+                        .WithMany("Options")
+                        .HasForeignKey("MenuOptionId");
+                });
+
             modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantUser", b =>
                 {
                     b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")

ProRestaurant/Migrations/20200611112655_006.cs → ProRestaurant/Migrations/20200703060514_Province Spelling fix.cs

@@ -2,13 +2,13 @@
 
 namespace ProRestaurant.Migrations
 {
-    public partial class _006 : Migration
+    public partial class ProvinceSpellingfix : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
             migrationBuilder.RenameColumn(
                 name: "Provice",
-                table: "UserAddresses",
+                table: "Restaurants",
                 newName: "Province");
         }
 
@@ -16,7 +16,7 @@ namespace ProRestaurant.Migrations
         {
             migrationBuilder.RenameColumn(
                 name: "Province",
-                table: "UserAddresses",
+                table: "Restaurants",
                 newName: "Provice");
         }
     }

ProRestaurant/Migrations/20200611111141_005.Designer.cs → ProRestaurant/Migrations/20200703123907_MenuOption FK nullable to Category.Designer.cs

@@ -10,8 +10,8 @@ using ProRestaurant.DBContexts;
 namespace ProRestaurant.Migrations
 {
     [DbContext(typeof(DBContext))]
-    [Migration("20200611111141_005")]
-    partial class _005
+    [Migration("20200703123907_MenuOption FK nullable to Category")]
+    partial class MenuOptionFKnullabletoCategory
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
         {
@@ -112,12 +112,12 @@ namespace ProRestaurant.Migrations
 
                     b.Property<string>("PostalCode");
 
-                    b.Property<string>("Provice");
-
-                    b.Property<string>("SteetNumber");
+                    b.Property<string>("Province");
 
                     b.Property<string>("StreetName");
 
+                    b.Property<string>("StreetNumber");
+
                     b.Property<string>("Suburb");
 
                     b.Property<string>("UnitNumber");
@@ -191,6 +191,10 @@ namespace ProRestaurant.Migrations
 
                     b.Property<string>("ModifiedBy");
 
+                    b.Property<string>("Name");
+
+                    b.Property<bool>("OverrideOptions");
+
                     b.Property<decimal>("Price");
 
                     b.Property<int>("RestaurantId");
@@ -202,6 +206,70 @@ namespace ProRestaurant.Migrations
                     b.ToTable("MenuItems");
                 });
 
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuOption", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<int?>("CategoryId");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Description");
+
+                    b.Property<bool>("IsBasePrice");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<int>("MenuItemId");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<int>("OptionLimit");
+
+                    b.Property<int>("OptionType");
+
+                    b.Property<int>("Rank");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CategoryId");
+
+                    b.ToTable("MenuOptions");
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuOptionItem", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Description");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<int?>("MenuOptionId");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<decimal>("Price");
+
+                    b.Property<int>("Rank");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("MenuOptionId");
+
+                    b.ToTable("MenuOptionItems");
+                });
+
             modelBuilder.Entity("ProRestaurant.Models.Restaurants.Restaurant", b =>
                 {
                     b.Property<int>("Id")
@@ -242,7 +310,7 @@ namespace ProRestaurant.Migrations
 
                     b.Property<string>("PostalCode");
 
-                    b.Property<string>("Provice");
+                    b.Property<string>("Province");
 
                     b.Property<string>("ShopNumber");
 
@@ -366,6 +434,20 @@ namespace ProRestaurant.Migrations
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuOption", b =>
+                {
+                    b.HasOne("ProRestaurant.Models.Restaurants.MenuCategory", "Category")
+                        .WithMany("Options")
+                        .HasForeignKey("CategoryId");
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuOptionItem", b =>
+                {
+                    b.HasOne("ProRestaurant.Models.Restaurants.MenuOption", "MenuOption")
+                        .WithMany("Options")
+                        .HasForeignKey("MenuOptionId");
+                });
+
             modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantUser", b =>
                 {
                     b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")

ProRestaurant/Migrations/20200703123907_MenuOption FK nullable to Category.cs

@@ -0,0 +1,50 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace ProRestaurant.Migrations
+{
+    public partial class MenuOptionFKnullabletoCategory : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_MenuOptions_MenuCategories_CategoryId",
+                table: "MenuOptions");
+
+            migrationBuilder.AlterColumn<int>(
+                name: "CategoryId",
+                table: "MenuOptions",
+                nullable: true,
+                oldClrType: typeof(int));
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_MenuOptions_MenuCategories_CategoryId",
+                table: "MenuOptions",
+                column: "CategoryId",
+                principalTable: "MenuCategories",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_MenuOptions_MenuCategories_CategoryId",
+                table: "MenuOptions");
+
+            migrationBuilder.AlterColumn<int>(
+                name: "CategoryId",
+                table: "MenuOptions",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldNullable: true);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_MenuOptions_MenuCategories_CategoryId",
+                table: "MenuOptions",
+                column: "CategoryId",
+                principalTable: "MenuCategories",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+    }
+}

ProRestaurant/Migrations/DBContextModelSnapshot.cs

@@ -189,6 +189,10 @@ namespace ProRestaurant.Migrations
 
                     b.Property<string>("ModifiedBy");
 
+                    b.Property<string>("Name");
+
+                    b.Property<bool>("OverrideOptions");
+
                     b.Property<decimal>("Price");
 
                     b.Property<int>("RestaurantId");
@@ -200,6 +204,70 @@ namespace ProRestaurant.Migrations
                     b.ToTable("MenuItems");
                 });
 
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuOption", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<int?>("CategoryId");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Description");
+
+                    b.Property<bool>("IsBasePrice");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<int>("MenuItemId");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<int>("OptionLimit");
+
+                    b.Property<int>("OptionType");
+
+                    b.Property<int>("Rank");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CategoryId");
+
+                    b.ToTable("MenuOptions");
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuOptionItem", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Description");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<int?>("MenuOptionId");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<decimal>("Price");
+
+                    b.Property<int>("Rank");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("MenuOptionId");
+
+                    b.ToTable("MenuOptionItems");
+                });
+
             modelBuilder.Entity("ProRestaurant.Models.Restaurants.Restaurant", b =>
                 {
                     b.Property<int>("Id")
@@ -240,7 +308,7 @@ namespace ProRestaurant.Migrations
 
                     b.Property<string>("PostalCode");
 
-                    b.Property<string>("Provice");
+                    b.Property<string>("Province");
 
                     b.Property<string>("ShopNumber");
 
@@ -364,6 +432,20 @@ namespace ProRestaurant.Migrations
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuOption", b =>
+                {
+                    b.HasOne("ProRestaurant.Models.Restaurants.MenuCategory", "Category")
+                        .WithMany("Options")
+                        .HasForeignKey("CategoryId");
+                });
+
+            modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuOptionItem", b =>
+                {
+                    b.HasOne("ProRestaurant.Models.Restaurants.MenuOption", "MenuOption")
+                        .WithMany("Options")
+                        .HasForeignKey("MenuOptionId");
+                });
+
             modelBuilder.Entity("ProRestaurant.Models.Restaurants.RestaurantUser", b =>
                 {
                     b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")

ProRestaurant/Models/Restaurants/MenuCategory.cs

@@ -1,4 +1,5 @@
-using System.ComponentModel.DataAnnotations.Schema;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace ProRestaurant.Models.Restaurants
 {
@@ -9,5 +10,6 @@ namespace ProRestaurant.Models.Restaurants
         public string Description { get; set; }
 
         public virtual Restaurant Restaurant { get; set; }
+        public ICollection<MenuOption> Options { get; set; }
     }
 }

ProRestaurant/Models/Restaurants/MenuItem.cs

@@ -1,4 +1,5 @@
-using System.ComponentModel.DataAnnotations.Schema;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace ProRestaurant.Models.Restaurants
 {
@@ -8,9 +9,17 @@ namespace ProRestaurant.Models.Restaurants
         public int RestaurantId { get; set; }
         public int CategoryId { get; set; }
         public string Image { get; set; }
+        public string Name { get; set; }
         public string Description { get; set; }
         public decimal Price { get; set; }
+        public bool OverrideOptions { get; set; }
 
-        public virtual Restaurant Restaurant { get; set; }
+        public virtual Restaurant Restaurant { get; set; }        
+
+        [NotMapped]
+        public string Category { get; set; }
+
+        [NotMapped]
+        public ICollection<MenuOption> Options { get; set; }
     }
 }

ProRestaurant/Models/Restaurants/MenuOption.cs

@@ -0,0 +1,25 @@
+using ProRestaurant.Classes;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace ProRestaurant.Models.Restaurants
+{
+    public class MenuOption : BaseObject
+    {                   
+        public int? CategoryId { get; set; }
+        public string Description { get; set; }
+        public OptionType OptionType { get; set; }
+        public int OptionLimit { get; set; }
+        public bool IsBasePrice { get; set; }
+        public int Rank { get; set; }
+        public int MenuItemId { get; set; }
+
+        public ICollection<MenuOptionItem> Options { get; set; }        
+        public virtual MenuCategory Category { get; set; }
+
+        [NotMapped]
+        public string CategoryDescription { get; set; }
+        [NotMapped]
+        public string OptionTypeDescription { get; set; }
+    }
+}

ProRestaurant/Models/Restaurants/MenuOptionItem.cs

@@ -0,0 +1,10 @@
+namespace ProRestaurant.Models.Restaurants
+{
+    public class MenuOptionItem : BaseObject
+    {
+        public MenuOption MenuOption { get; set; }
+        public string Description { get; set; }
+        public decimal Price { get; set; }
+        public int Rank { get; set;  }
+    }
+}

ProRestaurant/Models/Restaurants/Restaurant.cs

@@ -18,13 +18,13 @@ namespace ProRestaurant.Models.Restaurants
         public string StreetName { get; set; }
         public string Suburb { get; set; }
         public string City { get; set; }
-        public string Provice { get; set; }
+        public string Province { get; set; }
         public string Country { get; set; }
         public string PostalCode { get; set; }
         public string DeliveryTime { get; set; }
         public string Categories { get; set; }
 
         public ICollection<TradingHours> TradingHours { get; set; }   
-        public ICollection<RestaurantUser> Users { get; set; }
+        public ICollection<RestaurantUser> Users { get; set; }        
     }
 }

ProRestaurant/Repository/Accounts/RegistrationRepository.cs

@@ -33,7 +33,7 @@ namespace ProRestaurant.Repository.Accounts
                 StreetName = "",
                 Suburb = "",
                 City = "",
-                Provice = "",
+                Province = "",
                 Country = "",
 
             };
@@ -79,7 +79,7 @@ namespace ProRestaurant.Repository.Accounts
 
         public RestaurantContainer RegisterRestaurant(RestaurantContainer RestaurantContainer)
         {            
-            var restaurantCheck = dBContext.Restaurants.Where(r => r.Name == RestaurantContainer.Name && r.Suburb == RestaurantContainer.Suburb && r.City == RestaurantContainer.City && r.Provice == RestaurantContainer.Provice && r.Country == RestaurantContainer.Country).FirstOrDefault();
+            var restaurantCheck = dBContext.Restaurants.Where(r => r.Name == RestaurantContainer.Name && r.Suburb == RestaurantContainer.Suburb && r.City == RestaurantContainer.City && r.Province == RestaurantContainer.Province && r.Country == RestaurantContainer.Country).FirstOrDefault();
             if (restaurantCheck != null)
             {
                 RestaurantContainer.Result = "A Restaurant with the same name has already been registered in this location. ";
@@ -118,7 +118,7 @@ namespace ProRestaurant.Repository.Accounts
                 StreetName = RestaurantContainer.StreetName,
                 Suburb = RestaurantContainer.Suburb,
                 City = RestaurantContainer.City,
-                Provice = RestaurantContainer.Provice,
+                Province = RestaurantContainer.Province,
                 Country = RestaurantContainer.Country,
                 PostalCode = RestaurantContainer.PostalCode,
                 Categories = RestaurantContainer.Categories

ProRestaurant/Repository/Restaurants/IMenuCategoryRepository.cs

@@ -1,7 +1,6 @@
 using ProRestaurant.Models.Restaurants;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 
 namespace ProRestaurant.Repository.Restaurants

ProRestaurant/Repository/Restaurants/IMenuItemRepository.cs

@@ -0,0 +1,16 @@
+using ProRestaurant.Models.Restaurants;
+using System;
+using System.Collections.Generic;
+
+namespace ProRestaurant.Repository.Restaurants
+{
+    public interface IMenuItemRepository
+    {
+        MenuItem GetMenuItem(int Id);
+        IEnumerable<MenuItem> GetMenuItems(Func<MenuItem, bool> where);
+        void Insert(MenuItem Item);
+        void Remove(MenuItem Item);
+        void Update(MenuItem Item);
+        void Save();
+    }
+}

ProRestaurant/Repository/Restaurants/IMenuOptionRepository.cs

@@ -0,0 +1,19 @@
+using ProRestaurant.Containers;
+using ProRestaurant.Models.Restaurants;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+
+namespace ProRestaurant.Repository.Restaurants
+{
+    public interface IMenuOptionRepository
+    {
+        MenuOption GetMenuOption(int id);
+        List<MenuOption> GetRestaurantMenuOptions(int restaurantId);
+        List<OptionTypeContainer> GetOptionTypes();
+        void Insert(MenuOption Option);
+        void Update(MenuOption Option);
+        void Delete(MenuOption Option);
+        void DeleteItem(int id);
+        void Save();
+    }
+}

ProRestaurant/Repository/Restaurants/IMenuRepository.cs

@@ -0,0 +1,196 @@
+using ProRestaurant.Classes;
+using ProRestaurant.Containers;
+using ProRestaurant.DBContexts;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace ProRestaurant.Repository.Restaurants
+{
+    public interface IMenuRepository
+    {
+        RestaurantMenuContainer GetMenu(int restaurantId);
+        MenuContainer GetOptions(int MenuID, int CategoryID);
+    }
+
+    public class MenuRepository : IMenuRepository
+    {
+        private readonly DBContext dBContext;
+
+        public MenuRepository(DBContext db)
+        {
+            dBContext = db;
+        }
+
+        public RestaurantMenuContainer GetMenu(int restaurantId)
+        {            
+            var restaurant = dBContext.Restaurants.Where(r => r.Id == restaurantId).FirstOrDefault();
+
+            var menu = new RestaurantMenuContainer
+            {
+                Id = restaurant.Id,
+                Name = restaurant.Name,
+                Categories = restaurant.Categories,
+                DeliveryTime = restaurant.DeliveryTime,
+                DeliveryFee = string.Format("R {0:N}", restaurant.DeliveryFee),
+                Suburb = restaurant.Suburb,
+                City = restaurant.City,
+                Province = restaurant.Province,
+                PostalCode = restaurant.PostalCode,
+                Latitude = restaurant.Latitude,
+                Longitude = restaurant.Longitude,
+                Logo = restaurant.Logo.StartsWith("data:image") ? restaurant.Logo : ImageFormatter.ImageToBase64(restaurant.Logo),
+                CategoryList = new List<string>(),
+                TradingHours = new List<TradingHourContainer>(),
+                MenuList = new List<MenuCategoryContainer>()
+            };
+
+            var categories = dBContext.MenuCategories.Where(c => c.RestaurantId == restaurantId).ToList();
+            foreach (var cat in categories)
+            {
+                menu.CategoryList.Add(cat.Description);
+
+                MenuCategoryContainer menuItem = new MenuCategoryContainer
+                {
+                    Category = cat.Description,
+                    Items = new List<MenuItemContainer>()
+                };
+
+                var MenuItems = dBContext.MenuItems.Where(mi => mi.CategoryId == cat.Id).ToList();
+                foreach (var item in MenuItems)
+                {
+                    menuItem.Items.Add(new MenuItemContainer
+                    {
+                        MenuId = item.Id,
+                        CategoryId = item.CategoryId,
+                        Name = item.Name,
+                        Description = item.Description,
+                        Price = string.Format("{0:C}", item.Price),
+                        Image = item.Image.StartsWith("data:image") ? item.Image : ImageFormatter.ImageToBase64(item.Image)
+                    });
+                }
+
+                menu.MenuList.Add(menuItem);
+            }
+
+            var tradingHours = dBContext.TradingHours.Where(t => t.RestaurantId == restaurantId).ToList();
+            foreach (var tHours in tradingHours)
+            {
+                var hour = new TradingHourContainer()
+                {
+                    Description = tHours.Description
+                };
+
+                if (tHours.Closed)
+                    hour.Time = "Closed";
+                else if (tHours.Opened24H)
+                    hour.Time = "Open 24 Hours";
+                else
+                    hour.Time = string.Format("{0:hh:mm} - {1:hh:mm}", tHours.OpeningTime, tHours.ClosingTime);
+
+                menu.TradingHours.Add(hour);
+            }
+
+            return menu;
+        }
+
+        public MenuContainer GetOptions(int MenuID, int CategoryID)
+        {            
+            var mItem = dBContext.MenuItems.Where(m => m.Id == MenuID).FirstOrDefault();
+
+            MenuContainer menu = new MenuContainer
+            {
+                Id = MenuID,
+                Name = mItem.Name,
+                Description = mItem.Description,
+                Price = mItem.Price,
+                DisplayPrice = string.Format("{0:C}", mItem.Price),
+                Image = mItem.Image.StartsWith("data:image") ? mItem.Image : ImageFormatter.ImageToBase64(mItem.Image),
+                Options = new List<OptionContainer>()
+            };
+
+
+            var menuOptions = dBContext.MenuOptions.Where(mo => mo.CategoryId == CategoryID).OrderBy(mo => mo.Rank).ToList();
+
+            foreach (var option in menuOptions)
+            {
+                OptionContainer opt = new OptionContainer
+                {
+                    Description = option.Description,
+                    OptionType = option.OptionType.ToString(),
+                    Limit = option.OptionLimit,
+                    IsBasePrice = option.IsBasePrice,
+                    SpecialInstructions = "",
+                    Options = new List<OptionItemContainer>()
+                };
+
+                switch (option.OptionType)
+                {
+                    case OptionType.SingleRequired:
+                        opt.SubTitle = "Required";
+                        break;
+                    case OptionType.MultipleLimit:
+                        opt.SubTitle = string.Format("Choose {0}", opt.Limit);
+                        break;
+                    default:
+                        opt.SubTitle = "";
+                        break;
+                }
+
+                var menuItems = dBContext.MenuOptionItems.Where(i => i.MenuOption == option).OrderBy(i => i.Rank).ToList();
+                foreach (var item in menuItems)
+                {
+                    opt.Options.Add(new OptionItemContainer()
+                    {
+                        Description = item.Description,
+                        Price = item.Price
+                    });
+                }
+                menu.Options.Add(opt);
+            }
+
+
+            menuOptions = dBContext.MenuOptions.Where(mo => mo.CategoryId == null).OrderBy(mo => mo.Rank).ToList();
+
+            foreach (var option in menuOptions)
+            {
+                OptionContainer opt = new OptionContainer
+                {
+                    Description = option.Description,
+                    OptionType = option.OptionType.ToString(),
+                    Limit = option.OptionLimit,
+                    IsBasePrice = option.IsBasePrice,
+                    SpecialInstructions = "",
+                    Options = new List<OptionItemContainer>()
+                };
+
+                switch (option.OptionType)
+                {
+                    case OptionType.SingleRequired:
+                        opt.SubTitle = "Required";
+                        break;
+                    case OptionType.MultipleLimit:
+                        opt.SubTitle = string.Format("Choose {0}", opt.Limit);
+                        break;
+                    default:
+                        opt.SubTitle = "";
+                        break;
+                }
+
+                var menuItems = dBContext.MenuOptionItems.Where(i => i.MenuOption == option).OrderBy(i => i.Rank).ToList();
+                foreach (var item in menuItems)
+                {
+                    opt.Options.Add(new OptionItemContainer()
+                    {
+                        Description = item.Description,
+                        Price = item.Price
+                    });
+                }
+                menu.Options.Add(opt);
+            }
+
+            return menu;
+        }
+    }
+}

ProRestaurant/Repository/Restaurants/MenuItemRepository.cs

@@ -0,0 +1,120 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion.Internal;
+using ProRestaurant.Classes;
+using ProRestaurant.DBContexts;
+using ProRestaurant.Models.Restaurants;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+
+namespace ProRestaurant.Repository.Restaurants
+{
+    public class MenuItemRepository : IMenuItemRepository
+    {
+        private readonly DBContext dBContext;
+
+        public MenuItemRepository(DBContext db)
+        {
+            dBContext = db;
+        }
+
+        public MenuItem GetMenuItem(int Id)
+        {
+            var item = dBContext.MenuItems.Where(m => m.Id == Id).FirstOrDefault();
+
+            if (item == null)
+            {
+                item = new MenuItem();
+            }
+            else
+            {
+                if (item.CategoryId > 0)
+                    item.Category = dBContext.MenuCategories.Where(c => c.Id == item.CategoryId).Select(c => c.Description).FirstOrDefault();
+
+                if (!string.IsNullOrEmpty(item.Image))
+                {
+                    if (!item.Image.Contains("data:image"))
+                        item.Image = ImageFormatter.ImageToBase64(item.Image);
+                }
+
+                item.Options = dBContext.MenuOptions.Where(o => o.MenuItemId == item.Id).ToList();
+            }
+
+            return item;
+        }
+
+        public IEnumerable<MenuItem> GetMenuItems(Func<MenuItem, bool> where)
+        {
+            var items = dBContext.MenuItems.Where(where).ToList();
+
+            foreach (var item in items)
+            {
+                if (item.CategoryId > 0)
+                    item.Category = dBContext.MenuCategories.Where(c => c.Id == item.CategoryId).Select(c => c.Description).FirstOrDefault();
+
+                if (!string.IsNullOrEmpty(item.Image))
+                {
+                    if (!item.Image.Contains("data:image"))
+                        item.Image = ImageFormatter.ImageToBase64(item.Image);
+                }
+            }
+
+            return items;
+        }
+
+        public void Insert(MenuItem Item)
+        {
+            Item.Image = SaveImage(Item);
+            dBContext.Add(Item);
+            Save();
+        }
+
+        public void Remove(MenuItem Item)
+        {
+            dBContext.MenuItems.Remove(Item);
+            Save();
+        }
+
+        public void Save()
+        {
+            dBContext.SaveChanges();
+        }
+
+        public void Update(MenuItem Item)
+        {
+            Item.Image = SaveImage(Item);
+            dBContext.Entry(Item).State = EntityState.Modified;
+            Save();
+        }
+
+        private string SaveImage(MenuItem Item)
+        {
+            string image = Item.Image;
+            if (!string.IsNullOrEmpty(Item.Image))
+            {
+                bool saveFile = false;
+                var loc = dBContext.Locations.FirstOrDefault()?.ImageStore;
+                if (!string.IsNullOrEmpty(loc))
+                {
+                    var rest = dBContext.Restaurants.Where(r => r.Id == Item.RestaurantId).FirstOrDefault();
+                    var folderName = rest.Name + "-" + rest.Suburb;
+                    saveFile = true;
+                    loc += string.Format("{0}", folderName);
+                    if (!Directory.Exists(loc))
+                    {
+                        Directory.CreateDirectory(loc);
+                    }
+
+                    if (saveFile)
+                    {
+                        string path = ImageFormatter.Base64ToImage(Item.Image, loc, Item.Name.Trim());
+                        image = path;
+                    }                    
+                }
+            }
+            return image;
+        }
+    }
+}

ProRestaurant/Repository/Restaurants/MenuOptionRepository.cs

@@ -0,0 +1,149 @@
+using Microsoft.EntityFrameworkCore;
+using ProRestaurant.Classes;
+using ProRestaurant.Containers;
+using ProRestaurant.DBContexts;
+using ProRestaurant.Models.Restaurants;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace ProRestaurant.Repository.Restaurants
+{
+    public class MenuOptionRepository : IMenuOptionRepository
+    {
+        private readonly DBContext dBContext;
+
+        public MenuOptionRepository(DBContext _dBContext)
+        {
+            dBContext = _dBContext;
+        }
+
+        public void Delete(MenuOption Option)
+        {
+            if (Option.Options != null)
+            {
+                foreach (var item in Option.Options)
+                {
+                    DeleteItem(item);
+                }
+            }
+
+            dBContext.MenuOptions.Remove(Option);
+            Save();
+        }
+
+        public void DeleteItem(int id)
+        {
+            var item = dBContext.MenuOptionItems.Where(i => i.Id == id).FirstOrDefault();
+            dBContext.MenuOptionItems.Remove(item);
+            Save();
+        }
+
+        public void DeleteItem(MenuOptionItem item)
+        {
+            dBContext.MenuOptionItems.Remove(item);
+            Save();
+        }
+
+        public MenuOption GetMenuOption(int id)
+        {
+            var option = dBContext.MenuOptions.Where(m => m.Id == id).FirstOrDefault();
+
+            if (option == null)
+            {
+                option = new MenuOption()
+                {
+                    OptionType = OptionType.Single,
+                    IsBasePrice = false,
+                    Options = new List<MenuOptionItem>(),
+                    CategoryDescription = "All"
+                };
+            }
+            else
+            {
+                option.Options = dBContext.MenuOptionItems.Where(m => m.MenuOption == option).ToList();
+                if (option.CategoryId > 0)
+                    option.CategoryDescription = dBContext.MenuCategories.Where(m => m.Id == option.CategoryId).FirstOrDefault().Description;
+                else
+                    option.CategoryDescription = "All";
+            }
+
+            return option;
+        }
+
+        public List<OptionTypeContainer> GetOptionTypes()
+        {
+            //TODO: hard coded for now, will need to find solution.
+            var options = new List<OptionTypeContainer>
+            {
+                new OptionTypeContainer() { Id = 0, Description = "Single" },
+                new OptionTypeContainer() { Id = 1, Description = "Single Required" },
+                new OptionTypeContainer() { Id = 2, Description = "Multiple" },
+                new OptionTypeContainer() { Id = 3, Description = "Multiple Limit" }
+            };
+
+            return options;
+        }
+
+        public List<MenuOption> GetRestaurantMenuOptions(int restaurantId)
+        {
+            var options = (from o in dBContext.MenuOptions
+                           join c in dBContext.MenuCategories on o.CategoryId equals c.Id
+                           where c.RestaurantId == restaurantId
+                           orderby o.Rank
+                           select o).ToList();
+
+            foreach (var option in options)
+            {
+                switch (option.OptionType)
+                {
+                    case OptionType.MultipleLimit:
+                        option.OptionTypeDescription = "Multiple Limit";
+                        break;
+                    case OptionType.SingleRequired:
+                        option.OptionTypeDescription = "Single Required";
+                        break;
+                    default:
+                        option.OptionTypeDescription = option.OptionType.ToString();
+                        break;
+                }
+
+                if (option.CategoryId > 0)
+                    option.CategoryDescription = dBContext.MenuCategories.Where(m => m.Id == option.CategoryId).FirstOrDefault().Description;
+                else
+                    option.CategoryDescription = "All";
+            }
+
+            return options;
+        }
+
+        public void Insert(MenuOption Option)
+        {
+            dBContext.Add(Option);
+            Save();
+        }
+
+        public void Save()
+        {
+            dBContext.SaveChanges();
+        }
+
+        public void Update(MenuOption Option)
+        {
+            dBContext.Entry(Option).State = EntityState.Modified;
+            foreach (var opt in Option.Options)
+            {
+                if (opt.Id > 0)
+                {
+                    dBContext.Entry(opt).State = EntityState.Modified;
+                }
+                else
+                {
+                    dBContext.Add(opt);
+                }
+            }
+
+            Save();
+        }
+    }
+}

ProRestaurant/Startup.cs

@@ -15,6 +15,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Microsoft.IdentityModel.Tokens;
+using Newtonsoft.Json;
 using ProRestaurant.Classes;
 using ProRestaurant.DBContexts;
 using ProRestaurant.Repository.Accounts;
@@ -40,6 +41,9 @@ namespace ProRestaurant
                        .AllowAnyHeader();
             }));
             services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
+            services.AddMvc().AddJsonOptions(options => {
+                options.SerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore;
+            });
 
             #region Authentication Setup
             // configure strongly typed settings objects
@@ -78,6 +82,9 @@ namespace ProRestaurant
             services.AddTransient<IRestaurantRepository, RestaurantRepository>();
             services.AddTransient<IUserRepository, UserRepository>();
             services.AddTransient<IMenuCategoryRepository, MenuCategoryRepository>();
+            services.AddTransient<IMenuOptionRepository, MenuOptionRepository>();
+            services.AddTransient<IMenuItemRepository, MenuItemRepository>();
+            services.AddTransient<IMenuRepository, MenuRepository>();
 
             services.Configure<MvcOptions>(options =>
             {

ProRestaurant/obj/Debug/netcoreapp2.2/ProRestaurant.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-7ee9c31cc58d25ebc38120ba0960c1c57a6e9ec2
+6449f93053b2ae76a77e4da47929d5cb895df3c6