Merge branch 'master' of http://192.168.6.188:3000/Provision/UnivatePropertiesAPI

UnivateProperties_API/Containers/Communication/PlaceHolderDto.cs

@@ -2,6 +2,7 @@
 {
     public class PlaceHolderDto
     {
+        public int Id { get; set; }
         public string Name { get; set; }
         public string BoundToClass { get; set; }
         public string BoundToClassDisplay { get; set; }

UnivateProperties_API/Containers/Property/ImageFormatter.cs

@@ -35,25 +35,30 @@ namespace UnivateProperties_API.Containers.Property
 
         public static string ImageToBase64(string Path)
         {
-            using (Image image = Image.FromFile(Path))
+            if (File.Exists(Path))
             {
-                using (MemoryStream m = new MemoryStream())
+                using (Image image = Image.FromFile(Path))
                 {
-                    image.Save(m, image.RawFormat);
-                    byte[] imageBytes = m.ToArray();
+                    using (MemoryStream m = new MemoryStream())
+                    {
+                        image.Save(m, image.RawFormat);
+                        byte[] imageBytes = m.ToArray();
 
-                    string base64String = Convert.ToBase64String(imageBytes);
+                        string base64String = Convert.ToBase64String(imageBytes);
 
-                    if (Path.EndsWith(".jpg") || Path.EndsWith(".jpeg"))
-                        base64String = "data:image/jpeg;base64," + base64String;
-                    if (Path.EndsWith(".gif"))
-                        base64String = "data:image/gif;base64," + base64String;
-                    if (base64String.EndsWith(".png"))
-                        base64String = "data:image/png;base64," + base64String;
+                        if (Path.EndsWith(".jpg") || Path.EndsWith(".jpeg"))
+                            base64String = "data:image/jpeg;base64," + base64String;
+                        if (Path.EndsWith(".gif"))
+                            base64String = "data:image/gif;base64," + base64String;
+                        if (base64String.EndsWith(".png"))
+                            base64String = "data:image/png;base64," + base64String;
 
-                    return base64String;
+                        return base64String;
+                    }
                 }
             }
+            else
+                return "";
         }
     }
 }

UnivateProperties_API/Containers/Property/PropertyContainer.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using UnivateProperties_API.Model.Properties;
 
 namespace UnivateProperties_API.Containers.Property
 {
@@ -40,4 +41,10 @@ namespace UnivateProperties_API.Containers.Property
         public string Image { get; set;  }
         public bool IsDefault { get; set; }
     }
+
+    public class PropertyImageContainer
+    {
+        public int PropertyId { get; set; }
+        public List<PropertyImage> Images { get; set; }
+    }
 }

UnivateProperties_API/Containers/Property/PropertyList.cs

@@ -12,6 +12,7 @@
         public string SaleType { get; set; }
         public string Publish { get; set; }
         public string Status { get; set; }
+        public string CarouselDescription { get; set; }
         #endregion
     }
 }

UnivateProperties_API/Containers/Regions/SuburbSearch.cs

@@ -8,6 +8,8 @@ namespace UnivateProperties_API.Containers.Regions
     public class SuburbSearch
     {
         public int Id { get; set; }
+        public string Province { get; set; }
+        public string City { get; set; }
         public string Suburb { get; set; }
         public string Display { get; set; }
     }

UnivateProperties_API/Containers/Timeshare/WeekDto.cs

@@ -56,7 +56,10 @@ namespace UnivateProperties_API.Containers.Timeshare
             Owner = $"{week.Owner?.Name} {week.Owner?.Surname}";
             Resort = new ResortDto(week.ResortCode, week.ResortName);
             Region = new RegionDto(week.Region != null ? week.Region.Id : 0, week.Region?.Code, week.Region?.Description);
-            Status = new StatusDto(week.Status.Id, week.Status?.Code, week.Status?.Description);
+            if(week.Status != null)
+            {
+                Status = new StatusDto(week.Status.Id, week.Status.Code, week.Status.Description);
+            }            
             Bedrooms = week.Bedrooms;
             MaxSleep = week.MaxSleep;
             UnitNumber = week.UnitNumber;

UnivateProperties_API/Context/DataContext.cs

@@ -181,8 +181,8 @@ namespace UnivateProperties_API.Context
             modelBuilder.Entity<BidItem>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);
             modelBuilder.Entity<ProcessFlow>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);
             modelBuilder.Entity<Template>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);
-
-            
+            modelBuilder.Entity<Carousel>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);
+            modelBuilder.Entity<PlaceHolder>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);
         }
 
     

UnivateProperties_API/Controllers/Communication/TemplateController.cs

@@ -70,5 +70,16 @@ namespace UnivateProperties_API.Controllers.Communication
             _Repo.RemoveAtId(id);
             return new OkResult();
         }
+
+        //[HttpPost("sendTemplate/{id}")]
+        //public IActionResult SendTemplate(int id)
+        //{
+        //    using ( var scope = new TransactionScope())
+        //    {
+        //        (_Repo as TemplateRepository).SendEmailTemplate(id);
+        //        scope.Complete();
+        //        return new OkResult();
+        //    }
+        //}
     }
 }

UnivateProperties_API/Controllers/Misc/CarouselController.cs

@@ -25,7 +25,7 @@ namespace UnivateProperties_API.Controllers.Misc
         [HttpGet("{id}")]
         public IActionResult Get(int id)
         {
-            return new OkObjectResult(_Repo.GetDetailed(x => x.Id == id));
+            return new OkObjectResult(_Repo.GetCarousel(id));
         }        
 
         [HttpPost]

UnivateProperties_API/Controllers/Properties/PropertyController.cs

@@ -88,20 +88,20 @@ namespace UnivateProperties_API.Controllers.Properties
         [HttpPost]
         public IActionResult Post([FromBody] PropertyContainer property)
         {
-            using (var scope = new TransactionScope())
+            using (var scope = new TransactionScope(TransactionScopeOption.Suppress))
             {
                 _Repo.Insert(property);
-                scope.Complete();
+                scope.Complete();                
                 return CreatedAtAction(nameof(Get), new { id = property.Id }, property);
-            }
-        }       
+            }            
+        }      
 
         [HttpPut]
         public IActionResult Put([FromBody] PropertyContainer property)
         {
             if (property != null)
             {
-                using (var scope = new TransactionScope())
+                using (var scope = new TransactionScope(TransactionScopeOption.Suppress))
                 {
                     _Repo.Update(property);
                     scope.Complete();

UnivateProperties_API/Controllers/Timeshare/TimeshareWeekController.cs

@@ -104,5 +104,34 @@ namespace UnivateProperties_API.Controllers.Timeshare
             _Repo.RemoveAtId(id);
             return new OkResult();
         }
+
+        [HttpPost("verifyweek/{id}")]
+        public IActionResult Post(int id)
+        {
+            using (var scope = new TransactionScope())
+            {
+                (_Repo as WeekRepository).VerifyWeek(id);
+                scope.Complete();
+                return new OkResult();
+            }
+        }
+
+        [HttpPost("publishweek/{id}")]
+        public IActionResult Publishweek(int id)
+        {
+            using (var scope = new TransactionScope())
+            {
+                (_Repo as WeekRepository).VerifyWeek(id);
+                scope.Complete();
+                return new OkResult();
+            }
+        }
+
+        [HttpGet("getTenderWeeks")]
+        public IActionResult GetTenderWeeks()
+        {
+            var item = (_Repo as WeekRepository).GetTenderWeeks();
+            return new OkObjectResult(item);
+        }
     }
 }

UnivateProperties_API/Helpers/MyCommon.cs

@@ -1,13 +1,39 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
+using System.Net;
+using System.Text;
 using System.Text.RegularExpressions;
 using UnivateProperties_API.Helpers.Attributes;
+using UnivateProperties_API.Model.Timeshare;
 
 namespace UnivateProperties_API.Helpers
 {
     public static class MyCommon
     {
+        public static bool PostToConsoft(TimeshareWeek week)
+        {
+            bool flag = false;
+            try
+            {
+                var search = $"http://www.unipoint-consoft.co.za/nph-srep.exe?cluvbank_test.sch&CLUB=LPA&TYPE=BANK&RESORT={week.ResortCode}&UNIT={week.UnitNumber}&MODULE={week.WeekNumber}&YEAR={week.ArrivalDate.Year}&BANKTO=UV";
+                HttpWebRequest request = (HttpWebRequest)WebRequest.Create(search);
+                request.Method = "GET";
+                WebResponse response = request.GetResponse();
+                using (StreamReader reader = new StreamReader(response.GetResponseStream(), Encoding.UTF8))
+                {
+                    string result = reader.ReadToEnd();
+                    flag = result.ToLower().Contains("success");
+                }
+            }
+            catch (Exception)
+            {
+
+            }
+            return flag;
+        }
+
         public static List<string> GetVisibleColumns<T>(T item) where T : new()
         {
             List<string> list = new List<string>();

UnivateProperties_API/Migrations/20191112124547_templateMod.cs

@@ -0,0 +1,113 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace UnivateProperties_API.Migrations
+{
+    public partial class templateMod : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "SenderId",
+                table: "Templates",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "TemplateId",
+                table: "Individuals",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "TemplateId",
+                table: "Agents",
+                nullable: true);
+
+            migrationBuilder.AddColumn<bool>(
+                name: "Default",
+                table: "Accounts",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Templates_SenderId",
+                table: "Templates",
+                column: "SenderId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Individuals_TemplateId",
+                table: "Individuals",
+                column: "TemplateId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Agents_TemplateId",
+                table: "Agents",
+                column: "TemplateId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Agents_Templates_TemplateId",
+                table: "Agents",
+                column: "TemplateId",
+                principalTable: "Templates",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Individuals_Templates_TemplateId",
+                table: "Individuals",
+                column: "TemplateId",
+                principalTable: "Templates",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Templates_Accounts_SenderId",
+                table: "Templates",
+                column: "SenderId",
+                principalTable: "Accounts",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_Agents_Templates_TemplateId",
+                table: "Agents");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_Individuals_Templates_TemplateId",
+                table: "Individuals");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_Templates_Accounts_SenderId",
+                table: "Templates");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Templates_SenderId",
+                table: "Templates");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Individuals_TemplateId",
+                table: "Individuals");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Agents_TemplateId",
+                table: "Agents");
+
+            migrationBuilder.DropColumn(
+                name: "SenderId",
+                table: "Templates");
+
+            migrationBuilder.DropColumn(
+                name: "TemplateId",
+                table: "Individuals");
+
+            migrationBuilder.DropColumn(
+                name: "TemplateId",
+                table: "Agents");
+
+            migrationBuilder.DropColumn(
+                name: "Default",
+                table: "Accounts");
+        }
+    }
+}

UnivateProperties_API/Migrations/DataContextModelSnapshot.cs

@@ -148,6 +148,8 @@ namespace UnivateProperties_API.Migrations
 
                     b.Property<DateTime>("Created");
 
+                    b.Property<bool>("Default");
+
                     b.Property<string>("DisplayName");
 
                     b.Property<bool>("IsDeleted");
@@ -210,10 +212,14 @@ namespace UnivateProperties_API.Migrations
 
                     b.Property<string>("Name");
 
+                    b.Property<int?>("SenderId");
+
                     b.Property<string>("Subject");
 
                     b.HasKey("Id");
 
+                    b.HasIndex("SenderId");
+
                     b.ToTable("Templates");
                 });
 
@@ -903,12 +909,16 @@ namespace UnivateProperties_API.Migrations
 
                     b.Property<string>("Telephone");
 
+                    b.Property<int?>("TemplateId");
+
                     b.Property<int?>("UserId");
 
                     b.HasKey("Id");
 
                     b.HasIndex("AgencyId");
 
+                    b.HasIndex("TemplateId");
+
                     b.HasIndex("UserId");
 
                     b.ToTable("Agents");
@@ -949,6 +959,8 @@ namespace UnivateProperties_API.Migrations
 
                     b.Property<string>("Telephone");
 
+                    b.Property<int?>("TemplateId");
+
                     b.Property<int?>("UserId");
 
                     b.HasKey("Id");
@@ -957,6 +969,8 @@ namespace UnivateProperties_API.Migrations
 
                     b.HasIndex("BankAccountId");
 
+                    b.HasIndex("TemplateId");
+
                     b.HasIndex("UserId");
 
                     b.HasIndex("Telephone", "CellNumber", "Email")
@@ -1065,6 +1079,13 @@ namespace UnivateProperties_API.Migrations
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
+            modelBuilder.Entity("UnivateProperties_API.Model.Communication.Template", b =>
+                {
+                    b.HasOne("UnivateProperties_API.Model.Communication.SMTPAccount", "Sender")
+                        .WithMany()
+                        .HasForeignKey("SenderId");
+                });
+
             modelBuilder.Entity("UnivateProperties_API.Model.Misc.Address", b =>
                 {
                     b.HasOne("UnivateProperties_API.Model.Users.Individual", "Owner")
@@ -1231,6 +1252,10 @@ namespace UnivateProperties_API.Migrations
                         .WithMany("Agents")
                         .HasForeignKey("AgencyId");
 
+                    b.HasOne("UnivateProperties_API.Model.Communication.Template")
+                        .WithMany("AgentBCC")
+                        .HasForeignKey("TemplateId");
+
                     b.HasOne("UnivateProperties_API.Model.Users.User", "User")
                         .WithMany()
                         .HasForeignKey("UserId");
@@ -1246,6 +1271,10 @@ namespace UnivateProperties_API.Migrations
                         .WithMany()
                         .HasForeignKey("BankAccountId");
 
+                    b.HasOne("UnivateProperties_API.Model.Communication.Template")
+                        .WithMany("IndividualBCC")
+                        .HasForeignKey("TemplateId");
+
                     b.HasOne("UnivateProperties_API.Model.Users.User", "User")
                         .WithMany()
                         .HasForeignKey("UserId");

UnivateProperties_API/Model/Communication/Email.cs

@@ -3,6 +3,9 @@ using System;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Net.Mail;
 using System.Text;
+using UnivateProperties_API.Model.Users;
+using System.Collections;
+using System.Collections.Generic;
 
 namespace UnivateProperties_API.Model.Communication
 {
@@ -30,6 +33,43 @@ namespace UnivateProperties_API.Model.Communication
             Body = body;
             Subject = subject;
         }
+
+        public Email(Template template, Person sendTo, List<BaseEntity> args)
+        {
+            if(sendTo != null && MyCommon.IsValidEmail(sendTo.Email))
+            {
+                if (template.SenderId != null)
+                {
+                    SenderId = template.SenderId.Value;
+                }
+                Sender = template.Sender;
+                To = sendTo.Email;
+                ToDisplay = sendTo.FullName;
+                BCC = ConcatEmails(template.AgentBCC, template.IndividualBCC);
+                IsBodyHtml = true;
+                Body = template.Body;
+                Subject = template.Subject;
+                foreach(var item in template.PlaceHolders)
+                {
+                    foreach(var obj in args)
+                    {
+                        if(obj.GetType() == Type.GetType(item.BoundToClass))
+                        {
+                            string replaceValue = (string)obj[item.BoundTo];
+                            if(Body.Contains(item.Name))
+                            {
+                                Body = Body.Replace(item.Name, replaceValue);
+                            }
+                            if(Subject.Contains(item.Name))
+                            {
+                                Subject = Subject.Replace(item.Name, replaceValue);
+                            }
+                        }
+                    }
+                }
+            }
+            
+        }
         #endregion Constructor
 
         #region Properties
@@ -137,6 +177,32 @@ namespace UnivateProperties_API.Model.Communication
             mail.From = mail.Sender;
             return mail;
         }
+
+        private string ConcatEmails(ICollection<Agent> agents, ICollection<Individual> individuals)
+        {
+            string value = string.Empty;
+            if (agents != null && agents.Count > 0)
+            {
+                foreach(var item in agents)
+                {
+                    if(MyCommon.IsValidEmail(item.Email))
+                    {
+                        value += $"{item.Email};";
+                    }
+                }
+            }
+            if (individuals != null && individuals.Count > 0)
+            {
+                foreach (var item in individuals)
+                {
+                    if (MyCommon.IsValidEmail(item.Email))
+                    {
+                        value += $"{item.Email};";
+                    }
+                }
+            }
+            return value;
+        }
         #endregion Methods
     }
 }

UnivateProperties_API/Model/Communication/SMTPAccount.cs

@@ -33,11 +33,13 @@ namespace UnivateProperties_API.Model.Communication
         #region Properties
         public string Address { get; set; }
         public string DisplayName { get; set; }
+        public bool Default { get; set; }
         [ForeignKey("SMTPHost")]
         public int SMTPHostId { get; set; }
 
         public virtual SMTPHost SMTPHost { get; set; }
         public virtual ICollection<Email> Emails { get; set; }
+        public virtual ICollection<Template> Templates { get; set; }
         #endregion Properties
     }
 }

UnivateProperties_API/Model/Communication/Template.cs

@@ -1,4 +1,6 @@
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using UnivateProperties_API.Model.Users;
 
 namespace UnivateProperties_API.Model.Communication
 {
@@ -9,8 +11,13 @@ namespace UnivateProperties_API.Model.Communication
         public string Name { get; set; }
         public string Subject { get; set; }
         public string Body { get; set; }
+        [ForeignKey("Sender")]
+        public int? SenderId { get; set; }
 
         public virtual ICollection<PlaceHolder> PlaceHolders { get; set; }
+        public virtual SMTPAccount Sender { get; set; }
+        public virtual ICollection<Agent> AgentBCC { get; set; }
+        public virtual ICollection<Individual> IndividualBCC { get; set; }
         #endregion
     }
 }

UnivateProperties_API/Model/Timeshare/TimeshareWeek.cs

@@ -10,21 +10,48 @@ namespace UnivateProperties_API.Model.Timeshare
 {
     public class TimeshareWeek : BaseEntity
     {
-        TimeshareWeek()
+        public TimeshareWeek()
         {
-
         }
 
-        TimeshareWeek(WeekDto week)
+        public TimeshareWeek(bool referedByAgent, int? agentId, int? agencyId, int ownerId, bool agentAsRep, bool otherResort, string otherResortName, string resortCode, string resortName, int regionId, string season, string module, int bedrooms, int maxSleep, string unitNumber, string weekNumber, double levyAmount, bool currentYearBanked, string bankedWith, bool leviesPaidInFull, bool weekPlacedForRental, double originalPurchasePrice, DateTime originalPurchaseDate, DateTime arrivalDate, DateTime departureDate, double sellPrice, double agentCommision, string mandate, int statusId, Status status, Province region, Individual owner, Agent agent, Agency agency, ICollection<BidItem> bidItems, ICollection<ProcessFlow.ProcessFlow> processFlows)
         {
-            ReferedByAgent = week.ReferedByAgent;
-            AgentAsRep = false;
-            ResortCode = week.Resort.ResortCode;
-            ResortName = week.Resort.ResortName;
-            RegionId = week.Region.Id;
-            Bedrooms = week.Bedrooms;
-            MaxSleep = week.MaxSleep;
-            UnitNumber = week.UnitNumber;
+            ReferedByAgent = referedByAgent;
+            AgentId = agentId;
+            AgencyId = agencyId;
+            OwnerId = ownerId;
+            AgentAsRep = agentAsRep;
+            OtherResort = otherResort;
+            OtherResortName = otherResortName;
+            ResortCode = resortCode;
+            ResortName = resortName;
+            RegionId = regionId;
+            Season = season;
+            Module = module;
+            Bedrooms = bedrooms;
+            MaxSleep = maxSleep;
+            UnitNumber = unitNumber;
+            WeekNumber = weekNumber;
+            LevyAmount = levyAmount;
+            CurrentYearBanked = currentYearBanked;
+            BankedWith = bankedWith;
+            LeviesPaidInFull = leviesPaidInFull;
+            WeekPlacedForRental = weekPlacedForRental;
+            OriginalPurchasePrice = originalPurchasePrice;
+            OriginalPurchaseDate = originalPurchaseDate;
+            ArrivalDate = arrivalDate;
+            DepartureDate = departureDate;
+            SellPrice = sellPrice;
+            AgentCommision = agentCommision;
+            Mandate = mandate;
+            StatusId = statusId;
+            Status = status;
+            Region = region;
+            Owner = owner;
+            Agent = agent;
+            Agency = agency;
+            BidItems = bidItems;
+            ProcessFlows = processFlows;
         }
 
         #region Properties

UnivateProperties_API/Repository/Communication/TemplateRepository.cs

@@ -4,7 +4,10 @@ using System.Collections.Generic;
 using System.Linq;
 using UnivateProperties_API.Containers.Communication;
 using UnivateProperties_API.Context;
+using UnivateProperties_API.Model;
 using UnivateProperties_API.Model.Communication;
+using UnivateProperties_API.Model.Timeshare;
+using UnivateProperties_API.Model.Users;
 
 namespace UnivateProperties_API.Repository.Communication
 {
@@ -84,10 +87,31 @@ namespace UnivateProperties_API.Repository.Communication
 
         public void Update(Template item)
         {
+            var itemList = _dbContext.PlaceHolders.Where(x => x.TemplateId == item.Id).ToList();
+            CheckListChange(itemList, item.PlaceHolders.ToList());
             _dbContext.Entry(item).State = EntityState.Modified;
             Save();
         }
 
+        private void CheckListChange(List<PlaceHolder> holderOld, List<PlaceHolder> holderNew)
+        {
+            foreach (var item in holderOld)
+            {
+                if (!holderNew.Any(x => x.Id == item.Id))
+                {
+                    var i = _dbContext.PlaceHolders.FirstOrDefault(x => x.Id == item.Id);
+                    if (item != null)
+                    {
+                        _dbContext.PlaceHolders.Remove(i);
+                    }
+                }
+            }
+            foreach (var item in holderNew.Where(x => x.Id == 0))
+            {
+                _dbContext.Add(item);
+            }
+        }
+
         public void Save()
         {
             _dbContext.SaveChanges();
@@ -107,7 +131,7 @@ namespace UnivateProperties_API.Repository.Communication
         public List<TemplateDto> GetSimpleAll()
         {
             List<TemplateDto> list = new List<TemplateDto>();
-            foreach(var item in GetAll())
+            foreach (var item in GetAll())
             {
                 list.Add(new TemplateDto()
                 {
@@ -124,10 +148,11 @@ namespace UnivateProperties_API.Repository.Communication
         private List<PlaceHolderDto> GetPlaceHolders(int id)
         {
             List<PlaceHolderDto> list = new List<PlaceHolderDto>();
-            foreach(var item in _dbContext.PlaceHolders.Where(x => x.TemplateId == id).ToList())
+            foreach (var item in _dbContext.PlaceHolders.Where(x => x.TemplateId == id).ToList())
             {
                 list.Add(new PlaceHolderDto()
                 {
+                    Id = item.Id,
                     Name = item.Name,
                     BoundTo = item.BoundTo,
                     BoundToClass = item.BoundToClass,
@@ -136,5 +161,35 @@ namespace UnivateProperties_API.Repository.Communication
             }
             return list;
         }
+
+        public void SendEmailTemplate(Template template, Person sendTo, List<BaseEntity> args)
+        {
+            if (template != null)
+            {
+                if (template.SenderId == null)
+                {
+                    var acc = _dbContext.Accounts.FirstOrDefault(x => x.Default);
+                    if (acc != null)
+                    {
+                        template.SenderId = acc.Id;
+                        template.Sender = acc;
+                    }
+                }
+                else template.Sender = _dbContext.Accounts.FirstOrDefault(x => x.Id == template.SenderId);
+                template.PlaceHolders = _dbContext.PlaceHolders.Where(x => x.TemplateId == template.Id).ToList();
+                if (sendTo != null)
+                {
+                    try
+                    {
+                        Email email = new Email(template, sendTo, args);
+                        EmailRepository emailRepo = new EmailRepository(_dbContext);
+                        emailRepo.Insert(email);
+                    }
+                    catch (Exception)
+                    {
+                    }
+                }
+            }
+        }
     }
 }

UnivateProperties_API/Repository/Misc/CarouselRepository.cs

@@ -1,6 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using UnivateProperties_API.Containers.Misc;
 using UnivateProperties_API.Containers.Property;
@@ -56,8 +57,32 @@ namespace UnivateProperties_API.Repository.Misc
 
         public void Insert(Carousel item)
         {
-            dBContext.Carousel.Add(item);
+            string image = item.Image;
+            item.Image = "";
+            dBContext.Add(item);
             Save();
+
+            bool saveFiles = false;
+            var loc = dBContext.Location.FirstOrDefault().PropertyImageLocation;
+            var lastID = item.Id;
+            item.Id = lastID;
+            if (!string.IsNullOrEmpty(loc))
+            {
+                saveFiles = true;
+                loc = loc.Replace("Properties", "Carousel");
+                if (Directory.Exists(loc))
+                {
+                    Directory.CreateDirectory(loc);
+                }
+            }
+            if (saveFiles)
+            {
+                string path = ImageFormatter.Base64ToImage(image, loc, lastID.ToString());
+                item.Image = path;
+            }
+
+            Update(item);
+            
         }
 
         public void Insert(IEnumerable<Carousel> items)
@@ -117,12 +142,13 @@ namespace UnivateProperties_API.Repository.Misc
             var CarouselList = dBContext.Carousel.ToList();
 
             foreach (var item in CarouselList)
-            {
+            {                
                 if (!string.IsNullOrEmpty(item.Image) && !item.Image.StartsWith("data:image"))
                     item.Image = ImageFormatter.ImageToBase64(item.Image);
 
                 var carItem = new CarouselList()
                 {
+                    Id = item.Id,
                     Image = item.Image,
                     Header = item.Header
                 };
@@ -147,5 +173,38 @@ namespace UnivateProperties_API.Repository.Misc
 
             return list;
         }
+
+        public CarouselList GetCarousel(int id)
+        {
+            var carousel = dBContext.Carousel.Where(c => c.Id == id).FirstOrDefault();
+
+            CarouselList item = new CarouselList();
+            if (carousel != null)
+            {
+                foreach (string prop in carousel.GetAllProperties())
+                {
+                    if (prop != "Item" && prop != "Display")
+                        item[prop] = carousel[prop];
+                }
+
+                if (item.PropertyId > 0)
+                {
+                    var property = dBContext.Properties.Include("Province").Include("City").Include("Suburb").Where(p => p.Id == item.PropertyId).FirstOrDefault();
+                    item.Address = string.Format("{0}, {1} <br/>{2}", property.Suburb.Description, property.City.Description, property.AddressLine3);
+                    item.IsProperty = true;
+                }
+                if (item.TimeshareId > 0)
+                {
+                    var timeshare = dBContext.Weeks.Where(t => t.Id == item.TimeshareId).FirstOrDefault();
+                    item.Bedrooms = timeshare.Bedrooms;
+                    item.Sleeps = timeshare.MaxSleep;
+                    item.Arrival = timeshare.ArrivalDate;
+                    item.Departure = timeshare.DepartureDate;
+                    item.IsProperty = false;
+                }
+            }
+
+            return item;
+        }
     }
 }

UnivateProperties_API/Repository/Misc/ICarouselRepository.cs

@@ -7,5 +7,6 @@ namespace UnivateProperties_API.Repository.Misc
     public interface ICarouselRepository : IRepository<Carousel>
     {
         List<CarouselList> GetCarouselItems();
+        CarouselList GetCarousel(int id);
     }
 }

UnivateProperties_API/Repository/ProccessFlow/BidRepository.cs

@@ -4,7 +4,12 @@ using System.Collections.Generic;
 using System.Linq;
 using UnivateProperties_API.Containers.ProcessFlow;
 using UnivateProperties_API.Context;
+using UnivateProperties_API.Helpers;
+using UnivateProperties_API.Model;
+using UnivateProperties_API.Model.Communication;
 using UnivateProperties_API.Model.ProcessFlow;
+using UnivateProperties_API.Repository.Communication;
+using UnivateProperties_API.Repository.Timeshare;
 
 namespace UnivateProperties_API.Repository.ProccessFlow
 {
@@ -41,7 +46,7 @@ namespace UnivateProperties_API.Repository.ProccessFlow
         public List<BidItemDisplay> GetAllBid()
         {
             List<BidItem> bids = _dbContext.BidItems
-                .Include("Property")                
+                .Include("Property")
                 .Include("TimeshareWeek")
                 .Include("BidMaker")
                 .Include("Status")
@@ -77,7 +82,7 @@ namespace UnivateProperties_API.Repository.ProccessFlow
                     Comment = item.Comment,
                     DeclineReason = item.DeclinedReason
                 };
-     
+
                 if (item.PropertyId != null)
                 {
                     bid.Type = "Property";
@@ -112,12 +117,45 @@ namespace UnivateProperties_API.Repository.ProccessFlow
 
         public void Insert(BidItem item)
         {
-            var status = _dbContext.Status.Where(x => x.Code == "E1").FirstOrDefault();
-            if (status != null)
-                item.StatusId = status.Id;
-
-            _dbContext.Add(item);
-            Save();
+            var week = _dbContext.Weeks.Find(item.TimeshareWeekId);
+            if (!(item.TimeshareWeek == null && week == null))
+            {
+                if (week == null && item.TimeshareWeek != null)
+                {
+                    MyCommon.PostToConsoft(item.TimeshareWeek);
+                    WeekRepository weekRepository = new WeekRepository(_dbContext);
+                    weekRepository.Insert(item.TimeshareWeek);
+                }
+                var status = _dbContext.Status.Where(x => x.Code == "E1").FirstOrDefault();
+                if (status != null)
+                {
+                    List<BaseEntity> list = new List<BaseEntity>() { item, week, week.Owner };
+                    item.StatusId = status.Id;
+                    if (item.TimeshareWeekId != null)
+                    {
+                        if (week != null)
+                        {
+                            TemplateRepository templateRepository = new TemplateRepository(_dbContext);
+                            var template = _dbContext.Templates.FirstOrDefault(x => x.Name == "WeekOfferMade-Owner");
+                            if (template != null)
+                            {
+                                templateRepository.SendEmailTemplate(template, week.Owner, list);
+                            }
+                            template = _dbContext.Templates.FirstOrDefault(x => x.Name == "WeekOfferMade-User");
+                            if (template != null)
+                            {
+                                var bidMaker = _dbContext.Individuals.FirstOrDefault(x => x.Id == item.BidMakerId);
+                                if (bidMaker != null)
+                                {
+                                    templateRepository.SendEmailTemplate(template, bidMaker, list);
+                                }
+                            }
+                        }
+                    }
+                }
+                _dbContext.Add(item);
+                Save();
+            }
         }
 
         public void Insert(IEnumerable<BidItem> items)
@@ -165,7 +203,7 @@ namespace UnivateProperties_API.Repository.ProccessFlow
         }
 
         public BidItemDisplay AcceptBid(int id)
-        {            
+        {
             var item = _dbContext.BidItems
                 .Include("Property")
                 .Include("TimeshareWeek")
@@ -173,13 +211,13 @@ namespace UnivateProperties_API.Repository.ProccessFlow
                 .Include("Status")
                 .Where(x => x.Id == id).FirstOrDefault();
 
-            var status =  (from s in _dbContext.Status
-                           where s.Code == "E2"                           
-                           select s).FirstOrDefault();
+            var status = (from s in _dbContext.Status
+                          where s.Code == "E2"
+                          select s).FirstOrDefault();
 
             if (status != null)
             {
-                item.StatusId = status.Id;                
+                item.StatusId = status.Id;
             }
 
             _dbContext.Entry(item).State = EntityState.Modified;
@@ -190,7 +228,7 @@ namespace UnivateProperties_API.Repository.ProccessFlow
         }
 
         public BidItemDisplay DecineBid(BitItemDecline item)
-        {            
+        {
             var bid = _dbContext.BidItems
                 .Include("Property")
                 .Include("TimeshareWeek")
@@ -199,12 +237,12 @@ namespace UnivateProperties_API.Repository.ProccessFlow
                 .Where(x => x.Id == item.Id).FirstOrDefault();
 
             var status = (from s in _dbContext.Status
-                          where s.Code == "E3"                          
+                          where s.Code == "E3"
                           select s).FirstOrDefault();
 
             if (status != null)
             {
-                bid.StatusId = status.Id;               
+                bid.StatusId = status.Id;
             }
 
             bid.DeclinedReason = item.Comment;

UnivateProperties_API/Repository/Properties/IPropertyRepository.cs

@@ -16,6 +16,8 @@ namespace UnivateProperties_API.Repository.Properties
         void Insert(PropertyContainer items);
         PropertyContainer GetDetailed(int id, bool detailed);
         void Update(PropertyContainer item);
-        bool MayEdit(int id);        
+        bool MayEdit(int id);
+        void InsertImages(int propertyID, List<PropertyImage> Images);
+        void InsertFields(int propertyID, List<PropertyUserField> Fields);
     }
 }

UnivateProperties_API/Repository/Properties/PropertyRepository.cs

@@ -548,7 +548,7 @@ namespace UnivateProperties_API.Repository.Properties
 
         public List<PropertyDisplay> GetLatestDisplay()
         {
-            List<Property> props = GetAll().OrderBy(x => x.Created).Take(3).ToList();
+            List<Property> props = GetAll().OrderByDescending(x => x.Created).Take(3).ToList();
             return GetDisplayDetails(props);
         }
 
@@ -561,16 +561,20 @@ namespace UnivateProperties_API.Repository.Properties
             if (Type.ToUpper() == "MY")
             {                
                 if (individual != null)
-                    properties = Get(x => x.OwnerId == individual.Id);
+                    properties = dBContext.Properties.Include("City").Include("Suburb").Where(x => x.OwnerId == individual.Id).ToList();
                 if (agent != null)
-                    properties = Get(x => x.AgentId == agent.Id);
+                    properties = dBContext.Properties.Include("City").Include("Suburb").Where(x => x.AgentId == agent.Id).ToList();
             }
-            else
+            else if (Type.ToUpper() == "ADMIN")
             {
                 if (individual != null)
-                    properties = Get(x => x.OwnerId == individual.Id);
+                    properties = dBContext.Properties.Include("City").Include("Suburb").Where(x => x.OwnerId == individual.Id).ToList();
                 if (agent != null)
-                    properties = Get(x => x.AgencyId == agent.AgencyId);
+                    properties = dBContext.Properties.Include("City").Include("Suburb").Where(x => x.AgencyId == agent.AgencyId).ToList();
+            }
+            else if (Type.ToUpper() == "SUPERADMIN")
+            {
+                properties = dBContext.Properties.Include("City").Include("Suburb").ToList();
             }
             
             List<PropertyList> list = new List<PropertyList>();
@@ -583,7 +587,8 @@ namespace UnivateProperties_API.Repository.Properties
                     Name = string.IsNullOrEmpty(p.PropertyName) ? p.ShortDescription : p.PropertyName,
                     Price = string.Format("R {0:n}", p.Price),
                     Publish = p.Published.ToString(),
-                    Type = dBContext.PropertyTypes.Find(p.PropertyTypeId)?.Description
+                    Type = dBContext.PropertyTypes.Find(p.PropertyTypeId)?.Description,
+                    CarouselDescription = string.Format("{0}, {1} <br/>{2}", p.Suburb.Description, p.City.Description, p.AddressLine3)
                 };
 
                 prop.Size = (from u in dBContext.PropertyUserFields
@@ -654,7 +659,7 @@ namespace UnivateProperties_API.Repository.Properties
 
             foreach( string prop in property.GetAllProperties())
             {
-                if (prop != "Item")
+                if (prop != "Item" && prop != "Display")
                     property[prop] = items[prop];
             }
 
@@ -668,14 +673,9 @@ namespace UnivateProperties_API.Repository.Properties
 
             property.Video = property.Video.Replace("https://www.youtube.com/watch?v=", "");
 
-            dBContext.Properties.Add(property);
-            Save();
-
             if (images != null)
             {
-                var lastID = (from p in dBContext.PropertyImages
-                              orderby p.Id descending
-                              select p.Id).FirstOrDefault();
+                var lastID = dBContext.GetMaxID("PropertyImages");
 
                 bool saveFiles = false;
                 var loc = dBContext.Location.FirstOrDefault().PropertyImageLocation;
@@ -689,6 +689,7 @@ namespace UnivateProperties_API.Repository.Properties
                     }
                 }
 
+                property.PropertyImages = new List<PropertyImage>();
                 foreach (PropertyImage image in images)
                 {
                     lastID++;
@@ -699,26 +700,27 @@ namespace UnivateProperties_API.Repository.Properties
                         string path = ImageFormatter.Base64ToImage(image.Image, loc, lastID.ToString());
                         image.Image = path;
                     }
-                    dBContext.PropertyImages.Add(image);
-                    Save();
+                    property.PropertyImages.Add(image);
                 }
             }
 
             if (fields != null)
             {
-                var lastID = (from p in dBContext.PropertyUserFields
-                              orderby p.Id descending
-                              select p.Id).FirstOrDefault();
-
+                var lastID = dBContext.GetMaxID("PropertyUserFields");
+                property.PropertyUserFields = new List<PropertyUserField>();
                 foreach (PropertyUserField field in fields)
                 {
                     lastID++;
                     field.Id = lastID;
                     field.PropertyId = property.Id;
-                    dBContext.PropertyUserFields.Add(field);
-                    Save();
+                    property.PropertyUserFields.Add(field);
                 }
             }
+
+            dBContext.Properties.Add(property);
+            Save();
+
+            items.Id = property.Id;            
         }
 
         public bool MayEdit(int id)
@@ -729,6 +731,45 @@ namespace UnivateProperties_API.Repository.Properties
                                select b).FirstOrDefault();
 
             return (hasBidItems == null) ? true : false;
-        }                
+        }
+
+        public void InsertImages(int propertyID, List<PropertyImage> Images)
+        {
+            if (Images != null)
+            {
+                var lastID = dBContext.GetMaxID("PropertyImages");
+
+                bool saveFiles = false;
+                var loc = dBContext.Location.FirstOrDefault().PropertyImageLocation;
+                if (!string.IsNullOrEmpty(loc))
+                {
+                    saveFiles = true;
+                    loc += string.Format("\\{0}", propertyID);
+                    if (Directory.Exists(loc))
+                    {
+                        Directory.CreateDirectory(loc);
+                    }
+                }
+
+                foreach (PropertyImage image in Images)
+                {
+                    lastID++;
+                    image.Id = lastID;
+                    image.PropertyId = propertyID;
+                    if (saveFiles)
+                    {
+                        string path = ImageFormatter.Base64ToImage(image.Image, loc, lastID.ToString());
+                        image.Image = path;
+                    }
+                    dBContext.PropertyImages.Add(image);
+                    Save();
+                }
+            }
+        }
+
+        public void InsertFields(int propertyID, List<PropertyUserField> Fields)
+        {
+            throw new NotImplementedException();
+        }
     }
 }

UnivateProperties_API/Repository/Region/SuburbRepository.cs

@@ -115,20 +115,33 @@ namespace UnivateProperties_API.Repository.Region
 
         public List<SuburbSearch> GetSearchList()
         {
-            var suburbs = dBContext.Suburbs.Include("City").ToList();
+            var suburbs = dBContext.Suburbs.Include("City").Include("City.Province").ToList();
             List<SuburbSearch> searchList = new List<SuburbSearch>();
             
             foreach (var sub in suburbs)
             {
                 searchList.Add(new SuburbSearch()
-                {
-                    Id = sub.Id,
+                {                       
+                    Province = sub.City.Province.Description,
+                    City = sub.City.Description,
                     Suburb = sub.Description,
                     Display = string.Format("{0} - {1}", sub.Description, sub.City.Description)
                 });
             }
 
-            return searchList;
+            var cities = dBContext.Cities.Include("Province").ToList();
+            foreach(var city in cities)
+            {
+                searchList.Add(new SuburbSearch()
+                {                    
+                    Province = city.Province.Description,
+                    City = city.Description,
+                    Suburb = "",
+                    Display = string.Format("{0}", city.Description)
+                });
+            }
+
+            return searchList.OrderBy(s => s.City).ThenBy(s => s.Suburb).ToList();
         }
 
         public List<Suburb> GetByProperty(int propertyId)

UnivateProperties_API/Repository/Timeshare/WeekRepository.cs

@@ -11,8 +11,11 @@ using UnivateProperties_API.Containers.Timeshare.Detailed;
 using UnivateProperties_API.Containers.Users;
 using UnivateProperties_API.Context;
 using UnivateProperties_API.Helpers;
+using UnivateProperties_API.Model;
+using UnivateProperties_API.Model.Communication;
 using UnivateProperties_API.Model.Region;
 using UnivateProperties_API.Model.Timeshare;
+using UnivateProperties_API.Repository.Communication;
 using UnivateProperties_API.Repository.Region;
 using UnivateProperties_API.Repository.Users;
 
@@ -195,33 +198,41 @@ namespace UnivateProperties_API.Repository.Timeshare
         public void Insert(TimeshareWeek item)
         {
             item = GetDetailedWeek(item);
-            item.Id = _dbContext.Weeks.Max(x => x.Id) + 1;
-            if (item.Owner != null && item.Owner.Id == 0)
-            {
-                item.Owner.Id = _dbContext.Individuals.Max(x => x.Id) + 1;
-            }
-            // Set starting Status of A1
             StatusRepository repo = new StatusRepository(_dbContext);
-            item.Status = repo.GetDetailed(s => s.Code == "A1");
-            if (item.Status != null)
+            var stat = repo.Get(x => x.Code == "A1" && x.StatusType == StatusType.Timeshare).FirstOrDefault();
+            if (stat == null)
             {
                 //Create initial
-                item.Status = new Status()
+                stat = new Status()
                 {
                     Code = "A1",
                     Description = "Pending verification",
                     StatusType = StatusType.Timeshare,
                     ModifiedBy = "KobusB"
                 };
+                repo.Insert(stat);
             }
             item.Id = NewId();
-            UnivateProperties_API.Model.ProcessFlow.ProcessFlow flowItem = new Model.ProcessFlow.ProcessFlow()
+            item.ProcessFlows.Add(new Model.ProcessFlow.ProcessFlow()
             {
                 Status = item.Status,
                 Timeshare = item
-            };
+            });
+            TemplateRepository templateRepository = new TemplateRepository(_dbContext);
+            if(item.Owner != null)
+            {
+                var template = _dbContext.Templates.FirstOrDefault(x => x.Name == "WeekLoaded-Owner");
+                if(template != null)
+                {
+                    templateRepository.SendEmailTemplate(template, item.Owner, new List<BaseEntity>() { item, item.Owner });
+                }
+                template = _dbContext.Templates.FirstOrDefault(x => x.Name == "WeekLoaded-UV");
+                if(template != null)
+                {
+                    templateRepository.SendEmailTemplate(template, item.Owner, new List<BaseEntity>() { item, item.Owner });
+                }
+            }            
             _dbContext.Add(item);
-            _dbContext.Add(flowItem);
             Save();
         }
 
@@ -317,7 +328,7 @@ namespace UnivateProperties_API.Repository.Timeshare
             return _TenderId++;
         }
 
-        private List<WeekDto> GetTenderWeeks()
+        public List<WeekDto> GetTenderWeeks()
         {
             List<WeekDto> list = new List<WeekDto>();
             HttpWebRequest request = (HttpWebRequest)WebRequest.Create(MyCommon.TenderUrl);
@@ -389,5 +400,34 @@ namespace UnivateProperties_API.Repository.Timeshare
             }
             return detList;
         }
+
+        public void VerifyWeek(int id)
+        {
+            var week = _dbContext.Weeks.FirstOrDefault(x => x.Id == id);
+            var newStatus = _dbContext.Status.FirstOrDefault(x => x.Code.ToLower() == "a2" && x.StatusType == StatusType.Timeshare);
+            if(week != null && newStatus != null)
+            {
+                week.Status = newStatus;
+                Update(week);
+                var template = _dbContext.Templates.Where(x => x.Name == "WeekAuthorized").FirstOrDefault();
+                if(template != null)
+                {
+                    
+                    TemplateRepository tempRepo = new TemplateRepository(_dbContext);
+                    tempRepo.SendEmailTemplate(template, week.Owner, new List<BaseEntity>() { week, week.Owner});
+                }
+            }
+        }
+
+        public void PublishWeek(int id)
+        {
+            var week = _dbContext.Weeks.FirstOrDefault(x => x.Id == id);
+            var newStatus = _dbContext.Status.FirstOrDefault(x => x.Code.ToLower() == "b1" && x.StatusType == StatusType.Timeshare);
+            if (week != null && newStatus != null)
+            {
+                week.Status = newStatus;
+                Update(week);
+            }
+        }
     }
 }