diff --git a/EpsonPrintService/EpsonPrintService.csproj b/EpsonPrintService/EpsonPrintService.csproj
index 92925e7..ebd7252 100644
--- a/EpsonPrintService/EpsonPrintService.csproj
+++ b/EpsonPrintService/EpsonPrintService.csproj
@@ -5,7 +5,7 @@
net8.0
enable
enable
- 1.0.5
+ 1.0.6
diff --git a/EpsonPrintService/Program.cs b/EpsonPrintService/Program.cs
index db35f2c..c52c8b3 100644
--- a/EpsonPrintService/Program.cs
+++ b/EpsonPrintService/Program.cs
@@ -42,7 +42,7 @@ kernel.Bind().ToMethod(ctx =>
});
return loggerFactory.CreateLogger("EpsonPrintService");
});
-kernel.Bind().ToConstant(config);
+
kernel.Bind().To().InSingletonScope();
kernel.Bind().To();
kernel.Bind().To().InSingletonScope();
diff --git a/Inspectron.Epson/PrintServer/ConfigurationSources/EpsonPrintServiceConfiguration.cs b/Inspectron.Epson/PrintServer/ConfigurationSources/EpsonPrintServiceConfiguration.cs
index eb88bfb..21841bc 100644
--- a/Inspectron.Epson/PrintServer/ConfigurationSources/EpsonPrintServiceConfiguration.cs
+++ b/Inspectron.Epson/PrintServer/ConfigurationSources/EpsonPrintServiceConfiguration.cs
@@ -2,22 +2,11 @@
namespace Inspectron.Epson.PrintServer.ConfigurationSources;
-public class EpsonPrintServiceConfiguration: IPrinterConfigurationSource, IAssignedPrinterRepository
+public class EpsonPrintServiceConfiguration
{
- public string GroupId { get; set; }
public string RestaurantId { get; set; }
public string ApiKey { get; set; }
public string? ApiUrl { get; set; }
- public Dictionary PrinterConfigurations { get; set; }
- public PrinterConfiguration GetConfiguration(string printerAddress)
- {
- return PrinterConfigurations[printerAddress];
- }
-
- public string? GetAssignedPrinter(string workAreaId)
- {
- return PrinterConfigurations.Values.Where(x => x.AreaId == workAreaId).Select(x=>x.Address).FirstOrDefault();
- }
}
\ No newline at end of file
diff --git a/Inspectron.Epson/PrintServer/JobSources/SignalRPrintJobSource.cs b/Inspectron.Epson/PrintServer/JobSources/SignalRPrintJobSource.cs
index f272a1e..af0c20d 100644
--- a/Inspectron.Epson/PrintServer/JobSources/SignalRPrintJobSource.cs
+++ b/Inspectron.Epson/PrintServer/JobSources/SignalRPrintJobSource.cs
@@ -40,8 +40,8 @@ public class SignalRPrintJobSource: IPrintJobSource
try
{
await _connection.StartAsync();
- await _connection.InvokeAsync("JoinGroup", _groupConfiguration.GroupId);
- _logger.LogInformation("SignalR connection started and joined group {GroupId}.", _groupConfiguration.GroupId);
+ await _connection.InvokeAsync("JoinGroup", _groupConfiguration.RestaurantId);
+ _logger.LogInformation("SignalR connection started and joined group {GroupId}.", _groupConfiguration.RestaurantId);
}
catch (Exception ex)
{
@@ -60,8 +60,8 @@ public class SignalRPrintJobSource: IPrintJobSource
_logger.LogInformation("SignalR reconnected with connection ID: {ConnectionId}. Rejoining group...", connectionId);
try
{
- await _connection.InvokeAsync("JoinGroup", _groupConfiguration.GroupId);
- _logger.LogInformation("Rejoined SignalR group {GroupId} after reconnection.", _groupConfiguration.GroupId);
+ await _connection.InvokeAsync("JoinGroup", _groupConfiguration.RestaurantId);
+ _logger.LogInformation("Rejoined SignalR group {GroupId} after reconnection.", _groupConfiguration.RestaurantId);
}
catch (Exception ex)
{
@@ -78,7 +78,7 @@ public class SignalRPrintJobSource: IPrintJobSource
try
{
await _connection.StartAsync();
- await _connection.InvokeAsync("JoinGroup", _groupConfiguration.GroupId);
+ await _connection.InvokeAsync("JoinGroup", _groupConfiguration.RestaurantId);
_logger.LogInformation("Manually reconnected to SignalR.");
}
catch (Exception ex)
diff --git a/Inspectron.Epson/PrintServer/PrintServices/EpsonPrintService.cs b/Inspectron.Epson/PrintServer/PrintServices/EpsonPrintService.cs
index d4fbbd3..b8699fd 100644
--- a/Inspectron.Epson/PrintServer/PrintServices/EpsonPrintService.cs
+++ b/Inspectron.Epson/PrintServer/PrintServices/EpsonPrintService.cs
@@ -27,7 +27,7 @@ public class EpsonPrintService: IPrintService
{
try
{
- var configuration = _printerConfigurationSource.GetConfiguration(printerIp);
+
await using var epsonPrinter = _printerFactory.CreatePrinter();
string address = printerIp;
int port = 9100;
@@ -80,7 +80,7 @@ public class EpsonPrintService: IPrintService
await printerAdapter.PrintImageAsync(cachedLogoPath);
}
- await printerAdapter.SetFontSizeAsync(configuration.FontSize);
+
// Convert receipt content to print commands using the factory
List commands;