From 706a855fbd8a6615603cd8c43f652e5ebb35a8af Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Fri, 13 Aug 2021 19:02:40 +0000
Subject: [PATCH]

---
 source/Plugins/AyaNova.Plugin.V8/V8.cs   |  3 +-
 source/Plugins/AyaNova.Plugin.V8/util.cs | 39 +++++++++++-------------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/source/Plugins/AyaNova.Plugin.V8/V8.cs b/source/Plugins/AyaNova.Plugin.V8/V8.cs
index 99138be..4dba1ef 100644
--- a/source/Plugins/AyaNova.Plugin.V8/V8.cs
+++ b/source/Plugins/AyaNova.Plugin.V8/V8.cs
@@ -1562,6 +1562,7 @@ namespace AyaNova.PlugIn.V8
                 if (IsDuplicatev7v8IdMapItem(c.ID, c.PartNumber, progress)) continue;
                 d.name = c.Name;
                 d.partNumber = GetUniqueName(c.PartNumber);
+                progress.SubOp("");
                 progress.Op(ObjectTypeName + " " + d.partNumber + " " + d.name);
                 d.manufacturerId = Getv7v8IdMapNullOk(c.ManufacturerID);
                 d.manufacturerNumber = c.ManufacturerNumber;
@@ -2983,7 +2984,7 @@ namespace AyaNova.PlugIn.V8
             //set new seed number for work orders
             _highestWorkOrderNumberExported += 1;
             {
-                await util.PutAsync("global-biz-settings/seeds/34/" + _highestWorkOrderNumberExported.ToString());
+                await util.PutAsync("global-biz-setting/seeds/34/" + _highestWorkOrderNumberExported.ToString());
             }
         }
         #endregion Workorders
diff --git a/source/Plugins/AyaNova.Plugin.V8/util.cs b/source/Plugins/AyaNova.Plugin.V8/util.cs
index 7eee1b4..047f97b 100644
--- a/source/Plugins/AyaNova.Plugin.V8/util.cs
+++ b/source/Plugins/AyaNova.Plugin.V8/util.cs
@@ -25,31 +25,26 @@ namespace AyaNova.PlugIn.V8
         //url once known to be good
         internal static string ApiBaseUrl { get; set; }
         internal static string JWT { get; set; }
-       // public static bool Initialized { get; set; }
+        // public static bool Initialized { get; set; }
         internal static string ServerState { get; set; }
 
 
-        public util()
-        {
-          //  Initialized = false;
-            JWT = string.Empty;
-        }
+        //public util()
+        //{
+        //  //  Initialized = false;
+        //    JWT = string.Empty;
+        //}
 
 
         #region INIT / AUTH
         private static void InitClient()
         {
-           // if (Initialized) return;
-            //if (client != null)
-            //    client.Dispose();
-            //client = null;
-            //client = new HttpClient();
-            client.Timeout = new TimeSpan(0, 0, 45);
-            client.BaseAddress = new Uri(ApiBaseUrl);
-            client.DefaultRequestHeaders.Accept.Clear();
-            client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
-            // client.DefaultRequestHeaders.Add("X-AY-Import-Mode", "true");
-            //Initialized = true;
+
+            //client.Timeout = new TimeSpan(0, 0, 45);
+            //client.BaseAddress = new Uri(ApiBaseUrl);
+            // client.DefaultRequestHeaders.Accept.Clear();
+            // client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+            //
         }
 
         /// <summary>
@@ -126,10 +121,12 @@ namespace AyaNova.PlugIn.V8
 
         public async static Task<ApiResponse> GetAsync(string route)
         {
-            var requestMessage = new HttpRequestMessage(HttpMethod.Get, route);
+            var requestMessage = new HttpRequestMessage(HttpMethod.Get, ApiBaseUrl + route);
             requestMessage.Headers.Add("X-AY-Import-Mode", "1");
             if (!string.IsNullOrWhiteSpace(JWT))
                 requestMessage.Headers.Authorization = new AuthenticationHeaderValue("Bearer", JWT);
+            //  requestMessage.RequestUri = new Uri(ApiBaseUrl);
+
 
             HttpResponseMessage response = await client.SendAsync(requestMessage);
             var responseAsString = await response.Content.ReadAsStringAsync();
@@ -144,7 +141,7 @@ namespace AyaNova.PlugIn.V8
         //
         public async static Task<ApiResponse> PostAsync(string route, string postJson = null)
         {
-            var requestMessage = new HttpRequestMessage(HttpMethod.Post, route);
+            var requestMessage = new HttpRequestMessage(HttpMethod.Post, ApiBaseUrl + route);
             requestMessage.Headers.Add("X-AY-Import-Mode", "1");
             if (!string.IsNullOrWhiteSpace(JWT))
                 requestMessage.Headers.Authorization = new AuthenticationHeaderValue("Bearer", JWT);
@@ -168,7 +165,7 @@ namespace AyaNova.PlugIn.V8
 
         public async static Task<ApiResponse> PutAsync(string route, string putJson = null)
         {
-            var requestMessage = new HttpRequestMessage(HttpMethod.Put, route);
+            var requestMessage = new HttpRequestMessage(HttpMethod.Put, ApiBaseUrl + route);
             requestMessage.Headers.Add("X-AY-Import-Mode", "1");
             if (!string.IsNullOrWhiteSpace(JWT))
                 requestMessage.Headers.Authorization = new AuthenticationHeaderValue("Bearer", JWT);
@@ -191,7 +188,7 @@ namespace AyaNova.PlugIn.V8
 
         public async static Task<ApiResponse> PostFormDataAsync(string route, MultipartFormDataContent formContent)
         {
-            var requestMessage = new HttpRequestMessage(HttpMethod.Post, route);
+            var requestMessage = new HttpRequestMessage(HttpMethod.Post, ApiBaseUrl + route);
             requestMessage.Headers.Add("X-AY-Import-Mode", "1");
             if (!string.IsNullOrWhiteSpace(JWT))
                 requestMessage.Headers.Authorization = new AuthenticationHeaderValue("Bearer", JWT);