v0.3.3

Author: Mikhail Kalatchev

ErpNetClient/Client.cs

@@ -24,113 +24,146 @@ public class Client
 
         public string DeviceId  { get; set; } = string.Empty;
 
+        
+
         /// <summary>
-        /// Register sale
+        /// Retreives list of configured printers
         /// </summary>
-        /// <param name="receipt">Receipt</param>
-        /// <returns>Receipt status</returns>
-        public async Task<DeviceStatusWithReceiptInfo> PrintFiscalReceiptAsync(Receipt receipt)
+        /// <returns>List of configured printers</returns>
+        public async Task<Dictionary<string, DeviceInfo>> GetPrintersAsync()
         {
             using (var clt = new HttpClient())
             {
-                StringContent cont = new StringContent(JsonSerializer.Serialize<Receipt>(receipt, serializeOptions), Encoding.UTF8, "application/json");
                 clt.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
-                HttpResponseMessage res = await clt.PostAsync(new Uri($"{BaseUrl}printers/{this.DeviceId}/receipt"), cont);
+                HttpResponseMessage res = await clt.GetAsync(new Uri($"{BaseUrl}printers"));
                 string resStr = await res.Content.ReadAsStringAsync();
-                return JsonSerializer.Deserialize<DeviceStatusWithReceiptInfo>(resStr, serializeOptions);
+                return JsonSerializer.Deserialize<Dictionary<string, DeviceInfo>>(resStr, serializeOptions);
             }
         }
 
         /// <summary>
-        /// Register refund
+        /// Retreives printer information - model, uri, etc.
         /// </summary>
-        /// <param name="receipt">Receipt</param>
-        /// <returns>Receipt status</returns>
-        public async Task<DeviceStatusWithReceiptInfo> PrintRefundReceiptAsync(ReversalReceipt receipt)
+        /// <param name="deviceId">Id of the printer</param>
+        /// <returns>Infomation for the device</returns>
+        public async Task<DeviceInfo> GetPrinterInfoAsync(string deviceId = null)
         {
             using (var clt = new HttpClient())
             {
-                StringContent cont = new StringContent(JsonSerializer.Serialize<ReversalReceipt>(receipt, serializeOptions), Encoding.UTF8, "application/json");
                 clt.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
-                HttpResponseMessage res = await clt.PostAsync(new Uri($"{BaseUrl}printers/{this.DeviceId}/reversalreceipt"), cont);
+                HttpResponseMessage res = await clt.GetAsync(new Uri($"{BaseUrl}printers/{(string.IsNullOrWhiteSpace(deviceId) ? this.DeviceId : deviceId)}"));
                 string resStr = await res.Content.ReadAsStringAsync();
-                return JsonSerializer.Deserialize<DeviceStatusWithReceiptInfo>(resStr, serializeOptions);
+                return JsonSerializer.Deserialize<DeviceInfo>(resStr, serializeOptions);
             }
         }
 
-        private async Task<DeviceStatusWithDateTime> PrintReportAsync(bool closeDay)
+        /// <summary>
+        /// Retreives printer status
+        /// </summary>
+        /// <param name="deviceId">Id of the printer</param>
+        /// <returns>Device status</returns>
+        public async Task<DeviceStatusWithDateTime> GetPrinterStatusAsync(string deviceId = null)
         {
             using (var clt = new HttpClient())
             {
-                StringContent cont = new StringContent(String.Empty, Encoding.UTF8, "application/json");
                 clt.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
-                HttpResponseMessage res = await clt.PostAsync(new Uri($"{BaseUrl}printers/{this.DeviceId}/{(closeDay ? "zreport" : "xreport")}"), cont);
+                HttpResponseMessage res = await clt.GetAsync(new Uri($"{BaseUrl}printers/{(string.IsNullOrWhiteSpace(deviceId) ? this.DeviceId : deviceId)}/status"));
                 string resStr = await res.Content.ReadAsStringAsync();
                 return JsonSerializer.Deserialize<DeviceStatusWithDateTime>(resStr, serializeOptions);
             }
         }
 
-        /// <summary>
-        /// Z Report ends the sales day and can be used for bookkeeping
-        /// </summary>
-        /// <returns>Device status</returns>
-        public async Task<DeviceStatusWithDateTime> PrintZReportAsync()
-        {
-            return await PrintReportAsync(true);
-        }
+        // Get {id}/cash 
+        // GET taskinfo : TaskInfoResult
 
         /// <summary>
-        /// X Report prints sales summary (without closing the fiscal day)
+        /// Sends raw requests to the printer
         /// </summary>
-        /// <returns>Device status</returns>
-        public async Task<DeviceStatusWithDateTime> PrintXReportAsync()
+        /// <param name="request"><see cref="RawRequest"/> to be sent.</param>
+        /// <returns>Device status with raw response</returns>
+        public async Task<DeviceStatusWithRawResponse> SendRawRequestAsync(RawRequest request)
         {
-            return await PrintReportAsync(false);
+            using (var clt = new HttpClient())
+            {
+                StringContent cont = new StringContent(JsonSerializer.Serialize<RawRequest>(request, serializeOptions), Encoding.UTF8, "application/json");
+                clt.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+                HttpResponseMessage res = await clt.PostAsync(new Uri($"{BaseUrl}printers/{this.DeviceId}/rawrequest"), cont);
+                string resStr = await res.Content.ReadAsStringAsync();
+                return JsonSerializer.Deserialize<DeviceStatusWithRawResponse>(resStr, serializeOptions);
+            }
         }
 
         /// <summary>
-        /// Retreives list of configured printers
+        /// Register sale
         /// </summary>
-        /// <returns>List of configured printers</returns>
-        public async Task<Dictionary<string, DeviceInfo>> GetPrintersAsync()
+        /// <param name="receipt">Receipt</param>
+        /// <returns>Receipt status</returns>
+        public async Task<DeviceStatusWithReceiptInfo> PrintFiscalReceiptAsync(Receipt receipt)
         {
             using (var clt = new HttpClient())
             {
+                StringContent cont = new StringContent(JsonSerializer.Serialize<Receipt>(receipt, serializeOptions), Encoding.UTF8, "application/json");
                 clt.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
-                HttpResponseMessage res = await clt.GetAsync(new Uri($"{BaseUrl}printers"));
+                HttpResponseMessage res = await clt.PostAsync(new Uri($"{BaseUrl}printers/{this.DeviceId}/receipt"), cont);
                 string resStr = await res.Content.ReadAsStringAsync();
-                return JsonSerializer.Deserialize<Dictionary<string, DeviceInfo>>(resStr, serializeOptions);
+                return JsonSerializer.Deserialize<DeviceStatusWithReceiptInfo>(resStr, serializeOptions);
             }
         }
 
         /// <summary>
-        /// Retreives printer status
+        /// Register refund
         /// </summary>
-        /// <param name="deviceId">Id of the printer</param>
-        /// <returns>The status</returns>
-        public async Task<DeviceStatusWithDateTime> GetPrinterStatusAsync(string deviceId = null)
+        /// <param name="receipt">Receipt</param>
+        /// <returns>Receipt status</returns>
+        public async Task<DeviceStatusWithReceiptInfo> PrintRefundReceiptAsync(ReversalReceipt receipt)
         {
             using (var clt = new HttpClient())
             {
+                StringContent cont = new StringContent(JsonSerializer.Serialize<ReversalReceipt>(receipt, serializeOptions), Encoding.UTF8, "application/json");
                 clt.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
-                HttpResponseMessage res = await clt.GetAsync(new Uri($"{BaseUrl}printers/{(string.IsNullOrWhiteSpace(deviceId) ? this.DeviceId : deviceId)}/status"));
+                HttpResponseMessage res = await clt.PostAsync(new Uri($"{BaseUrl}printers/{this.DeviceId}/reversalreceipt"), cont);
                 string resStr = await res.Content.ReadAsStringAsync();
-                return JsonSerializer.Deserialize<DeviceStatusWithDateTime>(resStr, serializeOptions);
+                return JsonSerializer.Deserialize<DeviceStatusWithReceiptInfo>(resStr, serializeOptions);
             }
         }
 
+        // POST {id}/withdraw
+        // POST {id}/deposit
+        // POST {id}/datetime
+
         /// <summary>
-        /// Sends raw requests to the printer
+        /// Z Report ends the sales day and can be used for bookkeeping
         /// </summary>
-        /// <param name="request"><see cref="RawRequest"/> to be sent.</param>
-        /// <returns>Device status status</returns>
-        public async Task<DeviceStatusWithDateTime> SendRawRequestAsync(RawRequest request)
+        /// <returns>Device status</returns>
+        public async Task<DeviceStatusWithDateTime> PrintZReportAsync()
+        {
+            return await PrintReportAsync(true);
+        }
+
+        /// <summary>
+        /// X Report prints sales summary (without closing the fiscal day)
+        /// </summary>
+        /// <returns>Device status</returns>
+        public async Task<DeviceStatusWithDateTime> PrintXReportAsync()
+        {
+            return await PrintReportAsync(false);
+        }
+
+        // POST {id}/duplicate
+        // POST {id}/reset
+
+        /// <summary>
+        /// Base function (to wrap it)
+        /// </summary>
+        /// <param name="closeDay"></param>
+        /// <returns></returns>
+        private async Task<DeviceStatusWithDateTime> PrintReportAsync(bool closeDay)
         {
             using (var clt = new HttpClient())
             {
-                StringContent cont = new StringContent(JsonSerializer.Serialize<RawRequest>(request, serializeOptions), Encoding.UTF8, "application/json");
+                StringContent cont = new StringContent(String.Empty, Encoding.UTF8, "application/json");
                 clt.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
-                HttpResponseMessage res = await clt.PostAsync(new Uri($"{BaseUrl}printers/{this.DeviceId}/rawrequest"), cont);
+                HttpResponseMessage res = await clt.PostAsync(new Uri($"{BaseUrl}printers/{this.DeviceId}/{(closeDay ? "zreport" : "xreport")}"), cont);
                 string resStr = await res.Content.ReadAsStringAsync();
                 return JsonSerializer.Deserialize<DeviceStatusWithDateTime>(resStr, serializeOptions);
             }

ErpNetClient/ErpNetClient.csproj

@@ -15,7 +15,7 @@
     <PackageTags>Fiscal server;Datecs;Tremol;Daisy;Eltrade;Incotex;ISL;SKYWARE Group;ErpNet.FS</PackageTags>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryUrl>https://github.com/SKYWARE-Group/ErpNetClient</RepositoryUrl>
-    <Version>0.3.2</Version>
+    <Version>0.3.3</Version>
   </PropertyGroup>
 
   <ItemGroup>

TestApp/Program.cs

@@ -63,9 +63,12 @@ static async Task Main(string[] args)
 
             var c = new Client() { DeviceId = "dt937256" };
             var res = await c.SendRawRequestAsync(new RawRequest() { Request = "P800\t200\t" });
-            res = await c.SendRawRequestAsync(new RawRequest() { Request = "P1200\t200\t" });
-            res = await c.SendRawRequestAsync(new RawRequest() { Request = "P1800\t200\t" });
             Console.WriteLine($"OK: {res.Ok}");
+
+            var res2 = await c.GetPrinterInfoAsync();
+            Console.WriteLine($"URI: {res2.Uri}");
+
+
         }
 
     }