Commit on merge

UnivateProperties_API/Migrations/20200903080450_PropertyRefUpdate.cs

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

UnivateProperties_API/Migrations/DataContextModelSnapshot.cs

@@ -652,6 +652,8 @@ namespace UnivateProperties_API.Migrations
 
                     b.Property<string>("PropertyName");
 
+                    b.Property<string>("PropertyRef");
+
                     b.Property<int>("PropertyTypeId");
 
                     b.Property<string>("Province");

UnivateProperties_API/Model/Communication/Email.cs

@@ -43,9 +43,9 @@ namespace UnivateProperties_API.Model.Communication
                     SenderId = template.SenderId.Value;
                 }
                 Sender = template.Sender;
-                To = "abigaildf@provision-sa.com"; // sendTo.Email;
+                To = "jplouw@provision-sa.com"; // sendTo.Email;
                 ToDisplay = sendTo.FullName;
-                BCC = ConcatEmails(template.AgentBCC, template.IndividualBCC);
+                /*BCC = ConcatEmails(template.AgentBCC, template.IndividualBCC);*/
                 IsBodyHtml = true;
                 Body = template.Body;
                 Subject = template.Subject;

UnivateProperties_API/Repository/Timeshare/WeekRepository.cs

@@ -447,6 +447,7 @@ namespace UnivateProperties_API.Repository.Timeshare
             var address = _dbContext.Addresses.Where(a => a.Id == sellItem.OwnerObject.Address.Id).FirstOrDefault();
             var banking = _dbContext.BankAccounts.Where(b => b.Id == sellItem.OwnerObject.BankingDetails.Id).FirstOrDefault();
             var status = _dbContext.Status.Where(s => s.Code == "A1" && s.StatusType == StatusType.Timeshare).FirstOrDefault();
+            var agent = _dbContext.Agents.Where(ag => ag.Id == sellItem.AgentId).FirstOrDefault();
 
             #region Address
             if (sellItem.OwnerObject.Address.PostalCode != "")
@@ -536,7 +537,7 @@ namespace UnivateProperties_API.Repository.Timeshare
             #endregion
 
             var week = new TimeshareWeek();
-            foreach(string prop in week.GetAllProperties())
+            foreach (string prop in week.GetAllProperties())
             {
                 if (prop != "Item" && prop != "Display")
                     week[prop] = sellItem[prop];
@@ -545,6 +546,34 @@ namespace UnivateProperties_API.Repository.Timeshare
             week.RegionId = sellItem.Region.Id;
             week.OwnerId = owner.Id;
 
+            TemplateRepository templateRepository = new TemplateRepository(_dbContext);
+            
+            var template = _dbContext.Templates.FirstOrDefault(x => x.Name == "WeekLoaded-Owner");
+            if (agent != null)
+            {
+                sellItem.Agent = agent;
+                template = _dbContext.Templates.FirstOrDefault(x => x.Name == "WeekLoaded-Agent");
+                if (template != null)
+                {
+                    templateRepository.SendEmailTemplate(template, agent, new List<BaseEntity>() { sellItem, sellItem.Owner });
+                }
+            }
+            else if (sellItem.Owner != null)
+            {
+                
+                if (template != null)
+                {
+                    templateRepository.SendEmailTemplate(template, sellItem.Owner, new List<BaseEntity>() { sellItem, sellItem.Owner });
+                }
+                template = _dbContext.Templates.FirstOrDefault(x => x.Name == "WeekLoaded-UV");
+                if (template != null)
+                {
+                    templateRepository.SendEmailTemplate(template, sellItem.Owner, new List<BaseEntity>() { sellItem, sellItem.Owner });
+                }
+                
+            }
+
+
             week.StatusId = status.Id;
             _dbContext.Add(week);
             Save();

UnivateProperties_API/appsettings.json

@@ -9,7 +9,7 @@
   },
   "AllowedHosts": "*",
   "ConnectionStrings": {
-    "DefaultConnection": "Data Source=localhost;Initial Catalog=UniVateDemo;Persist Security Info=True;User Id=Provision;Password=What123!;Pooling=false;",
+    "DefaultConnection": "Data Source=192.168.0.219;Initial Catalog=UniVateDemo;Persist Security Info=True;User Id=Provision;Password=What123!;Pooling=false;",
     "TenderConnection": "http://www.unipoint-consoft.co.za/nph-srep.exe?cluvavail_test.sch&CLUB=LPA&RESORT=ALL&SUMMARY=N&HEAD=N"
   }
 }