From e5a44e5fde7cfef415ec8e8176ffb3aac1ccc021 Mon Sep 17 00:00:00 2001 From: EugeneTes Date: Tue, 20 Jan 2026 13:32:05 +0100 Subject: [PATCH] adapted kitchen to thermal printer --- .../PrintServer/PrintServices/EpsonPrintService.cs | 2 +- .../PrintServer/Printers/TM-T30IIITranslated.cs | 1 - .../Printers/Utils/IReceiptConverterFactory.cs | 2 +- .../Printers/Utils/ReceiptConverterFactory.cs | 12 ++++++++---- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Inspectron.Epson/PrintServer/PrintServices/EpsonPrintService.cs b/Inspectron.Epson/PrintServer/PrintServices/EpsonPrintService.cs index a9efa37..6438847 100644 --- a/Inspectron.Epson/PrintServer/PrintServices/EpsonPrintService.cs +++ b/Inspectron.Epson/PrintServer/PrintServices/EpsonPrintService.cs @@ -82,7 +82,7 @@ public class EpsonPrintService: IPrintService await printerAdapter.SetFontSizeAsync(configuration.FontSize); // Convert receipt content to print commands using the factory - var converter = _receiptConverterFactory.Create(job.Document.ReceiptType, lineWidth: 48, bigFontLineWidth: 24); + var converter = _receiptConverterFactory.Create(job.Document.ReceiptType, printerId.Value); var commands = converter.Convert(job.Document.Content); await printerAdapter.PrintAsync(commands); await Task.Delay(200); diff --git a/Inspectron.Epson/PrintServer/Printers/TM-T30IIITranslated.cs b/Inspectron.Epson/PrintServer/Printers/TM-T30IIITranslated.cs index bf657ae..6b167c7 100644 --- a/Inspectron.Epson/PrintServer/Printers/TM-T30IIITranslated.cs +++ b/Inspectron.Epson/PrintServer/Printers/TM-T30IIITranslated.cs @@ -52,7 +52,6 @@ public class TM_T30IIITranslated : IPrinter } - await _printer.SetRedColor(command.IsRed); await _printer.SetEmphasized(command.IsBold); await _printer.PrintTextAsync(command.Text + "\n"); } diff --git a/Inspectron.Epson/PrintServer/Printers/Utils/IReceiptConverterFactory.cs b/Inspectron.Epson/PrintServer/Printers/Utils/IReceiptConverterFactory.cs index 6cfe843..d72dfa3 100644 --- a/Inspectron.Epson/PrintServer/Printers/Utils/IReceiptConverterFactory.cs +++ b/Inspectron.Epson/PrintServer/Printers/Utils/IReceiptConverterFactory.cs @@ -2,5 +2,5 @@ namespace Inspectron.Epson.PrintServer.Printers.Utils; public interface IReceiptConverterFactory { - IReceiptConverter Create(int receiptType, int lineWidth, int bigFontLineWidth); + IReceiptConverter Create(int receiptType, byte printerId); } diff --git a/Inspectron.Epson/PrintServer/Printers/Utils/ReceiptConverterFactory.cs b/Inspectron.Epson/PrintServer/Printers/Utils/ReceiptConverterFactory.cs index 5ce970c..3ae8e1f 100644 --- a/Inspectron.Epson/PrintServer/Printers/Utils/ReceiptConverterFactory.cs +++ b/Inspectron.Epson/PrintServer/Printers/Utils/ReceiptConverterFactory.cs @@ -4,14 +4,18 @@ namespace Inspectron.Epson.PrintServer.Printers.Utils; public class ReceiptConverterFactory : IReceiptConverterFactory { - public IReceiptConverter Create(int receiptType, int lineWidth, int bigFontLineWidth) + public IReceiptConverter Create(int receiptType, byte printerId) { return (EReceiptType)receiptType switch { - EReceiptType.Receipt => new FinalReceipt.FinalReceiptConverter(lineWidth, bigFontLineWidth), - EReceiptType.WorkareaTicket => new KitchenReceipt.KitchenReceiptConverterAdapter(33, 20), + EReceiptType.Receipt => new FinalReceipt.FinalReceiptConverter(48, 24), + EReceiptType.WorkareaTicket => printerId switch + { + 0x01=>new KitchenReceipt.KitchenReceiptConverterAdapter(48, 24), + _=> new KitchenReceipt.KitchenReceiptConverterAdapter(33, 20), + }, EReceiptType.NextCourse => new KitchenReceipt.KitchenReceiptConverterAdapter(33, 20), - EReceiptType.OrdersOverview => new OrderItemsReceiptConverter(lineWidth, bigFontLineWidth), + EReceiptType.OrdersOverview => new OrderItemsReceiptConverter(48, 24), _ => throw new ArgumentException($"Unknown receipt type: {receiptType}") }; }