Update

UnivateProperties_API/Controllers/Timeshare/ResortController.cs

@@ -25,5 +25,17 @@ namespace UnivateProperties_API.Controllers.Timeshare
         {
             return new OkObjectResult(_Repo.GetResortsByRegion(regionCode));
         }
+
+        [HttpGet("GetResortDescription/{code}")]
+        public IActionResult GetResortDescription(string code)
+        {
+            return new OkObjectResult(_Repo.GetResortDescription(code));
+        }
+
+        [HttpGet("GetResortImages/{code}")]
+        public IActionResult GetResortImages(string code)
+        {
+            return new OkObjectResult(_Repo.GetResortImages(code));
+        }
     }
 }

UnivateProperties_API/Controllers/Timeshare/TimeshareWeekController.cs

@@ -91,7 +91,7 @@ namespace UnivateProperties_API.Controllers.Timeshare
             }
         }
 
-        [HttpPut("{id}")]
+        [HttpPut]
         public IActionResult Put([FromBody] TimeshareWeek item)
         {
             if (item != null)

UnivateProperties_API/Helpers/MyCommon.cs

@@ -45,6 +45,9 @@ namespace UnivateProperties_API.Helpers
         }
 
         public static string TenderUrl { get; set; }
+        public static string Reservations { get; set; }
+        public static string ReservationsUserCode { get; set; }
+        public static string ReservationsPassword { get; set; }
 
         public static DateTime GetDateFromString(string value)
         {

UnivateProperties_API/Repository/Properties/PropertyRepository.cs

@@ -114,22 +114,18 @@ namespace UnivateProperties_API.Repository.Properties
 
                         foreach (var val in groupFields)
                         {
-                            var item = new PropertyDetail()
+                            if (!string.IsNullOrEmpty(val.Value))
                             {
-                                Name = val.FieldName,
-                                Description = val.Description
-                            };
-
-                            detailGroup.Values.Add(item);
-
-                            if (!string.IsNullOrEmpty(val.Value) && (val.FieldName == "Erf Size" || val.FieldName == "Floor Size") && val.Value.EndsWith("2"))
-                            {
-                                item.Value = val.Value.Substring(0, val.Value.Length - 1) + "<sup>" + val.Value.Last() + "</sup>";
+                                var item = new PropertyDetail()
+                                {
+                                    Name = val.FieldName,
+                                    Description = val.Description,
+                                    Value = val.Value
+                                };
+
+                                detailGroup.Values.Add(item);
                             }
-                            else
-                                item.Value = val.Value;
                         }
-
                         property.DisplayData.Add(detailGroup);
                     }
                 }
@@ -592,10 +588,10 @@ namespace UnivateProperties_API.Repository.Properties
                     display.DisplayImage = ImageFormatter.ImageToBase64(display.DisplayImage);
                 }
 
-                if (!string.IsNullOrEmpty(display.Area) && display.Area.EndsWith("2"))
-                {
-                    display.Area = display.Area.Substring(0, display.Area.Length - 1) + "<sup>" + display.Area.Last() + "</sup>";
-                }
+                //if (!string.IsNullOrEmpty(display.Area) && display.Area.EndsWith("2"))
+                //{
+                //    display.Area = display.Area.Substring(0, display.Area.Length - 1) + "<sup>" + display.Area.Last() + "</sup>";
+                //}
 
                 if (display.HasPendingOffer)
                     display.Available = "Offer Pending";
@@ -702,10 +698,10 @@ namespace UnivateProperties_API.Repository.Properties
                              && f.FieldName == "Floor Size"
                              select u.Value).FirstOrDefault();
 
-                if (!string.IsNullOrEmpty(prop.Size) && prop.Size.EndsWith("2"))
-                {
-                    prop.Size = prop.Size.Substring(0, prop.Size.Length - 1) + "<sup>" + prop.Size.Last() + "</sup>";
-                }
+                //if (!string.IsNullOrEmpty(prop.Size) && prop.Size.EndsWith("2"))
+                //{
+                //    prop.Size = prop.Size.Substring(0, prop.Size.Length - 1) + "<sup>" + prop.Size.Last() + "</sup>";
+                //}
 
                 prop.UsageType = (dBContext.PropertyTypes.Find(p.PropertyTypeId).UsageType == PropertyUsageType.Residential ? "Residential" : "Commercial");
                 prop.SaleType = p.IsSale ? "Sale" : "Rental";

UnivateProperties_API/Repository/Timeshare/IResortRepository.cs

@@ -1,10 +1,9 @@
 using Newtonsoft.Json;
 using RestSharp;
-using System;
 using System.Collections.Generic;
+using System.Data;
+using System.IO;
 using System.Linq;
-using System.Security.Cryptography;
-using System.Threading.Tasks;
 using UnivateProperties_API.Containers.Timeshare;
 using UnivateProperties_API.Context;
 using UnivateProperties_API.Helpers;
@@ -14,6 +13,8 @@ namespace UnivateProperties_API.Repository.Timeshare
     public interface IResortRepository
     {
         List<ResortDisplay> GetResortsByRegion(string regionCode);
+        string GetResortDescription(string resortCode);
+        List<string> GetResortImages(string resortCode);
     }
 
     public class ResortRepository : IResortRepository
@@ -25,6 +26,88 @@ namespace UnivateProperties_API.Repository.Timeshare
             _dbContext = dbContext;
         }
 
+        public string GetResortDescription(string resortCode)
+        {
+            var requestDataURL = MyCommon.Reservations.Replace("ReservationsWebService.asmx", "");
+            var client = new RestClient(MyCommon.Reservations)
+            {
+                Timeout = -1
+            };
+            var request = new RestRequest(Method.POST);
+            request.AddHeader("charset", "utf-8");
+            request.AddHeader("Content-Type", "text/xml");
+            request.AddHeader("Cookie", "ASP.NET_SessionId=bis4e2xtmqjdvh2wlqfolzbt");
+            request.AddParameter("text/xml"
+                , string.Format("<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n<soap:Envelope xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">\r\n  <soap:Body>\r\n    <GetResortDescription xmlns=\"{3}\">\r\n      <UserCode>{0}</UserCode>\r\n      <Password>{1}</Password>\r\n      <ResortCode>{2}</ResortCode>\r\n    </GetResortDescription>\r\n  </soap:Body>\r\n</soap:Envelope>"
+                , MyCommon.ReservationsUserCode
+                , MyCommon.ReservationsPassword
+                , resortCode
+                , requestDataURL)
+                , ParameterType.RequestBody);
+            IRestResponse response = client.Execute(request);           
+
+            string description = "";
+            if (!string.IsNullOrEmpty(response.Content) && !response.Content.Contains("ERROR:"))
+            {
+                DataSet data = CreateDataSet(response.Content);
+                if (data.Tables.Count > 1)
+                {
+                    foreach (DataRow row in data.Tables["GetResortDescriptionResponse"].Rows)
+                        description = row[0].ToString();
+                }
+            }
+            return description;
+        }
+
+        public List<string> GetResortImages(string resortCode)
+        {
+            var requestDataURL = MyCommon.Reservations.Replace("ReservationsWebService.asmx", "");
+            var client = new RestClient(MyCommon.Reservations)
+            {
+                Timeout = -1
+            };
+            var request = new RestRequest(Method.POST);
+            request.AddHeader("charset", "utf-8");
+            request.AddHeader("Content-Type", "text/xml");
+            request.AddHeader("Cookie", "ASP.NET_SessionId=bis4e2xtmqjdvh2wlqfolzbt");
+            request.AddParameter("text/xml"
+                , string.Format("<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n<soap:Envelope xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">\r\n  <soap:Body>\r\n    <GetResortImages  xmlns=\"{3}\">\r\n      <UserCode>{0}</UserCode>\r\n      <Password>{1}</Password>\r\n      <ResortCode>{2}</ResortCode>\r\n    </GetResortImages >\r\n  </soap:Body>\r\n</soap:Envelope>"
+                , MyCommon.ReservationsUserCode
+                , MyCommon.ReservationsPassword
+                , resortCode
+                , requestDataURL)
+                , ParameterType.RequestBody);
+            IRestResponse response = client.Execute(request);            
+
+            var images = new List<string>();
+            if (!string.IsNullOrEmpty(response.Content) && !response.Content.Contains("ERROR:"))
+            {
+                DataSet data = CreateDataSet(response.Content);
+                if (data.Tables.Count > 1)
+                {
+                    foreach (DataRow row in data.Tables["string"].Rows)
+                        images.Add(row[0].ToString());
+                }
+            }
+            return images;
+        }
+
+        public DataSet CreateDataSet(string data)
+        {
+            try
+            {
+                StringReader theReader = new StringReader(data);
+                DataSet theDataSet = new DataSet();
+                theDataSet.ReadXml(theReader);
+
+                return theDataSet;
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
         public List<ResortDisplay> GetResortsByRegion(string regionCode)
         {
             var resorts = new List<ResortDisplay>();

UnivateProperties_API/Startup.cs

@@ -59,6 +59,9 @@ namespace UnivateProperties_API
             services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
             services.AddDbContext<DataContext>(o => o.UseSqlServer(Configuration.GetConnectionString("DefaultConnection")));
             MyCommon.TenderUrl = Configuration.GetConnectionString("TenderConnection");
+            MyCommon.Reservations = Configuration.GetConnectionString("ReservationsURL");
+            MyCommon.ReservationsUserCode = Configuration.GetConnectionString("ReservationsUserCode");
+            MyCommon.ReservationsPassword = Configuration.GetConnectionString("ReservationsPassword");
 
             var appSettingsSection = Configuration.GetSection("AppSettings");
             services.Configure<AppSettings>(appSettingsSection);

UnivateProperties_API/appsettings.json

@@ -9,7 +9,10 @@
   },
   "AllowedHosts": "*",
   "ConnectionStrings": {
-    "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.sch&CLUB=LPA&RESORT=ALL&SUMMARY=N&HEAD=N"
+    "DefaultConnection": "Data Source=localhost;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.sch&CLUB=LPA&RESORT=ALL&SUMMARY=N&HEAD=N",
+    "ReservationsURL": "http://training.provision-sa.com:84/ReservationsWebService.asmx", //Please note that ReservationsWebService must be in this case. 
+    "ReservationsUserCode": "UniInt",
+    "ReservationsPassword": "Un11nt"
   }
 }