Merge branch 'master' of http://provision-sa.co.za:3000/Provision/UnivatePropertiesAPI

UnivateProperties_API/Containers/Property/GroupFields.cs

@@ -8,6 +8,7 @@
         public string Type { get; set; }
         public string Value { get; set; }                        
         public int ItemID { get; set; }
+        public int Rank { get; set; }
         #endregion
     }
 }

UnivateProperties_API/Migrations/20200914092358_Update.cs

@@ -0,0 +1,17 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace UnivateProperties_API.Migrations
+{
+    public partial class Update : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+
+        }
+    }
+}

UnivateProperties_API/Model/Communication/Email.cs

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

UnivateProperties_API/Repository/Financial/PaygateRepository.cs

@@ -36,7 +36,7 @@ namespace UnivateProperties_API.Repository.Financial
 
             string amm = Math.Round((total * 100)).ToString();
             string currenc = "ZAR";
-            string retUrl = "http://localhost:57260/api/redirect";
+            string retUrl = "http://training.provision-sa.com:82/api/redirect";
             string transDate = utcDate;
             string loc = "en-za";
             string count = "ZAF";

UnivateProperties_API/Repository/Properties/UserDefinedGroupRepository.cs

@@ -136,9 +136,11 @@ namespace UnivateProperties_API.Repository.Properties
                         {
                             ID = field.Id,
                             Name = field.FieldName,
-                            Type = field.FieldType
+                            Type = field.FieldType,
+                            Rank = field.Rank
                         });
                     }
+                   
                 }
             }