unicenta-base/unicenta-opos
3
0
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects Releases 1 Wiki Activity

UOCL-317: adding taxID to ticket

Browse Source
This commit is contained in:
Hugh
2026-01-10 12:34:54 +00:00
parent f15ccc4c23
commit 0aa4729e2e
2 changed files with 41 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/unicenta/pos/forms/AppUser.java
+7 -5
View File
@@ -55,6 +55,7 @@ public class AppUser {
private final Icon m_Icon; private final Icon m_Icon;
private Set<String> m_apermissions; private Set<String> m_apermissions;
private String taxId;
static { static {
initOldClasses(); initOldClasses();
@@ -78,6 +79,7 @@ public class AppUser {
m_sRole = role; m_sRole = role;
m_Icon = icon; m_Icon = icon;
m_apermissions = null; m_apermissions = null;
this.taxId = taxId;
} }
/** /**
@@ -199,14 +201,14 @@ public class AppUser {
* @return * @return
*/ */
public UserInfo getUserInfo() { 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) { private static String mapNewClass(String classname) {
String newclass = m_oldclasses.get(classname); String newclass = m_oldclasses.get(classname);
return newclass == null return newclass == null
? classname ? classname
: newclass; : newclass;
} }
private static void initOldClasses() { private static void initOldClasses() {
@@ -222,7 +224,8 @@ public class AppUser {
m_oldclasses.put("Menu.StockManagement", "com.unicenta.pos.forms.MenuStockManagement"); 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.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.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.panels.JPanelTax", "com.unicenta.pos.inventory.TaxPanel");
m_oldclasses.put("net.adrianromero.tpv.inventory.StockDiaryPanel", "com.unicenta.pos.inventory.StockDiaryPanel"); m_oldclasses.put("net.adrianromero.tpv.inventory.StockDiaryPanel", "com.unicenta.pos.inventory.StockDiaryPanel");
@@ -300,5 +303,4 @@ public class AppUser {
} }
} }
} }
src/main/java/com/unicenta/pos/ticket/UserInfo.java
+34 -24
View File
@@ -26,31 +26,41 @@ import java.io.Serializable;
*/ */
public class UserInfo implements Serializable { public class UserInfo implements Serializable {
private static final long serialVersionUID = 7537578737839L; private static final long serialVersionUID = 7537578737839L;
private String m_sId; private String m_sId;
private String m_sName; private String m_sName;
private String taxId;
/** Creates a new instance of UserInfoBasic /**
* @param id * Creates a new instance of UserInfoBasic
* @param name */ *
public UserInfo(String id, String name) { * @param id
m_sId = id; * @param name
m_sName = name; */
} public UserInfo(String id, String name) {
m_sId = id;
m_sName = name;
}
/** public UserInfo(String id, String name, String taxId) {
* m_sId = id;
* @return m_sName = name;
*/ this.taxId = taxId;
public String getId() { }
return m_sId;
}
/** /**
* *
* @return * @return
*/ */
public String getName() { public String getId() {
return m_sName; return m_sId;
} }
/**
*
* @return
*/
public String getName() {
return m_sName;
}
} }