From 51b833e0cdbc87a6b9566ae2cb049096c35a52e9 Mon Sep 17 00:00:00 2001 From: hugh-unicenta Date: Tue, 13 Jun 2023 15:48:20 +0100 Subject: [PATCH] fixing sendOrder script --- src/main/java/com/unicenta/pos/ticket/TicketLineInfo.java | 7 +++++++ .../com/unicenta/pos/templates/script.SendOrder.txt | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/unicenta/pos/ticket/TicketLineInfo.java b/src/main/java/com/unicenta/pos/ticket/TicketLineInfo.java index c241957..674ab9f 100644 --- a/src/main/java/com/unicenta/pos/ticket/TicketLineInfo.java +++ b/src/main/java/com/unicenta/pos/ticket/TicketLineInfo.java @@ -19,6 +19,7 @@ package com.unicenta.pos.ticket; +import com.google.gson.Gson; import com.unicenta.basic.BasicException; import com.unicenta.data.loader.DataRead; import com.unicenta.data.loader.DataWrite; @@ -40,6 +41,12 @@ public class TicketLineInfo implements SerializableWrite, SerializableRead, Seri private String m_sTicket; private int m_iLine; private double multiply; + + @Override + public String toString() { + return new Gson().toJson(this); + } + private double price; private TaxInfo tax; private Properties attributes; diff --git a/src/main/resources/com/unicenta/pos/templates/script.SendOrder.txt b/src/main/resources/com/unicenta/pos/templates/script.SendOrder.txt index 98f224e..062c389 100644 --- a/src/main/resources/com/unicenta/pos/templates/script.SendOrder.txt +++ b/src/main/resources/com/unicenta/pos/templates/script.SendOrder.txt @@ -31,7 +31,7 @@ private boolean printedP6 = false; for(int i= 0; i < ticket.getLinesCount(); i++){ line = ticket.getLine(i); - if (line.getProperty("product.printer")!=null) { + if (line.getProperty("product.printer")!=null && line.getProperty("ticket.updated")!=null) { if (line.getProperty("product.printer").equals("1")) { if((printedP1 == false) && line.getProperty("ticket.updated").equals("true")) {