Added campaign landing pages

.gitignore

@@ -337,4 +337,8 @@ ASALocalRun/
 .localhistory/
 
 # BeatPulse healthcheck temp database
-healthchecksdb
+healthchecksdb
+/UnivateProperties_API/Migrations/20210407084329_campaignProperties.cs
+/UnivateProperties_API/Migrations/20210407084329_campaignProperties.Designer.cs
+/UnivateProperties_API/Migrations/20210407091039_campaignProperties1.cs
+/UnivateProperties_API/Migrations/20210407091039_campaignProperties1.Designer.cs

UnivateProperties_API/Context/DataContext.cs

@@ -105,6 +105,7 @@ namespace UnivateProperties_API.Context
         public DbSet<CampaignItem> CampaignItems { get; set; }  
         public DbSet<CampaignPlaceHolder> CampaignPlaceHolders { get; set; }
         public DbSet<CampaignItemPlaceHolder> CampaignItemPlaceHolders { get; set; }
+        public DbSet<UploadCampaign> CampaignUploads { get; set; }
         #endregion
 
         public override int SaveChanges()

UnivateProperties_API/Controllers/Campaigns/CampaignController.cs

@@ -1,5 +1,11 @@
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using System;
 using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Threading.Tasks;
 using System.Transactions;
 using UnivateProperties_API.Containers.Campaigns;
 using UnivateProperties_API.Model.Campaigns;
@@ -66,7 +72,57 @@ namespace UnivateProperties_API.Controllers.Campaigns
                 return CreatedAtAction(nameof(Get), new { id = campaign.Id }, campaign);
             }
         }
-        
+
+        [HttpPost("FileUpload")]
+        public async Task<IActionResult> Post(IFormCollection files)
+        {
+            //string url = "http://localhost:8080";
+            //string url = "http://training.provision-sa.com:122";
+            string url = "https://www.univateproperties.co.za";
+            string fileName = "";
+            try
+            {
+                long size = files.Files.Sum(f => f.Length);
+                //string path = Path.Combine(@"C:\Users\7675\Desktop", "Uploads");
+                //string path = Path.Combine(@"C:\inetpub\wwwroot\UniVatePropertiesNew", "lp");
+                string path = Path.Combine(@"C:\inetpub\wwwroot\UniVateProperties", "lp");
+                foreach (var formFile in files.Files)
+                {
+                    if (formFile.Length > 0)
+                    {
+                        fileName = formFile.FileName;
+                        string fullPath = Path.Combine(path, fileName);
+                        using (var stream = new FileStream(fullPath, FileMode.Create))
+                        {
+                            await formFile.CopyToAsync(stream);
+                        }
+                    }
+                }
+                UploadCampaign camp = new UploadCampaign();
+                camp.FileName = fileName;
+                camp.FileLink = url + "/lp/" + fileName;
+                _Repo.addUploadCampaign(camp);
+
+                return Ok(new
+                {
+                    archives = files.Files.Count,
+                    link = url + "/lp/" + fileName,
+                    size,
+                    path
+                });
+            }
+            catch (Exception ex)
+            {
+                return StatusCode((int)HttpStatusCode.InternalServerError, ex);
+            }
+        }
+
+        [HttpGet("GetUploaded")]
+        public IActionResult GetUploaded()
+        {
+            return new OkObjectResult(_Repo.GetUploadedCampaigns());
+        }
+
         [HttpPut]
         public IActionResult Put(Campaign campaign)
         {
@@ -82,6 +138,13 @@ namespace UnivateProperties_API.Controllers.Campaigns
             return new NoContentResult();
         }
 
+        [HttpDelete("DeleteUploaded/{id}")]
+        public IActionResult DeleteUploaded(int id)
+        {
+            _Repo.RemoveUploadedAtId(id);
+            return new OkResult();
+        }
+
         [HttpDelete("{id}")]
         public IActionResult Delete(int id)
         {

UnivateProperties_API/Controllers/InfoController.cs

@@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using UnivateProperties_API.Containers.Info;
 using UnivateProperties_API.Model;
+using UnivateProperties_API.Model.Properties;
 
 namespace UnivateProperties_API.Controllers
 {
@@ -39,11 +40,13 @@ namespace UnivateProperties_API.Controllers
                 .Assembly.GetTypes()
                 .Where(t => t.IsSubclassOf(typeof(BaseEntity)) && !t.IsAbstract)
                 .Select(t => (BaseEntity)Activator.CreateInstance(t));
-            foreach(var item in exporters)
+            foreach (var item in exporters)
             {
                 ClassDto cls = new ClassDto();
                 list.Add(new ClassDto() { FullName = item.GetType().FullName.ToString(), Name = item.GetType().Name });
             }
+
+
             return list;
         }
     }

UnivateProperties_API/Migrations/20210409063434_campaignType.cs

@@ -0,0 +1,37 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace UnivateProperties_API.Migrations
+{
+    public partial class campaignType : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "IsTimeshare",
+                table: "Campaigns",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_CampaignItems_PropertyId",
+                table: "CampaignItems",
+                column: "PropertyId");
+
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_CampaignItems_Properties_PropertyId",
+                table: "CampaignItems");
+
+            migrationBuilder.DropIndex(
+                name: "IX_CampaignItems_PropertyId",
+                table: "CampaignItems");
+
+            migrationBuilder.DropColumn(
+                name: "IsTimeshare",
+                table: "Campaigns");
+        }
+    }
+}

UnivateProperties_API/Migrations/20210413100140_uploadcampaign.cs

@@ -0,0 +1,35 @@
+using System;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace UnivateProperties_API.Migrations
+{
+    public partial class uploadcampaign : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "CampaignUploads",
+                columns: table => new
+                {
+                    Id = table.Column<int>(nullable: false)
+                        .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
+                    Created = table.Column<DateTime>(nullable: false),
+                    Modified = table.Column<DateTime>(nullable: false),
+                    ModifiedBy = table.Column<string>(nullable: true),
+                    IsDeleted = table.Column<bool>(nullable: false),
+                    FileName = table.Column<string>(nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_CampaignUploads", x => x.Id);
+                });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "CampaignUploads");
+        }
+    }
+}

UnivateProperties_API/Migrations/20210413105321_uploadcampaign1.cs

@@ -0,0 +1,22 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace UnivateProperties_API.Migrations
+{
+    public partial class uploadcampaign1 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "FileLink",
+                table: "CampaignUploads",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "FileLink",
+                table: "CampaignUploads");
+        }
+    }
+}

UnivateProperties_API/Migrations/DataContextModelSnapshot.cs

@@ -87,6 +87,8 @@ namespace UnivateProperties_API.Migrations
 
                     b.Property<bool>("IsDeleted");
 
+                    b.Property<bool>("IsTimeshare");
+
                     b.Property<string>("ItemBody");
 
                     b.Property<int>("ItemsPerRow");
@@ -124,12 +126,16 @@ namespace UnivateProperties_API.Migrations
 
                     b.Property<string>("ModifiedBy");
 
+                    b.Property<int>("PropertyId");
+
                     b.Property<int>("WeekId");
 
                     b.HasKey("Id");
 
                     b.HasIndex("CampaignId");
 
+                    b.HasIndex("PropertyId");
+
                     b.HasIndex("WeekId");
 
                     b.ToTable("CampaignItems");
@@ -153,12 +159,16 @@ namespace UnivateProperties_API.Migrations
 
                     b.Property<string>("PlaceHolder");
 
+                    b.Property<int?>("PropertyCampaignItemId");
+
                     b.Property<string>("Value");
 
                     b.HasKey("Id");
 
                     b.HasIndex("CampaignItemId");
 
+                    b.HasIndex("PropertyCampaignItemId");
+
                     b.ToTable("CampaignItemPlaceHolders");
                 });
 
@@ -195,6 +205,58 @@ namespace UnivateProperties_API.Migrations
                     b.ToTable("CampaignPlaceHolders");
                 });
 
+            modelBuilder.Entity("UnivateProperties_API.Model.Campaigns.PropertyCampaignItem", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<int>("CampaignId");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Image");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<int>("PropertyId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CampaignId");
+
+                    b.HasIndex("PropertyId");
+
+                    b.ToTable("PropertyCampaignItem");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Campaigns.UploadCampaign", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("FileLink");
+
+                    b.Property<string>("FileName");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("CampaignUploads");
+                });
+
             modelBuilder.Entity("UnivateProperties_API.Model.Communication.Email", b =>
                 {
                     b.Property<int>("Id")
@@ -1486,6 +1548,11 @@ namespace UnivateProperties_API.Migrations
                         .HasForeignKey("CampaignId")
                         .OnDelete(DeleteBehavior.Cascade);
 
+                    b.HasOne("UnivateProperties_API.Model.Properties.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
                     b.HasOne("UnivateProperties_API.Model.Timeshare.TimeshareWeek", "Week")
                         .WithMany()
                         .HasForeignKey("WeekId")
@@ -1498,6 +1565,10 @@ namespace UnivateProperties_API.Migrations
                         .WithMany("CampaignItemPlaceHolder")
                         .HasForeignKey("CampaignItemId")
                         .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("UnivateProperties_API.Model.Campaigns.PropertyCampaignItem")
+                        .WithMany("CampaignItemPlaceHolder")
+                        .HasForeignKey("PropertyCampaignItemId");
                 });
 
             modelBuilder.Entity("UnivateProperties_API.Model.Campaigns.CampaignPlaceHolder", b =>
@@ -1508,6 +1579,19 @@ namespace UnivateProperties_API.Migrations
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
+            modelBuilder.Entity("UnivateProperties_API.Model.Campaigns.PropertyCampaignItem", b =>
+                {
+                    b.HasOne("UnivateProperties_API.Model.Campaigns.Campaign", "Campaign")
+                        .WithMany("PropertyItems")
+                        .HasForeignKey("CampaignId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("UnivateProperties_API.Model.Properties.Property", "Property")
+                        .WithMany()
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
             modelBuilder.Entity("UnivateProperties_API.Model.Communication.Email", b =>
                 {
                     b.HasOne("UnivateProperties_API.Model.Communication.SMTPAccount", "Sender")

UnivateProperties_API/Model/Campaigns/Campaign.cs

@@ -16,6 +16,7 @@ namespace UnivateProperties_API.Model.Campaigns
         public string ItemBody { get; set; }
         public int ItemsPerRow { get; set; }
         //public CampaignItem Items { get; set; }
+        public bool IsTimeshare { get; set; }        
 
         [NotMapped]
         public bool IsActive
@@ -29,6 +30,7 @@ namespace UnivateProperties_API.Model.Campaigns
             }
         }
 
+        public virtual ICollection<PropertyCampaignItem> PropertyItems { get; set; }
         public virtual ICollection<CampaignItem> Items { get; set; }
         public virtual ICollection<CampaignPlaceHolder> PlaceHolders { get; set; }
     }

UnivateProperties_API/Model/Campaigns/CampaignItem.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
+using UnivateProperties_API.Model.Properties;
 using UnivateProperties_API.Model.Timeshare;
 
 namespace UnivateProperties_API.Model.Campaigns
@@ -7,12 +8,13 @@ namespace UnivateProperties_API.Model.Campaigns
     public class CampaignItem : BaseEntity
     {
         [ForeignKey("Campaign")]
-        public int CampaignId { get; set; }
-        [ForeignKey("Week")]
+        public int CampaignId { get; set; }        
         public int WeekId { get; set; }
+        public int PropertyId { get; set; }
         public string Image { get; set; }
         
         public virtual TimeshareWeek Week { get; set; }
+        public virtual Property Property { get; set; }
         public virtual Campaign Campaign { get; set; }
 
         public virtual ICollection<CampaignItemPlaceHolder> CampaignItemPlaceHolder { get; set; }

UnivateProperties_API/Model/Campaigns/PropertyCampaignItem.cs

@@ -0,0 +1,29 @@
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using UnivateProperties_API.Model.Properties;
+
+namespace UnivateProperties_API.Model.Campaigns
+{
+    public class PropertyCampaignItem : BaseEntity
+    {
+        [ForeignKey("Campaign")]
+        public int CampaignId { get; set; }
+        [ForeignKey("Property")]
+        public int PropertyId { get; set; }
+        public string Image { get; set; }
+
+        public virtual Property Property { get; set; }
+        public virtual Campaign Campaign { get; set; }
+
+        public virtual ICollection<CampaignItemPlaceHolder> CampaignItemPlaceHolder { get; set; }
+
+        [NotMapped]
+        public string Reference
+        {
+            get
+            {
+                return Property != null ? Property.PropertyRef : "";
+            }
+        }
+    }
+}

UnivateProperties_API/Model/Campaigns/UploadCampaign.cs

@@ -0,0 +1,8 @@
+namespace UnivateProperties_API.Model.Campaigns
+{
+    public class UploadCampaign : BaseEntity
+    {
+        public string FileName { get; set; }
+        public string FileLink { get; set; }
+    }
+}

UnivateProperties_API/Model/Properties/Property.cs

@@ -11,6 +11,12 @@ namespace UnivateProperties_API.Model.Properties
 {
     public class Property : BaseEntity
     {
+
+        public Property()
+        {
+            
+        }
+
         private int? _StatusID;
         #region Properties        
         [ForeignKey("PropertyType")]

UnivateProperties_API/Repository/Campaigns/CampaignRepository.cs

@@ -1,13 +1,17 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.AspNetCore.Http;
+using Microsoft.EntityFrameworkCore;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using UnivateProperties_API.Containers.Campaigns;
 using UnivateProperties_API.Context;
 using UnivateProperties_API.Helpers;
 using UnivateProperties_API.Model.Campaigns;
+using UnivateProperties_API.Model.Properties;
+using UnivateProperties_API.Model.Timeshare;
 
 namespace UnivateProperties_API.Repository.Campaigns
 {
@@ -17,7 +21,10 @@ namespace UnivateProperties_API.Repository.Campaigns
         int InsertFromDTO(CampaignDTO campaign);
         string GetCampaignHTML(int CampaignId);
         List<CampaignItem> GetCampaignItems(int CampaignId);
-        List<CampaignPlaceHolder> GetCampaignPlaceHolders(int CampaignId);        
+        List<CampaignPlaceHolder> GetCampaignPlaceHolders(int CampaignId);
+        void addUploadCampaign(UploadCampaign campaignName);
+        List<UploadCampaign> GetUploadedCampaigns();
+        void RemoveUploadedAtId(int id);
     }
 
     public class CampaignRepository : ICampaignRepository
@@ -83,18 +90,28 @@ namespace UnivateProperties_API.Repository.Campaigns
             {
                 var url = _dbContext.Defaults.Where(d => d.Id == "URL").FirstOrDefault();
                 html = campaign.Body;
-                string temp = campaign.ItemBody;                
-
+                string temp = campaign.ItemBody;
+                TimeshareWeek week = new TimeshareWeek();
+                Property property = new Property();
                 itemCounter = 0;
                 foreach (var item in campaign.Items)
                 {
                     itemCounter++;
-                    var week = _dbContext.Weeks.Where(w => w.Id == item.WeekId).FirstOrDefault();
+                    if (item.WeekId != 0)
+                    {
+                        week = _dbContext.Weeks.Where(w => w.Id == item.WeekId).FirstOrDefault();
+                    }
+                    else
+                    {
+                        property = _dbContext.Properties.Where(p => p.Id == item.PropertyId).FirstOrDefault();
+                    }
 
                     string curItem = temp;
                     foreach(var place in campaign.PlaceHolders)
                     {
-                        var value = week[place.BoundTo];
+                        //var value = property[place.BoundTo];
+                        var value = week.Id == 0 ? property[place.BoundTo] : week[place.BoundTo];
+
                         if (!string.IsNullOrEmpty(place.Format))
                         {
                             string format = place.Format;
@@ -133,7 +150,7 @@ namespace UnivateProperties_API.Repository.Campaigns
                                 curItem = curItem.Replace(place.Name.ToString(), string.Format("{0:" + format + "}", value));
                         }
                         else
-                            curItem = curItem.Replace(place.Name.ToString(), value.ToString());
+                            curItem = curItem.Replace(place.Name.ToString(), value != null ? value.ToString() : place.Name.ToString() + " (NO DATA)");
                     }
 
                     var cutsomPlaceHolders = _dbContext.CampaignItemPlaceHolders.Where(c => c.CampaignItemId == item.Id).ToList();
@@ -143,7 +160,22 @@ namespace UnivateProperties_API.Repository.Campaigns
                     }
 
                     curItem = curItem.Replace("[image]", item.Image);
-                    curItem = curItem.Replace("[link]", string.Format("{0}resort/{1}/{2}", url?.Value ?? "http://localhost:8080/#/", item.Week.ResortCode, item.Week.UnitNumber));                    
+                    if (item.Week != null)
+                    {
+                        curItem = curItem.Replace("[link]", string.Format("{0}resort/{1}/{2}", url?.Value ?? "http://localhost:8080/#/", item.Week.ResortCode, item.Week.UnitNumber));
+                    }
+                    else
+                    {
+                        if (_dbContext.PropertyTypes.Where(x => x.Id == item.Property.PropertyTypeId).FirstOrDefault().UsageType == PropertyUsageType.Commercial)
+                        {
+                            curItem = curItem.Replace("[link]", string.Format("{0}property/commercial/property/{1}", url?.Value ?? "http://localhost:8080/#/", item.Property.Id));
+                        }
+                        else
+                        {
+                            curItem = curItem.Replace("[link]", string.Format("{0}property/residential/property/{1}", url?.Value ?? "http://localhost:8080/#/", item.Property.Id));                            
+                        }
+                    }
+                                      
 
                     tableItems = tableItems.Replace(string.Format("[ITEM{0}]", itemCounter), curItem);
                 }
@@ -178,10 +210,16 @@ namespace UnivateProperties_API.Repository.Campaigns
             }
             else
             {
+               
                 item.Items = (from i in _dbContext.CampaignItems
-                              where i.CampaignId == item.Id
+                              where i.CampaignId == item.Id && i.WeekId != 0
                               select new CampaignItem() { Id = i.Id, CampaignId = i.CampaignId, Image = i.Image, WeekId = i.WeekId, Week = i.Week, CampaignItemPlaceHolder = new List<CampaignItemPlaceHolder>()}).ToList();
 
+                item.Items = (from i in _dbContext.CampaignItems
+                              where i.CampaignId == item.Id && i.WeekId == 0
+                              select new CampaignItem() { Id = i.Id, CampaignId = i.CampaignId, Image = i.Image, PropertyId = i.PropertyId, Property = i.Property, CampaignItemPlaceHolder = new List<CampaignItemPlaceHolder>() }).ToList();
+
+
                 item.PlaceHolders = (from i in _dbContext.CampaignPlaceHolders
                            where i.CampaignId == item.Id
                            select new CampaignPlaceHolder(){Id = i.Id, CampaignId = i.CampaignId, Name = i.Name, BoundTo = i.BoundTo, BoundToClass = i.BoundToClass, BoundToClassDisplay = i.BoundToClassDisplay }).ToList();   
@@ -383,8 +421,131 @@ namespace UnivateProperties_API.Repository.Campaigns
             _dbContext.SaveChanges();
         }
 
+        public List<UploadCampaign> GetUploadedCampaigns()
+        {
+            return _dbContext.CampaignUploads.Where(x => x.IsDeleted == false).ToList();
+        }
+
+        public void addUploadCampaign(UploadCampaign campaign)
+        {
+            var camp = _dbContext.CampaignUploads.Where(x => x.FileName == campaign.FileName).FirstOrDefault();
+
+            if (camp == null)
+            { 
+                _dbContext.CampaignUploads.Add(campaign);
+                Save();
+            }
+            
+        }
+
+        public void RemoveUploadedAtId(int id)
+        {
+            var camp = _dbContext.CampaignUploads.Where(x => x.Id == id).FirstOrDefault();
+
+            _dbContext.CampaignUploads.Remove(camp);
+            Save();
+        }
+
         public void Update(Campaign item)
         {
+            //var savedItem = _dbContext.Campaigns.Where(x => x.Id == item.Id).FirstOrDefault();
+
+            //if (savedItem != null)
+            //{
+
+            //    if (savedItem.Name != item.Name)
+            //    {
+            //        savedItem.Name = item.Name;
+            //    }
+
+            //    if (savedItem.StartDate != item.StartDate)
+            //    {
+            //        savedItem.StartDate = item.StartDate;
+            //    }
+
+            //    if (savedItem.EndDate != item.EndDate)
+            //    {
+            //        savedItem.EndDate = item.EndDate;
+            //    }
+
+            //    if (savedItem.Subject != item.Subject)
+            //    {
+            //        savedItem.Subject = item.Subject;
+            //    }
+
+            //    if (savedItem.ItemsPerRow != item.ItemsPerRow)
+            //    {
+            //        savedItem.ItemsPerRow = item.ItemsPerRow;
+            //    }
+
+            //    if (savedItem.Body != item.Body)
+            //    {
+            //        savedItem.Body = item.Body;
+            //    }
+
+            //    if (savedItem.ItemBody != item.ItemBody)
+            //    {
+            //        savedItem.ItemBody = item.ItemBody;
+            //    }
+
+            //    if (_dbContext.CampaignPlaceHolders.Where(x => x.CampaignId == savedItem.Id).ToList().Count > 0)
+            //    {
+            //        if (_dbContext.CampaignPlaceHolders.Where(x => x.CampaignId == savedItem.Id).ToList().Count < item.PlaceHolders.Count)
+            //        {
+            //            var holders = _dbContext.CampaignPlaceHolders.Where(x => x.CampaignId == item.Id).ToList();
+            //            foreach (var savedPhItem in holders)
+            //            {
+            //                _dbContext.Remove(savedPhItem);
+            //            }
+            //            Save();
+            //            foreach (CampaignPlaceHolder ph in item.PlaceHolders)
+            //            {
+            //                ph.CampaignId = item.Id;
+            //                _dbContext.Add(ph);
+            //            }
+            //            Save();
+            //        }
+            //    }
+            //    else
+            //    {
+            //        foreach (CampaignPlaceHolder ph in item.PlaceHolders)
+            //        {
+            //            ph.CampaignId = item.Id;
+            //            _dbContext.Add(ph);
+            //        }
+            //        Save();
+            //    }
+
+            //    if (savedItem.Items != null)
+            //    {
+            //        if (savedItem.Items.Count < item.Items.Count)
+            //        {
+            //            var savedItems = _dbContext.CampaignItems.Where(x => x.CampaignId == item.Id).ToList();
+            //            foreach (var savedCamItem in savedItems)
+            //            {
+            //                _dbContext.Remove(savedCamItem);
+            //            }
+            //            Save();
+            //            foreach (CampaignItem ci in item.Items)
+            //            {
+            //                ci.CampaignId = item.Id;
+            //                _dbContext.Add(ci);
+            //            }
+            //            Save();
+            //        }
+            //    }
+            //    else
+            //    {
+            //        foreach (CampaignItem ci in item.Items)
+            //        {
+            //            ci.CampaignId = item.Id;
+            //            _dbContext.Add(ci);
+            //        }
+            //        Save();
+            //    }
+
+            //}
+            //_dbContext.Update(savedItem);
             _dbContext.Entry(item).State = EntityState.Modified;
             Save();
         }

UnivateProperties_API/Repository/Properties/PropertyRepository.cs

@@ -989,6 +989,10 @@ namespace UnivateProperties_API.Repository.Properties
                 var agent = dBContext.Agents.Where(x => x.UserId == user.Id).FirstOrDefault();
                 props = dBContext.Properties.Include("Owner").Include("PropertyType").Where(x => x.AgencyId == agent.AgencyId).ToList();
             }
+            else if (user.Role.ToUpper() == "DESIGNER")
+            {
+                props = dBContext.Properties.Include("Owner").Include("PropertyType").ToList();
+            }
             else
             {
                 var indiv = dBContext.Individuals.Where(i => i.UserId == user.Id).FirstOrDefault();

UnivateProperties_API/Repository/Timeshare/WeekRepository.cs

@@ -1168,6 +1168,8 @@ namespace UnivateProperties_API.Repository.Timeshare
             if (sellItem.CustomOwner)
             {
                 indiv.WeekId = week.Id;
+                _dbContext.NonRegIndividuals.Update(indiv);
+                Save();
             }
             return week.Id;
         }

UnivateProperties_API/appsettings.json

@@ -10,8 +10,8 @@
   "AllowedHosts": "*",
   "ConnectionStrings": {
     //"DefaultConnection": "Data Source=localhost;Initial Catalog=UniVateDemo;Persist Security Info=True;Integrated Security=SSPI;Pooling=false;",
-    //"DefaultConnection": "Data Source=localhost;Initial Catalog=UniVateDemo;Persist Security Info=True;User Id=sa;Password=What123!;Pooling=false;",
-    "DefaultConnection": "Data Source=localhost;Initial Catalog=UniVate;Persist Security Info=True;User Id=Provision;Password=J%Xvk8xGeT;Pooling=false;",
+    "DefaultConnection": "Data Source=localhost;Initial Catalog=UniVateDemo;Persist Security Info=True;User Id=sa;Password=What123!;Pooling=false;",
+    //"DefaultConnection": "Data Source=localhost;Initial Catalog=UniVate;Persist Security Info=True;User Id=Provision;Password=J%Xvk8xGeT;Pooling=false;",
     "TenderConnection": "http://www.unipoint-consoft.co.za/nph-srep.exe?cluvavail.sch&CLUB=LPA&RESORT=ALL&SUMMARY=N&HEAD=N",
     "ReservationsURL": "https://www.pvsl.co.za:85/ReservationsWebService.asmx", //Please note that ReservationsWebService must be in this case. 
     "ReservationsUserCode": "UniInt",