Menu View, Cart, RUsers & Roles WIP

ProRestaurant/Classes/CommonFunctions.cs

@@ -1,4 +1,6 @@
-using System;
+using Microsoft.AspNetCore.Http;
+using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Cryptography;
@@ -20,5 +22,26 @@ namespace ProRestaurant.Classes
             }
             return hash;
         }
+
+        public static string GenerateRandomPassword()
+        {
+            string values = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!@#$%_";
+            char[] chars = values.ToArray();
+            ArrayList used = new ArrayList();
+
+            string password = "";
+            while (password.Length < 10)
+            {
+                Random r = new Random();
+                int i = r.Next(0, values.Length);
+                if (!used.Contains(chars[i].ToString()))
+                {
+                    password += chars[i].ToString();
+                    used.Add(chars[i].ToString());
+                }
+            }
+
+            return password;
+        }
     }
 }

ProRestaurant/Classes/Enums.cs

@@ -1,16 +1,12 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace ProRestaurant.Classes
+namespace ProRestaurant.Classes
 {
     public enum SystemRole
     {
         SuperAdmin,
         RestaurantAdmin,
         RestaurantUser,        
-        Customer
+        Customer,
+        Driver
     }
 
     public enum OptionType

ProRestaurant/Classes/ImageFormatter.cs

@@ -59,6 +59,6 @@ namespace ProRestaurant.Classes
             }
             else
                 return "";
-        }
+        }        
     }
 }

ProRestaurant/Containers/RestaurantContainer.cs

@@ -40,7 +40,9 @@ namespace ProRestaurant.Containers
 
     public class OptionItemContainer
     {
+        public int Id { get; set; }
         public string Description { get; set; }
+        public int Qty { get; set; }
         public decimal Price { get; set; }        
     }
 }

ProRestaurant/Controllers/Restaurants/MenuController.cs

@@ -20,10 +20,10 @@ namespace ProRestaurant.Controllers.Restaurants
             return new OkObjectResult(repo.GetMenu(id));
         }
 
-        [HttpGet("GetOptions/{menuId}/{categoryId}")]
-        public IActionResult GetOptions(int menuId, int categoryId)
+        [HttpGet("GetOptions/{menuId}")]
+        public IActionResult GetOptions(int menuId)
         {
-            return new OkObjectResult(repo.GetOptions(menuId, categoryId));
+            return new OkObjectResult(repo.GetOptions(menuId));
         }
     }
 }

ProRestaurant/Controllers/Restaurants/RestaurantUserController.cs

@@ -0,0 +1,65 @@
+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 RestaurantUserController : ControllerBase
+    {
+        public readonly IRestaurantUserRepository repo;
+
+        public RestaurantUserController(IRestaurantUserRepository _repo)
+        {
+            repo = _repo;
+        }
+
+
+        [HttpGet("GetRestaurantUsers/{id}")]
+        public IActionResult GetRestaurantUsers(int id)
+        {
+            return new OkObjectResult(repo.GetUsers(id));
+        }
+        
+        [HttpGet("{id}")]
+        public IActionResult Get(int id)
+        {
+            return new OkObjectResult(repo.GetRestaurantUser(id));
+        }
+        
+        [HttpPost]
+        public IActionResult Post([FromBody] RestaurantUser value)
+        {
+            using (var scope = new TransactionScope())
+            {
+                repo.InsertUser(value);
+                scope.Complete();
+                return CreatedAtAction(nameof(Get), new { id = value.Id }, value);
+            }
+        }
+        
+        [HttpPut]
+        public IActionResult Put([FromBody] RestaurantUser value)
+        {
+            if (value != null)
+            {
+                using (var scope = new TransactionScope())
+                {
+                    repo.UpdateUser(value);
+                    scope.Complete();
+                    return new OkResult();
+                }
+            }
+            return new NoContentResult();
+        }
+        
+        [HttpDelete("{id}")]
+        public IActionResult Delete(int id)
+        {
+            repo.RemoveUser(id);
+            return new OkResult();
+        }
+    }
+}

ProRestaurant/Migrations/20200703140940_Menu Options Change.Designer.cs

@@ -0,0 +1,487 @@
+// <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("20200703140940_Menu Options Change")]
+    partial class MenuOptionsChange
+    {
+        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>("IsComplex");
+
+                    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>("Province");
+
+                    b.Property<string>("StreetName");
+
+                    b.Property<string>("StreetNumber");
+
+                    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>("CategoryStore");
+
+                    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<string>("Name");
+
+                    b.Property<bool>("OutOfStock");
+
+                    b.Property<bool>("OverrideOptions");
+
+                    b.Property<decimal>("Price");
+
+                    b.Property<int>("RestaurantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RestaurantId");
+
+                    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?>("MenuCategoryId");
+
+                    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.Property<int>("RestaurantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("MenuCategoryId");
+
+                    b.HasIndex("RestaurantId");
+
+                    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")
+                        .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>("Province");
+
+                    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.Property<string>("Image");
+
+                    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.MenuOption", b =>
+                {
+                    b.HasOne("ProRestaurant.Models.Restaurants.MenuCategory")
+                        .WithMany("Options")
+                        .HasForeignKey("MenuCategoryId");
+
+                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
+                        .WithMany()
+                        .HasForeignKey("RestaurantId")
+                        .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")
+                        .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/20200703140940_Menu Options Change.cs

@@ -0,0 +1,118 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace ProRestaurant.Migrations
+{
+    public partial class MenuOptionsChange : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_MenuOptions_MenuCategories_CategoryId",
+                table: "MenuOptions");
+
+            migrationBuilder.DropIndex(
+                name: "IX_MenuOptions_CategoryId",
+                table: "MenuOptions");
+
+            migrationBuilder.AlterColumn<int>(
+                name: "CategoryId",
+                table: "MenuOptions",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldNullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "MenuCategoryId",
+                table: "MenuOptions",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "RestaurantId",
+                table: "MenuOptions",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<bool>(
+                name: "OutOfStock",
+                table: "MenuItems",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_MenuOptions_MenuCategoryId",
+                table: "MenuOptions",
+                column: "MenuCategoryId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_MenuOptions_RestaurantId",
+                table: "MenuOptions",
+                column: "RestaurantId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_MenuOptions_MenuCategories_MenuCategoryId",
+                table: "MenuOptions",
+                column: "MenuCategoryId",
+                principalTable: "MenuCategories",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_MenuOptions_Restaurants_RestaurantId",
+                table: "MenuOptions",
+                column: "RestaurantId",
+                principalTable: "Restaurants",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_MenuOptions_MenuCategories_MenuCategoryId",
+                table: "MenuOptions");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_MenuOptions_Restaurants_RestaurantId",
+                table: "MenuOptions");
+
+            migrationBuilder.DropIndex(
+                name: "IX_MenuOptions_MenuCategoryId",
+                table: "MenuOptions");
+
+            migrationBuilder.DropIndex(
+                name: "IX_MenuOptions_RestaurantId",
+                table: "MenuOptions");
+
+            migrationBuilder.DropColumn(
+                name: "MenuCategoryId",
+                table: "MenuOptions");
+
+            migrationBuilder.DropColumn(
+                name: "RestaurantId",
+                table: "MenuOptions");
+
+            migrationBuilder.DropColumn(
+                name: "OutOfStock",
+                table: "MenuItems");
+
+            migrationBuilder.AlterColumn<int>(
+                name: "CategoryId",
+                table: "MenuOptions",
+                nullable: true,
+                oldClrType: typeof(int));
+
+            migrationBuilder.CreateIndex(
+                name: "IX_MenuOptions_CategoryId",
+                table: "MenuOptions",
+                column: "CategoryId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_MenuOptions_MenuCategories_CategoryId",
+                table: "MenuOptions",
+                column: "CategoryId",
+                principalTable: "MenuCategories",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+        }
+    }
+}

ProRestaurant/Migrations/20200706125622_User add password flag.Designer.cs

@@ -0,0 +1,489 @@
+// <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("20200706125622_User add password flag")]
+    partial class Useraddpasswordflag
+    {
+        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<bool>("ChangePassword");
+
+                    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>("IsComplex");
+
+                    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>("Province");
+
+                    b.Property<string>("StreetName");
+
+                    b.Property<string>("StreetNumber");
+
+                    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>("CategoryStore");
+
+                    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<string>("Name");
+
+                    b.Property<bool>("OutOfStock");
+
+                    b.Property<bool>("OverrideOptions");
+
+                    b.Property<decimal>("Price");
+
+                    b.Property<int>("RestaurantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RestaurantId");
+
+                    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?>("MenuCategoryId");
+
+                    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.Property<int>("RestaurantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("MenuCategoryId");
+
+                    b.HasIndex("RestaurantId");
+
+                    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")
+                        .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>("Province");
+
+                    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.Property<string>("Image");
+
+                    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.MenuOption", b =>
+                {
+                    b.HasOne("ProRestaurant.Models.Restaurants.MenuCategory")
+                        .WithMany("Options")
+                        .HasForeignKey("MenuCategoryId");
+
+                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
+                        .WithMany()
+                        .HasForeignKey("RestaurantId")
+                        .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")
+                        .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/20200706125622_User add password flag.cs

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

ProRestaurant/Migrations/DBContextModelSnapshot.cs

@@ -55,6 +55,8 @@ namespace ProRestaurant.Migrations
 
                     b.Property<string>("Cellphone");
 
+                    b.Property<bool>("ChangePassword");
+
                     b.Property<DateTime>("Created");
 
                     b.Property<string>("EmailAddress");
@@ -191,6 +193,8 @@ namespace ProRestaurant.Migrations
 
                     b.Property<string>("Name");
 
+                    b.Property<bool>("OutOfStock");
+
                     b.Property<bool>("OverrideOptions");
 
                     b.Property<decimal>("Price");
@@ -210,7 +214,7 @@ namespace ProRestaurant.Migrations
                         .ValueGeneratedOnAdd()
                         .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
 
-                    b.Property<int?>("CategoryId");
+                    b.Property<int>("CategoryId");
 
                     b.Property<DateTime>("Created");
 
@@ -220,6 +224,8 @@ namespace ProRestaurant.Migrations
 
                     b.Property<bool>("IsDeleted");
 
+                    b.Property<int?>("MenuCategoryId");
+
                     b.Property<int>("MenuItemId");
 
                     b.Property<DateTime>("Modified");
@@ -232,9 +238,13 @@ namespace ProRestaurant.Migrations
 
                     b.Property<int>("Rank");
 
+                    b.Property<int>("RestaurantId");
+
                     b.HasKey("Id");
 
-                    b.HasIndex("CategoryId");
+                    b.HasIndex("MenuCategoryId");
+
+                    b.HasIndex("RestaurantId");
 
                     b.ToTable("MenuOptions");
                 });
@@ -434,9 +444,14 @@ namespace ProRestaurant.Migrations
 
             modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuOption", b =>
                 {
-                    b.HasOne("ProRestaurant.Models.Restaurants.MenuCategory", "Category")
+                    b.HasOne("ProRestaurant.Models.Restaurants.MenuCategory")
                         .WithMany("Options")
-                        .HasForeignKey("CategoryId");
+                        .HasForeignKey("MenuCategoryId");
+
+                    b.HasOne("ProRestaurant.Models.Restaurants.Restaurant", "Restaurant")
+                        .WithMany()
+                        .HasForeignKey("RestaurantId")
+                        .OnDelete(DeleteBehavior.Cascade);
                 });
 
             modelBuilder.Entity("ProRestaurant.Models.Restaurants.MenuOptionItem", b =>

ProRestaurant/Models/Accounts/User.cs

@@ -1,8 +1,5 @@
 using ProRestaurant.Classes;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace ProRestaurant.Models.Accounts
 {
@@ -14,8 +11,9 @@ namespace ProRestaurant.Models.Accounts
         public string Surname { get; set; }
         public string Cellphone { get; set; }
         public SystemRole SystemRole { get; set; }
+        public bool ChangePassword { get; set; }
 
-        public virtual DriverDetail DriverDetails { get; set; }
+        public virtual DriverDetail DriverDetails { get; set; }        
 
         public ICollection<UserAddress> Addresses { get; set; }
     }    

ProRestaurant/Models/Restaurants/MenuItem.cs

@@ -13,6 +13,7 @@ namespace ProRestaurant.Models.Restaurants
         public string Description { get; set; }
         public decimal Price { get; set; }
         public bool OverrideOptions { get; set; }
+        public bool OutOfStock { get; set; }
 
         public virtual Restaurant Restaurant { get; set; }        
 

ProRestaurant/Models/Restaurants/MenuOption.cs

@@ -5,8 +5,10 @@ using System.ComponentModel.DataAnnotations.Schema;
 namespace ProRestaurant.Models.Restaurants
 {
     public class MenuOption : BaseObject
-    {                   
-        public int? CategoryId { get; set; }
+    {             
+        [ForeignKey("Restaurant")]
+        public int RestaurantId { get; set; }
+        public int CategoryId { get; set; }
         public string Description { get; set; }
         public OptionType OptionType { get; set; }
         public int OptionLimit { get; set; }
@@ -14,8 +16,8 @@ namespace ProRestaurant.Models.Restaurants
         public int Rank { get; set; }
         public int MenuItemId { get; set; }
 
-        public ICollection<MenuOptionItem> Options { get; set; }        
-        public virtual MenuCategory Category { get; set; }
+        public ICollection<MenuOptionItem> Options { get; set; }                
+        public virtual Restaurant Restaurant { get; set; }
 
         [NotMapped]
         public string CategoryDescription { get; set; }

ProRestaurant/Repository/Restaurants/IMenuRepository.cs

@@ -11,7 +11,7 @@ namespace ProRestaurant.Repository.Restaurants
     public interface IMenuRepository
     {
         RestaurantMenuContainer GetMenu(int restaurantId);
-        MenuContainer GetOptions(int MenuID, int CategoryID);
+        MenuContainer GetOptions(int MenuID);
     }
 
     public class MenuRepository : IMenuRepository
@@ -67,11 +67,12 @@ namespace ProRestaurant.Repository.Restaurants
                         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)
+                        Image = !string.IsNullOrEmpty(item.Image) ? item.Image.StartsWith("data:image") ? item.Image : ImageFormatter.ImageToBase64(item.Image) : ""
                     });
                 }
 
-                menu.MenuList.Add(menuItem);
+                if (menuItem.Items.Count > 0)
+                    menu.MenuList.Add(menuItem);
             }
 
             var tradingHours = dBContext.TradingHours.Where(t => t.RestaurantId == restaurantId).ToList();
@@ -95,7 +96,7 @@ namespace ProRestaurant.Repository.Restaurants
             return menu;
         }
 
-        public MenuContainer GetOptions(int MenuID, int CategoryID)
+        public MenuContainer GetOptions(int MenuID)
         {            
             var mItem = dBContext.MenuItems.Where(m => m.Id == MenuID).FirstOrDefault();
 
@@ -105,13 +106,18 @@ namespace ProRestaurant.Repository.Restaurants
                 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),
+                DisplayPrice = string.Format("{0:C}", mItem.Price),       
+                Image = "",
                 Options = new List<OptionContainer>()
             };
 
+            if (!string.IsNullOrEmpty(mItem.Image))
+            {
+                menu.Image = mItem.Image.StartsWith("data:image") ? mItem.Image : ImageFormatter.ImageToBase64(mItem.Image);
+            }
 
-            var menuOptions = dBContext.MenuOptions.Where(mo => mo.CategoryId == CategoryID).OrderBy(mo => mo.Rank).ToList();
+            //Menu's options
+            var menuOptions = dBContext.MenuOptions.Where(mo => mo.MenuItemId == mItem.Id).OrderBy(mo => mo.Rank).ToList();
 
             foreach (var option in menuOptions)
             {
@@ -143,6 +149,7 @@ namespace ProRestaurant.Repository.Restaurants
                 {
                     opt.Options.Add(new OptionItemContainer()
                     {
+                        Id = item.Id,
                         Description = item.Description,
                         Price = item.Price
                     });
@@ -150,8 +157,52 @@ namespace ProRestaurant.Repository.Restaurants
                 menu.Options.Add(opt);
             }
 
+            if (!mItem.OverrideOptions)
+            {
+                //Category's Options
+                menuOptions = dBContext.MenuOptions.Where(mo => mo.CategoryId == mItem.CategoryId).OrderBy(mo => mo.Rank).ToList();
 
-            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()
+                        {
+                            Id = item.Id,
+                            Description = item.Description,
+                            Price = item.Price                            
+                        });
+                    }
+                    menu.Options.Add(opt);
+                }
+            }
+
+            //All Cat Options
+            menuOptions = dBContext.MenuOptions.Where(mo => mo.CategoryId == 0 && mo.RestaurantId == mItem.RestaurantId).OrderBy(mo => mo.Rank).ToList();
 
             foreach (var option in menuOptions)
             {
@@ -183,6 +234,7 @@ namespace ProRestaurant.Repository.Restaurants
                 {
                     opt.Options.Add(new OptionItemContainer()
                     {
+                        Id = item.Id,
                         Description = item.Description,
                         Price = item.Price
                     });
@@ -190,6 +242,7 @@ namespace ProRestaurant.Repository.Restaurants
                 menu.Options.Add(opt);
             }
 
+
             return menu;
         }
     }

ProRestaurant/Repository/Restaurants/IRestaurantUserRepository.cs

@@ -0,0 +1,95 @@
+using Microsoft.EntityFrameworkCore;
+using ProRestaurant.Classes;
+using ProRestaurant.DBContexts;
+using ProRestaurant.Models.Accounts;
+using ProRestaurant.Models.Restaurants;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Cryptography.Xml;
+
+namespace ProRestaurant.Repository.Restaurants
+{
+    public interface IRestaurantUserRepository
+    {
+        List<User> GetUsers(int RestaurantId);
+        RestaurantUser GetRestaurantUser(int UserId);
+        void InsertUser(RestaurantUser User);
+        void UpdateUser(RestaurantUser User);
+        void RemoveUser(int id);
+        void Save();
+    }
+
+    public class RestaurantUserRepository : IRestaurantUserRepository
+    {
+        private readonly DBContext dBContext;
+
+        public RestaurantUserRepository(DBContext db)
+        {
+            dBContext = db;
+        }
+
+        public RestaurantUser GetRestaurantUser(int UserId)
+        {
+            var restUser = dBContext.RestaurantUsers.Include("User").Where(r => r.UserId == UserId).FirstOrDefault();
+
+            if (restUser == null)
+            {
+                restUser = new RestaurantUser
+                {
+                    User = new User()
+                    {
+                        Id = 0,
+                        EmailAddress = "",
+                        FirstName = "",
+                        Surname = "",
+                        Cellphone = ""
+                    }
+                };
+            }
+
+            return restUser;
+        }
+
+        public List<User> GetUsers(int RestaurantId)
+        {
+            var users = dBContext.RestaurantUsers.Include("User").Where(r => r.RestaurantId == RestaurantId).Select(r => r.User).ToList();
+            return users;
+        }
+
+        public void InsertUser(RestaurantUser User)
+        {
+            dBContext.Add(User);
+
+            string password = CommonFunctions.GenerateRandomPassword();
+
+            User.User.Password = CommonFunctions.GetHashSHA256(password + "≡∆≤≥√∞ProVision");
+            User.User.ChangePassword = true;
+            User.User.SystemRole = SystemRole.RestaurantUser;
+
+            //TODO: Email generated password to the email address
+
+            Save();
+        }
+
+        public void RemoveUser(int id)
+        {
+            var user = dBContext.Users.Where(u => u.Id == id).FirstOrDefault();
+            var rUser = dBContext.RestaurantUsers.Where(r => r.UserId == user.Id).FirstOrDefault();
+
+            dBContext.Users.Remove(user);
+            dBContext.RestaurantUsers.Remove(rUser);
+            Save();
+        }
+
+        public void Save()
+        {
+            dBContext.SaveChanges();
+        }
+
+        public void UpdateUser(RestaurantUser User)
+        {
+            dBContext.Entry(User.User).State = EntityState.Modified;
+            Save();
+        }
+    }
+}

ProRestaurant/Repository/Restaurants/MenuOptionRepository.cs

@@ -87,9 +87,8 @@ namespace ProRestaurant.Repository.Restaurants
 
         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
+            var options = (from o in dBContext.MenuOptions                           
+                           where o.RestaurantId == restaurantId
                            orderby o.Rank
                            select o).ToList();
 

ProRestaurant/Startup.cs

@@ -85,6 +85,7 @@ namespace ProRestaurant
             services.AddTransient<IMenuOptionRepository, MenuOptionRepository>();
             services.AddTransient<IMenuItemRepository, MenuItemRepository>();
             services.AddTransient<IMenuRepository, MenuRepository>();
+            services.AddTransient<IRestaurantUserRepository, RestaurantUserRepository>();
 
             services.Configure<MvcOptions>(options =>
             {

ProRestaurant/appsettings.json

@@ -9,6 +9,6 @@
   },
   "AllowedHosts": "*",
   "ConnectionStrings": {
-    "DefaultDatabase": "Data Source=localhost;Initial Catalog=Restaurants;Integrated Security=true;Pooling=false;"
+    "DefaultDatabase": "Data Source=localhost;Initial Catalog=RestaurantDemo;Integrated Security=true;Pooling=false;"
   }
 }

ProRestaurant/bin/Debug/netcoreapp2.2/appsettings.json

@@ -9,6 +9,6 @@
   },
   "AllowedHosts": "*",
   "ConnectionStrings": {
-    "DefaultDatabase": "Data Source=localhost;Initial Catalog=Restaurants;Integrated Security=true;Pooling=false;"
+    "DefaultDatabase": "Data Source=localhost;Initial Catalog=RestaurantDemo;Integrated Security=true;Pooling=false;"
   }
 }

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

@@ -1 +1 @@
-6449f93053b2ae76a77e4da47929d5cb895df3c6
+9adf305668e4c84bcd07601f8f7915e6185ed444