UOCL-317: adding taxID to ticket
This commit is contained in:
@@ -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,7 +201,7 @@ 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) {
|
||||||
@@ -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 {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,15 +29,25 @@ 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
|
/**
|
||||||
|
* Creates a new instance of UserInfoBasic
|
||||||
|
*
|
||||||
* @param id
|
* @param id
|
||||||
* @param name */
|
* @param name
|
||||||
|
*/
|
||||||
public UserInfo(String id, String name) {
|
public UserInfo(String id, String name) {
|
||||||
m_sId = id;
|
m_sId = id;
|
||||||
m_sName = name;
|
m_sName = name;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public UserInfo(String id, String name, String taxId) {
|
||||||
|
m_sId = id;
|
||||||
|
m_sName = name;
|
||||||
|
this.taxId = taxId;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @return
|
* @return
|
||||||
|
|||||||
Reference in New Issue
Block a user