From 0aa4729e2eebb23c58d1d6e9eb26160925e55ccb Mon Sep 17 00:00:00 2001 From: Hugh Date: Sat, 10 Jan 2026 12:34:54 +0000 Subject: [PATCH] UOCL-317: adding taxID to ticket --- .../java/com/unicenta/pos/forms/AppUser.java | 12 ++-- .../com/unicenta/pos/ticket/UserInfo.java | 58 +++++++++++-------- 2 files changed, 41 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/unicenta/pos/forms/AppUser.java b/src/main/java/com/unicenta/pos/forms/AppUser.java index e92c71f..f7edeea 100644 --- a/src/main/java/com/unicenta/pos/forms/AppUser.java +++ b/src/main/java/com/unicenta/pos/forms/AppUser.java @@ -55,6 +55,7 @@ public class AppUser { private final Icon m_Icon; private Set m_apermissions; + private String taxId; static { initOldClasses(); @@ -78,6 +79,7 @@ public class AppUser { m_sRole = role; m_Icon = icon; m_apermissions = null; + this.taxId = taxId; } /** @@ -199,14 +201,14 @@ public class AppUser { * @return */ public UserInfo getUserInfo() { - return new UserInfo(m_sId, m_sName); + return new UserInfo(m_sId, m_sName, this.taxId); } private static String mapNewClass(String classname) { String newclass = m_oldclasses.get(classname); return newclass == null - ? classname - : newclass; + ? classname + : newclass; } private static void initOldClasses() { @@ -222,7 +224,8 @@ public class AppUser { m_oldclasses.put("Menu.StockManagement", "com.unicenta.pos.forms.MenuStockManagement"); m_oldclasses.put("net.adrianromero.tpv.inventory.ProductsPanel", "com.unicenta.pos.inventory.ProductsPanel"); - m_oldclasses.put("net.adrianromero.tpv.inventory.ProductsWarehousePanel", "com.unicenta.pos.inventory.ProductsWarehousePanel"); + m_oldclasses.put("net.adrianromero.tpv.inventory.ProductsWarehousePanel", + "com.unicenta.pos.inventory.ProductsWarehousePanel"); m_oldclasses.put("net.adrianromero.tpv.inventory.CategoriesPanel", "com.unicenta.pos.inventory.CategoriesPanel"); m_oldclasses.put("net.adrianromero.tpv.panels.JPanelTax", "com.unicenta.pos.inventory.TaxPanel"); m_oldclasses.put("net.adrianromero.tpv.inventory.StockDiaryPanel", "com.unicenta.pos.inventory.StockDiaryPanel"); @@ -300,5 +303,4 @@ public class AppUser { } } - } diff --git a/src/main/java/com/unicenta/pos/ticket/UserInfo.java b/src/main/java/com/unicenta/pos/ticket/UserInfo.java index d4404b6..132f1d4 100644 --- a/src/main/java/com/unicenta/pos/ticket/UserInfo.java +++ b/src/main/java/com/unicenta/pos/ticket/UserInfo.java @@ -26,31 +26,41 @@ import java.io.Serializable; */ public class UserInfo implements Serializable { - private static final long serialVersionUID = 7537578737839L; - private String m_sId; - private String m_sName; + private static final long serialVersionUID = 7537578737839L; + private String m_sId; + private String m_sName; + private String taxId; - /** Creates a new instance of UserInfoBasic - * @param id - * @param name */ - public UserInfo(String id, String name) { - m_sId = id; - m_sName = name; - } + /** + * Creates a new instance of UserInfoBasic + * + * @param id + * @param name + */ + public UserInfo(String id, String name) { + m_sId = id; + m_sName = name; + } - /** - * - * @return - */ - public String getId() { - return m_sId; - } + public UserInfo(String id, String name, String taxId) { + m_sId = id; + m_sName = name; + this.taxId = taxId; + } - /** - * - * @return - */ - public String getName() { - return m_sName; - } + /** + * + * @return + */ + public String getId() { + return m_sId; + } + + /** + * + * @return + */ + public String getName() { + return m_sName; + } }