wip

.gitignore

@@ -7,8 +7,8 @@ nbactions.xml
 *.log
 docker.sock
 .DS_Store
+
 .classpath
-.factorypath
-.settings/
 .project
-AGENTS.md
+.factorypath
+.settings

C4_ARCHITECTURE.md

@@ -0,0 +1,729 @@
+# Unicenta oPOS - C4 Architecture Diagram
+
+## Overview
+
+Unicenta oPOS (v5.4.0) is an enterprise-level Point of Sale system built with Java. It provides comprehensive sales, inventory, customer, and reporting management capabilities with support for multiple operating systems (Windows, Linux, macOS).
+
+---
+
+## Level 1: System Context Diagram
+
+```mermaid
+graph TB
+    user["👤 POS Operators/Staff"]
+
+    system["📱 Unicenta oPOS System<br/>Java Desktop Application<br/>v5.4.0"]
+
+    devices["🖨️ Peripheral Devices<br/>Printer • Scale<br/>Barcode Scanner<br/>Card Reader"]
+
+    db["💾 Database<br/>MySQL • Derby<br/>SQLite • PostgreSQL"]
+
+    fs["📂 File System<br/>Reports • Templates<br/>Locales • Config"]
+
+    user -->|interacts| system
+    system -->|controls| devices
+    system -->|reads/writes| db
+    system -->|reads/writes| fs
+    devices -.->|feedback| system
+
+    style system fill:#4A90E2,stroke:#2E5C8A,color:#fff,stroke-width:3px
+    style user fill:#50C878,stroke:#2D7A4A,color:#fff
+    style devices fill:#FF6B6B,stroke:#A53D3D,color:#fff
+    style db fill:#FFB84D,stroke:#8B6914,color:#fff
+    style fs fill:#9B59B6,stroke:#5B2C6F,color:#fff
+```
+
+---
+
+## Level 2: Container Architecture
+
+```mermaid
+graph TB
+    subgraph app["🏗️ UNICENTA oPOS APPLICATION"]
+        subgraph ui["PRESENTATION LAYER<br/>(Swing/JavaFX)"]
+            ui1["StartPOS Entry Point"]
+            ui2["Sales Screens<br/>Simple • Restaurant<br/>Shared Modes"]
+            ui3["Admin Panels<br/>User Mgmt • Settings"]
+            ui4["Forms & Dialogs<br/>Customers • Suppliers<br/>Inventory"]
+            ui5["Reporting Dashboards<br/>JFreeChart"]
+        end
+
+        subgraph service["SERVICE LAYER<br/>(Business Logic)"]
+            svc1["Sales Service"]
+            svc2["Inventory Service"]
+            svc3["Customer Service"]
+            svc4["Payment Service"]
+            svc5["Reporting Service"]
+            svc6["Config/Admin Service"]
+        end
+
+        subgraph dao["DATA ACCESS LAYER<br/>(DAOs)"]
+            dao1["ProductDAO"]
+            dao2["TicketDAO"]
+            dao3["CustomerDAO"]
+            dao4["EmployeeDAO"]
+            dao5["CompanyDAO"]
+            dao6["SupplierDAO"]
+        end
+
+        subgraph peripheral["PERIPHERAL INTEGRATION<br/>(Drivers & APIs)"]
+            per1["Printer Drivers<br/>ESC-POS • JavaPOS"]
+            per2["Scale Reader<br/>Serial Comm"]
+            per3["Barcode Scanner<br/>ZXing"]
+            per4["Card Reader<br/>USB/Serial"]
+        end
+
+        subgraph utils["UTILITIES & SUPPORT"]
+            util1["Logging<br/>Logback"]
+            util2["Formatting<br/>Date • Currency"]
+            util3["Localization<br/>i18n"]
+            util4["Reporting<br/>JasperReports"]
+            util5["Scripting<br/>BeanShell"]
+            util6["Plugins"]
+        end
+    end
+
+    subgraph external["📦 EXTERNAL SYSTEMS"]
+        extdb["💾 Database<br/>MySQL/Derby/SQLite<br/>PostgreSQL"]
+        extfs["📂 File System<br/>Configs • Templates<br/>Locales • Reports"]
+        devices["🖨️ Physical Devices<br/>Printers • Scales<br/>Scanners • Card Readers"]
+    end
+
+    ui -->|calls| service
+    service -->|uses| dao
+    service -->|uses| peripheral
+    service -->|uses| utils
+    ui -->|uses| utils
+
+    dao -->|reads/writes| extdb
+    peripheral -->|controls| devices
+    service -->|reads/writes| extfs
+    ui -->|reads/writes| extfs
+
+    style app fill:#E8F4F8,stroke:#2E5C8A,stroke-width:2px
+    style ui fill:#4A90E2,stroke:#2E5C8A,color:#fff
+    style service fill:#50C878,stroke:#2D7A4A,color:#fff
+    style dao fill:#FF9F43,stroke:#B8690F,color:#fff
+    style peripheral fill:#FF6B6B,stroke:#A53D3D,color:#fff
+    style utils fill:#9B59B6,stroke:#5B2C6F,color:#fff
+    style external fill:#F0F0F0,stroke:#666
+    style extdb fill:#FFB84D,stroke:#8B6914,color:#fff
+    style extfs fill:#9B59B6,stroke:#5B2C6F,color:#fff
+    style devices fill:#FF6B6B,stroke:#A53D3D,color:#fff
+```
+
+---
+
+## Level 3: Component Architecture
+
+### Sales Module
+
+```mermaid
+graph LR
+    subgraph sales["com.unicenta.pos.sales"]
+        simple["simple/<br/>Simple POS Mode"]
+        restaurant["restaurant/<br/>Table/Order Mode"]
+        shared["shared/<br/>Shared Ticket Logic"]
+    end
+
+    simple -.-> shared
+    restaurant -.-> shared
+
+    style sales fill:#4A90E2,stroke:#2E5C8A,color:#fff
+    style simple fill:#5BA3D0,stroke:#2E5C8A,color:#fff
+    style restaurant fill:#5BA3D0,stroke:#2E5C8A,color:#fff
+    style shared fill:#6BB3E0,stroke:#2E5C8A,color:#fff
+```
+
+### Inventory & Catalog Modules
+
+```mermaid
+graph TB
+    subgraph inventory["com.unicenta.pos.inventory"]
+        inv_prod["Product Management"]
+        inv_stock["Stock Tracking"]
+        inv_cat["Category Management"]
+    end
+
+    subgraph catalog["com.unicenta.pos.catalog"]
+        cat_prod["Product Categorization"]
+        cat_search["Product Search/Filter"]
+        cat_display["Display Management"]
+    end
+
+    inv_prod ---|shared data| cat_prod
+    inv_cat ---|manages| cat_display
+
+    style inventory fill:#50C878,stroke:#2D7A4A,color:#fff
+    style catalog fill:#50C878,stroke:#2D7A4A,color:#fff
+    style inv_prod fill:#68D989,stroke:#2D7A4A,color:#fff
+    style inv_stock fill:#68D989,stroke:#2D7A4A,color:#fff
+    style inv_cat fill:#68D989,stroke:#2D7A4A,color:#fff
+    style cat_prod fill:#68D989,stroke:#2D7A4A,color:#fff
+    style cat_search fill:#68D989,stroke:#2D7A4A,color:#fff
+    style cat_display fill:#68D989,stroke:#2D7A4A,color:#fff
+```
+
+### Ticket & Payment Processing
+
+```mermaid
+graph TB
+    subgraph ticket["com.unicenta.pos.ticket"]
+        ticket_create["Ticket Creation"]
+        ticket_items["Line Items Mgmt"]
+        ticket_lifecycle["Lifecycle Management"]
+    end
+
+    subgraph payment["com.unicenta.pos.payment"]
+        pay_method["Payment Methods"]
+        pay_process["Payment Processing"]
+        pay_card["Card Integration"]
+    end
+
+    ticket_create -->|on completion| pay_method
+    ticket_items -->|on finalize| pay_process
+    pay_process -->|if card| pay_card
+
+    style ticket fill:#FF9F43,stroke:#B8690F,color:#fff
+    style payment fill:#FF9F43,stroke:#B8690F,color:#fff
+    style ticket_create fill:#FDB44B,stroke:#B8690F,color:#fff
+    style ticket_items fill:#FDB44B,stroke:#B8690F,color:#fff
+    style ticket_lifecycle fill:#FDB44B,stroke:#B8690F,color:#fff
+    style pay_method fill:#FDB44B,stroke:#B8690F,color:#fff
+    style pay_process fill:#FDB44B,stroke:#B8690F,color:#fff
+    style pay_card fill:#FDB44B,stroke:#B8690F,color:#fff
+```
+
+### Reporting & Administration
+
+```mermaid
+graph TB
+    subgraph reports["com.unicenta.pos.reports"]
+        report_gen["Report Generation"]
+        report_chart["Chart Generation<br/>JFreeChart"]
+        report_export["PDF/Excel Export"]
+    end
+
+    subgraph admin["com.unicenta.pos.admin"]
+        admin_user["User Management"]
+        admin_config["System Configuration"]
+        admin_security["Access Control"]
+    end
+
+    report_gen -->|uses| report_chart
+    report_chart -->|renders to| report_export
+    admin_user -->|applies| admin_security
+
+    style reports fill:#9B59B6,stroke:#5B2C6F,color:#fff
+    style admin fill:#9B59B6,stroke:#5B2C6F,color:#fff
+    style report_gen fill:#B76AC2,stroke:#5B2C6F,color:#fff
+    style report_chart fill:#B76AC2,stroke:#5B2C6F,color:#fff
+    style report_export fill:#B76AC2,stroke:#5B2C6F,color:#fff
+    style admin_user fill:#B76AC2,stroke:#5B2C6F,color:#fff
+    style admin_config fill:#B76AC2,stroke:#5B2C6F,color:#fff
+    style admin_security fill:#B76AC2,stroke:#5B2C6F,color:#fff
+```
+
+### Printer System
+
+```mermaid
+graph LR
+    subgraph printer["com.unicenta.pos.printer"]
+        escpos["escpos/<br/>ESC-POS Driver"]
+        javapos["javapos/<br/>JavaPOS Driver"]
+        screen["screen/<br/>Screen Preview"]
+    end
+
+    reports["JasperReports<br/>JFreeChart"]
+
+    reports -->|routes to| escpos
+    reports -->|routes to| javapos
+    reports -->|routes to| screen
+
+    style printer fill:#FF6B6B,stroke:#A53D3D,color:#fff
+    style escpos fill:#FF8E8E,stroke:#A53D3D,color:#fff
+    style javapos fill:#FF8E8E,stroke:#A53D3D,color:#fff
+    style screen fill:#FF8E8E,stroke:#A53D3D,color:#fff
+    style reports fill:#9B59B6,stroke:#5B2C6F,color:#fff
+```
+
+### Communication & Integration
+
+```mermaid
+graph TB
+    subgraph comm["com.unicenta.pos.comm"]
+        serial["Serial Communication<br/>RXTX • jSerialComm"]
+        usb["USB Communication<br/>USB4Java"]
+    end
+
+    scale["Scale Reader"]
+    scanner["Barcode Scanner<br/>ZXing"]
+    reader["Card Reader"]
+
+    serial -->|reads| scale
+    serial -->|reads| scanner
+    usb -->|reads| reader
+
+    style comm fill:#FF6B6B,stroke:#A53D3D,color:#fff
+    style serial fill:#FF8E8E,stroke:#A53D3D,color:#fff
+    style usb fill:#FF8E8E,stroke:#A53D3D,color:#fff
+    style scale fill:#D9534F,stroke:#A53D3D,color:#fff
+    style scanner fill:#D9534F,stroke:#A53D3D,color:#fff
+    style reader fill:#D9534F,stroke:#A53D3D,color:#fff
+```
+
+---
+
+## Level 4: Data Flow Diagrams
+
+### Sales Transaction Flow
+
+```mermaid
+sequenceDiagram
+    actor User as POS Operator
+    participant UI as Sales Screen
+    participant Service as Sales Service
+    participant DAO as TicketDAO
+    participant DB as Database
+    participant Payment as Payment Service
+    participant Printer as Printer Service
+
+    User->>UI: Create/Edit Ticket
+    UI->>Service: Process Ticket
+    Service->>DAO: Save Ticket
+    DAO->>DB: INSERT/UPDATE
+    DB-->>DAO: Confirm
+    DAO-->>Service: Ticket ID
+    User->>UI: Process Payment
+    UI->>Service: Payment Request
+    Service->>Payment: Process Payment
+    Payment-->>Service: Payment Confirmed
+    Service->>Printer: Print Receipt
+    Printer-->>Service: Print Complete
+    Service-->>UI: Transaction Complete
+    UI-->>User: Display Confirmation
+```
+
+### Product Lookup Flow
+
+```mermaid
+sequenceDiagram
+    actor Device as Barcode Scanner
+    participant UI as Sales Screen
+    participant DAO as ProductDAO
+    participant DB as Database
+
+    Device->>UI: Scan Barcode
+    UI->>DAO: Query Product
+    DAO->>DB: SELECT Product
+    DB-->>DAO: Product Data
+    DAO-->>UI: Product Details
+    UI-->>Device: Display Product Info
+```
+
+### Report Generation Flow
+
+```mermaid
+sequenceDiagram
+    actor User as Admin/Manager
+    participant UI as Admin Panel
+    participant Service as Reporting Service
+    participant JasperReports as JasperReports Engine
+    participant DB as Database
+    participant FileSystem as File System
+
+    User->>UI: Request Report
+    UI->>Service: Generate Report
+    Service->>DB: Query Data
+    DB-->>Service: Report Data
+    Service->>JasperReports: Render Report
+    JasperReports->>FileSystem: Generate PDF/Excel
+    FileSystem-->>JasperReports: File Path
+    JasperReports-->>Service: Report Ready
+    Service-->>UI: Display/Download
+    UI-->>User: Provide Report
+```
+
+---
+
+## Level 5: Package Structure
+
+```mermaid
+graph TB
+    com["com.unicenta"]
+
+    com -->|core| basic["basic<br/>Exception Handling<br/>Logging"]
+    com -->|ui| beans["beans<br/>Custom UI Components<br/>Dialogs • Date Pickers<br/>Number Pads"]
+    com -->|ui| orderpop["orderpop<br/>Order Popup Module"]
+    com -->|plugins| plugins["plugins<br/>Plugin Architecture<br/>Metrics System"]
+
+    pos["com.unicenta.pos"]
+    com -->|main| pos
+
+    pos -->|sales| sales["sales<br/>Simple • Restaurant<br/>Shared Modes"]
+    pos -->|inventory| inventory["inventory<br/>Products • Stock<br/>Categories"]
+    pos -->|customers| customers["customers<br/>Customer Management<br/>Loyalty Programs"]
+    pos -->|catalog| catalog["catalog<br/>Product Catalog<br/>Display Management"]
+    pos -->|ticket| ticket["ticket<br/>Ticket Lifecycle<br/>Line Items"]
+    pos -->|payment| payment["payment<br/>Payment Methods<br/>Card Integration<br/>Cash Handling"]
+    pos -->|reports| reports["reports<br/>JasperReports<br/>JFreeChart<br/>PDF/Excel Export"]
+    pos -->|admin| admin["admin<br/>User Management<br/>System Configuration<br/>Access Control"]
+    pos -->|printer| printer["printer<br/>ESC-POS • JavaPOS<br/>Screen Preview"]
+    pos -->|comm| comm["comm<br/>Serial • USB<br/>Scale • Scanner<br/>Card Reader"]
+    pos -->|scripting| scripting["scripting<br/>BeanShell<br/>Custom Logic"]
+    pos -->|forms| forms["forms<br/>Main UI<br/>Data Entry Forms"]
+    pos -->|config| config["config<br/>Configuration Mgmt<br/>Settings"]
+    pos -->|instance| instance["instance<br/>Instance Management<br/>Singleton Patterns"]
+    pos -->|mant| mant["mant<br/>Maintenance<br/>Utilities"]
+
+    style com fill:#E8F4F8,stroke:#2E5C8A
+    style pos fill:#4A90E2,stroke:#2E5C8A,color:#fff
+    style basic fill:#5BA3D0,stroke:#2E5C8A,color:#fff
+    style beans fill:#5BA3D0,stroke:#2E5C8A,color:#fff
+    style orderpop fill:#5BA3D0,stroke:#2E5C8A,color:#fff
+    style plugins fill:#5BA3D0,stroke:#2E5C8A,color:#fff
+    style sales fill:#50C878,stroke:#2D7A4A,color:#fff
+    style inventory fill:#50C878,stroke:#2D7A4A,color:#fff
+    style customers fill:#50C878,stroke:#2D7A4A,color:#fff
+    style catalog fill:#50C878,stroke:#2D7A4A,color:#fff
+    style ticket fill:#FF9F43,stroke:#B8690F,color:#fff
+    style payment fill:#FF9F43,stroke:#B8690F,color:#fff
+    style reports fill:#9B59B6,stroke:#5B2C6F,color:#fff
+    style admin fill:#9B59B6,stroke:#5B2C6F,color:#fff
+    style printer fill:#FF6B6B,stroke:#A53D3D,color:#fff
+    style comm fill:#FF6B6B,stroke:#A53D3D,color:#fff
+    style scripting fill:#FFB84D,stroke:#8B6914,color:#fff
+    style forms fill:#4A90E2,stroke:#2E5C8A,color:#fff
+    style config fill:#4A90E2,stroke:#2E5C8A,color:#fff
+    style instance fill:#4A90E2,stroke:#2E5C8A,color:#fff
+    style mant fill:#4A90E2,stroke:#2E5C8A,color:#fff
+```
+
+---
+
+## Level 6: Database Schema Overview
+
+```mermaid
+graph TB
+    subgraph core["CORE ENTITIES"]
+        company["COMPANY<br/>company_id<br/>name<br/>code"]
+        location["LOCATION<br/>location_id<br/>name<br/>address"]
+        products["PRODUCTS<br/>product_id<br/>name<br/>code<br/>price"]
+        categories["CATEGORIES<br/>category_id<br/>name<br/>description"]
+    end
+
+    subgraph transactions["TRANSACTION ENTITIES"]
+        tickets["TICKETS<br/>ticket_id<br/>number<br/>date<br/>customer_id"]
+        lines["TICKETLINES<br/>line_id<br/>ticket_id<br/>product_id<br/>qty"]
+        payments["PAYMENTS<br/>payment_id<br/>ticket_id<br/>method<br/>amount"]
+    end
+
+    subgraph master["MASTER DATA"]
+        customers["CUSTOMERS<br/>customer_id<br/>name<br/>email<br/>phone"]
+        suppliers["SUPPLIERS<br/>supplier_id<br/>name<br/>contact<br/>products"]
+        employees["EMPLOYEES<br/>employee_id<br/>name<br/>role<br/>access_level"]
+        taxes["TAXCATEGORIES<br/>tax_id<br/>name<br/>rate"]
+    end
+
+    subgraph inventory["INVENTORY ENTITIES"]
+        stock["STOCK<br/>stock_id<br/>product_id<br/>location_id<br/>quantity"]
+        movements["STOCKMOVEMENTS<br/>movement_id<br/>product_id<br/>qty<br/>type"]
+    end
+
+    company -->|operates| location
+    location -->|manages| products
+    products -->|in| categories
+    location -->|in| stock
+    products -->|in| stock
+
+    customers -->|creates| tickets
+    employees -->|processes| tickets
+    products -->|in| lines
+    tickets -->|contains| lines
+    tickets -->|has| payments
+    tickets -->|has| taxes
+
+    products -->|from| suppliers
+    stock -->|tracks| movements
+
+    style core fill:#4A90E2,stroke:#2E5C8A,color:#fff
+    style transactions fill:#FF9F43,stroke:#B8690F,color:#fff
+    style master fill:#50C878,stroke:#2D7A4A,color:#fff
+    style inventory fill:#9B59B6,stroke:#5B2C6F,color:#fff
+    style company fill:#5BA3D0,stroke:#2E5C8A,color:#fff
+    style location fill:#5BA3D0,stroke:#2E5C8A,color:#fff
+    style products fill:#5BA3D0,stroke:#2E5C8A,color:#fff
+    style categories fill:#5BA3D0,stroke:#2E5C8A,color:#fff
+    style tickets fill:#FDB44B,stroke:#B8690F,color:#fff
+    style lines fill:#FDB44B,stroke:#B8690F,color:#fff
+    style payments fill:#FDB44B,stroke:#B8690F,color:#fff
+    style customers fill:#68D989,stroke:#2D7A4A,color:#fff
+    style suppliers fill:#68D989,stroke:#2D7A4A,color:#fff
+    style employees fill:#68D989,stroke:#2D7A4A,color:#fff
+    style taxes fill:#68D989,stroke:#2D7A4A,color:#fff
+    style stock fill:#B76AC2,stroke:#5B2C6F,color:#fff
+    style movements fill:#B76AC2,stroke:#5B2C6F,color:#fff
+```
+
+---
+
+## Technology Stack
+
+```mermaid
+graph TB
+    subgraph frontend["FRONTEND"]
+        swing["Swing<br/>Traditional UI"]
+        javafx["JavaFX<br/>Modern UI"]
+        flatlaf["FlatLAF<br/>Modern Look & Feel"]
+    end
+
+    subgraph backend["BACKEND"]
+        java["Java 8+<br/>Core Logic"]
+        lombok["Lombok<br/>Boilerplate Reduction"]
+        beanshell["BeanShell<br/>Dynamic Scripting"]
+    end
+
+    subgraph data["DATA & PERSISTENCE"]
+        jdbc["JDBC<br/>Database Abstraction"]
+        mysql["MySQL<br/>Primary Database"]
+        derby["Derby<br/>Embedded DB"]
+        sqlite["SQLite<br/>Lightweight DB"]
+        postgres["PostgreSQL<br/>Enterprise DB"]
+    end
+
+    subgraph reporting["REPORTING & ANALYTICS"]
+        jasper["JasperReports<br/>Report Generation"]
+        jfreechart["JFreeChart<br/>Charts & Graphs"]
+        poi["Apache POI<br/>Excel Export"]
+        itext["iText<br/>PDF Generation"]
+    end
+
+    subgraph devices["DEVICE INTEGRATION"]
+        rxtx["RXTX/jSerialComm<br/>Serial Communication"]
+        usb4j["USB4Java<br/>USB Communication"]
+        zxing["ZXing<br/>Barcode Processing"]
+        jpos["JavaPOS<br/>POS Device Standard"]
+    end
+
+    subgraph support["SUPPORT LIBRARIES"]
+        logback["Logback<br/>Logging"]
+        gson["GSON<br/>JSON Processing"]
+        xstream["XStream<br/>XML Serialization"]
+        velocity["Apache Velocity<br/>Template Engine"]
+    end
+
+    style frontend fill:#4A90E2,stroke:#2E5C8A,color:#fff
+    style backend fill:#50C878,stroke:#2D7A4A,color:#fff
+    style data fill:#FF9F43,stroke:#B8690F,color:#fff
+    style reporting fill:#9B59B6,stroke:#5B2C6F,color:#fff
+    style devices fill:#FF6B6B,stroke:#A53D3D,color:#fff
+    style support fill:#FFB84D,stroke:#8B6914,color:#fff
+
+    style swing fill:#5BA3D0,stroke:#2E5C8A,color:#fff
+    style javafx fill:#5BA3D0,stroke:#2E5C8A,color:#fff
+    style flatlaf fill:#5BA3D0,stroke:#2E5C8A,color:#fff
+    style java fill:#68D989,stroke:#2D7A4A,color:#fff
+    style lombok fill:#68D989,stroke:#2D7A4A,color:#fff
+    style beanshell fill:#68D989,stroke:#2D7A4A,color:#fff
+    style jdbc fill:#FDB44B,stroke:#B8690F,color:#fff
+    style mysql fill:#FDB44B,stroke:#B8690F,color:#fff
+    style derby fill:#FDB44B,stroke:#B8690F,color:#fff
+    style sqlite fill:#FDB44B,stroke:#B8690F,color:#fff
+    style postgres fill:#FDB44B,stroke:#B8690F,color:#fff
+    style jasper fill:#B76AC2,stroke:#5B2C6F,color:#fff
+    style jfreechart fill:#B76AC2,stroke:#5B2C6F,color:#fff
+    style poi fill:#B76AC2,stroke:#5B2C6F,color:#fff
+    style itext fill:#B76AC2,stroke:#5B2C6F,color:#fff
+    style rxtx fill:#FF8E8E,stroke:#A53D3D,color:#fff
+    style usb4j fill:#FF8E8E,stroke:#A53D3D,color:#fff
+    style zxing fill:#FF8E8E,stroke:#A53D3D,color:#fff
+    style jpos fill:#FF8E8E,stroke:#A53D3D,color:#fff
+    style logback fill:#F5B041,stroke:#8B6914,color:#fff
+    style gson fill:#F5B041,stroke:#8B6914,color:#fff
+    style xstream fill:#F5B041,stroke:#8B6914,color:#fff
+    style velocity fill:#F5B041,stroke:#8B6914,color:#fff
+```
+
+---
+
+## Key Architectural Patterns
+
+```mermaid
+graph TB
+    subgraph patterns["DESIGN PATTERNS"]
+        dao_pat["📋 DAO Pattern<br/>Data Abstraction"]
+        service_pat["🔧 Service Pattern<br/>Business Logic"]
+        singleton_pat["🎯 Singleton Pattern<br/>Resource Management"]
+        factory_pat["🏭 Factory Pattern<br/>Object Creation"]
+        plugin_pat["🔌 Plugin Pattern<br/>Extensibility"]
+    end
+
+    subgraph layers["ARCHITECTURAL LAYERS"]
+        presentation["📱 Presentation<br/>UI Components"]
+        business["💼 Business Logic<br/>Services"]
+        data["💾 Data Access<br/>DAOs & Queries"]
+        external["🔌 External Integration<br/>Devices & Files"]
+    end
+
+    subgraph principles["DESIGN PRINCIPLES"]
+        sep_concern["Separation of Concerns<br/>Distinct responsibilities"]
+        loose_coupling["Loose Coupling<br/>Independent modules"]
+        high_cohesion["High Cohesion<br/>Related functionality"]
+        abstraction["Abstraction<br/>Hide complexity"]
+    end
+
+    presentation -->|calls| business
+    business -->|uses| data
+    business -->|uses| external
+
+    dao_pat -->|implements| data
+    service_pat -->|implements| business
+    singleton_pat -->|ensures| resource_management["Resource<br/>Management"]
+    factory_pat -->|creates| objects["Objects"]
+    plugin_pat -->|enables| extensions["Extensions"]
+
+    style patterns fill:#4A90E2,stroke:#2E5C8A,color:#fff
+    style layers fill:#50C878,stroke:#2D7A4A,color:#fff
+    style principles fill:#9B59B6,stroke:#5B2C6F,color:#fff
+    style dao_pat fill:#5BA3D0,stroke:#2E5C8A,color:#fff
+    style service_pat fill:#5BA3D0,stroke:#2E5C8A,color:#fff
+    style singleton_pat fill:#5BA3D0,stroke:#2E5C8A,color:#fff
+    style factory_pat fill:#5BA3D0,stroke:#2E5C8A,color:#fff
+    style plugin_pat fill:#5BA3D0,stroke:#2E5C8A,color:#fff
+    style presentation fill:#68D989,stroke:#2D7A4A,color:#fff
+    style business fill:#68D989,stroke:#2D7A4A,color:#fff
+    style data fill:#68D989,stroke:#2D7A4A,color:#fff
+    style external fill:#68D989,stroke:#2D7A4A,color:#fff
+    style sep_concern fill:#B76AC2,stroke:#5B2C6F,color:#fff
+    style loose_coupling fill:#B76AC2,stroke:#5B2C6F,color:#fff
+    style high_cohesion fill:#B76AC2,stroke:#5B2C6F,color:#fff
+    style abstraction fill:#B76AC2,stroke:#5B2C6F,color:#fff
+    style resource_management fill:#FFB84D,stroke:#8B6914,color:#fff
+    style objects fill:#FFB84D,stroke:#8B6914,color:#fff
+    style extensions fill:#FFB84D,stroke:#8B6914,color:#fff
+```
+
+---
+
+## Core Features Architecture
+
+```mermaid
+graph TB
+    system["🏪 Unicenta oPOS<br/>Enterprise POS System"]
+
+    system -->|Sales Management| sales_feat["Sales Processing<br/>Multiple modes<br/>Ticket management<br/>Payment handling"]
+
+    system -->|Inventory Management| inventory_feat["Product Management<br/>Stock tracking<br/>Category organization<br/>Quantity monitoring"]
+
+    system -->|Customer Management| customer_feat["Customer Database<br/>Transaction history<br/>Loyalty programs<br/>Communication"]
+
+    system -->|Supplier Management| supplier_feat["Supplier Directory<br/>Purchase orders<br/>Product sourcing<br/>Vendor info"]
+
+    system -->|Employee Management| employee_feat["User Accounts<br/>Access Control<br/>Role Assignment<br/>Activity Logging"]
+
+    system -->|Reporting & Analytics| reporting_feat["Sales Reports<br/>Inventory Reports<br/>Financial Reports<br/>Charts & Graphs"]
+
+    system -->|Device Integration| device_feat["Thermal Printers<br/>Barcode Scanners<br/>Weight Scales<br/>Card Readers"]
+
+    system -->|Multi-platform| platform_feat["Windows Support<br/>Linux Support<br/>macOS Support<br/>Cross-platform UI"]
+
+    style system fill:#4A90E2,stroke:#2E5C8A,color:#fff,stroke-width:3px
+    style sales_feat fill:#50C878,stroke:#2D7A4A,color:#fff
+    style inventory_feat fill:#50C878,stroke:#2D7A4A,color:#fff
+    style customer_feat fill:#50C878,stroke:#2D7A4A,color:#fff
+    style supplier_feat fill:#50C878,stroke:#2D7A4A,color:#fff
+    style employee_feat fill:#9B59B6,stroke:#5B2C6F,color:#fff
+    style reporting_feat fill:#9B59B6,stroke:#5B2C6F,color:#fff
+    style device_feat fill:#FF6B6B,stroke:#A53D3D,color:#fff
+    style platform_feat fill:#FFB84D,stroke:#8B6914,color:#fff
+```
+
+---
+
+## Deployment Architecture
+
+```mermaid
+graph TB
+    subgraph client["CLIENT TIER"]
+        desktop["💻 Desktop Machine<br/>Windows • Linux • macOS<br/>Java Runtime (JRE 8+)"]
+    end
+
+    subgraph app_tier["APPLICATION TIER"]
+        jar["📦 unicentaopos.jar<br/>Version 5.4.0<br/>Java Swing/JavaFX"]
+    end
+
+    subgraph data_tier["DATA TIER"]
+        db_choice["Database Engine<br/>MySQL 5.x<br/>Derby<br/>SQLite<br/>PostgreSQL"]
+        db_instance["Database Instance<br/>Schema: unicentaopos<br/>Tables & Indexes"]
+    end
+
+    subgraph files["FILE STORAGE"]
+        reports_dir["📁 Reports Directory<br/>Generated PDFs<br/>Excel Files"]
+        config_dir["📁 Config Directory<br/>Application Settings<br/>User Preferences"]
+        templates["📁 Templates<br/>Report Templates<br/>Print Layouts"]
+        locales["📁 Localization<br/>Language Files<br/>i18n Resources"]
+    end
+
+    desktop -->|runs| jar
+    jar -->|connects to| db_choice
+    db_choice -->|manages| db_instance
+    jar -->|reads/writes| reports_dir
+    jar -->|reads/writes| config_dir
+    jar -->|reads| templates
+    jar -->|reads| locales
+
+    style client fill:#E8F4F8,stroke:#2E5C8A,stroke-width:2px
+    style app_tier fill:#4A90E2,stroke:#2E5C8A,color:#fff,stroke-width:2px
+    style data_tier fill:#FF9F43,stroke:#B8690F,color:#fff,stroke-width:2px
+    style files fill:#9B59B6,stroke:#5B2C6F,color:#fff,stroke-width:2px
+    style desktop fill:#5BA3D0,stroke:#2E5C8A,color:#fff
+    style jar fill:#5BA3D0,stroke:#2E5C8A,color:#fff
+    style db_choice fill:#FDB44B,stroke:#B8690F,color:#fff
+    style db_instance fill:#FDB44B,stroke:#B8690F,color:#fff
+    style reports_dir fill:#B76AC2,stroke:#5B2C6F,color:#fff
+    style config_dir fill:#B76AC2,stroke:#5B2C6F,color:#fff
+    style templates fill:#B76AC2,stroke:#5B2C6F,color:#fff
+    style locales fill:#B76AC2,stroke:#5B2C6F,color:#fff
+```
+
+---
+
+## Quick Start
+
+### Prerequisites
+
+- Java 8+ (JRE)
+- MySQL 5.x (or Derby/SQLite/PostgreSQL)
+- Create database schema: `unicentaopos`
+
+### Build
+
+```bash
+mvn clean package
+```
+
+### Run
+
+```bash
+java -jar ./target/unicentaopos.jar
+```
+
+### Platform Support
+
+- ✅ Windows
+- ✅ Linux
+- ✅ macOS
+
+---
+
+## Summary
+
+**Unicenta oPOS** is a layered, modular Java desktop application with clear separation between:
+
+1. **Presentation Layer** - Swing/JavaFX UI
+2. **Service Layer** - Business logic & orchestration
+3. **Data Access Layer** - DAO pattern for database abstraction
+4. **Peripheral Integration** - Hardware device drivers
+5. **Support Layer** - Utilities, logging, plugins
+
+The architecture supports **multi-database backends**, **multiple POS sales modes** (simple, restaurant), **comprehensive reporting**, and **extensive peripheral device integration**, making it a flexible, enterprise-grade point-of-sale system.

pom.xml

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <groupId>com.unicenta</groupId>
   <artifactId>unicentaopos</artifactId>
-  <version>5.4.0</version>
+  <version>5.5.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -115,6 +116,7 @@
       <artifactId>poi</artifactId>
       <version>3.17</version>
     </dependency>
+
     <dependency>
       <groupId>org.apache.poi</groupId>
       <artifactId>poi-ooxml</artifactId>
@@ -179,6 +181,7 @@
           <artifactId>slf4j-api</artifactId>
         </exclusion>
       </exclusions>
+
     </dependency>
     <dependency>
       <groupId>org.swinglabs.swingx</groupId>
@@ -252,11 +255,11 @@
       <artifactId>derbytools</artifactId>
       <version>${derby.version}</version>
     </dependency>
-    <!--    <dependency>-->
+<!--    <dependency>-->
-    <!--      <groupId>org.apache.derby</groupId>-->
+<!--      <groupId>org.apache.derby</groupId>-->
-    <!--      <artifactId>derbyshared</artifactId>-->
+<!--      <artifactId>derbyshared</artifactId>-->
-    <!--      <version>${derby.version}</version>-->
+<!--      <version>${derby.version}</version>-->
-    <!--    </dependency>-->
+<!--    </dependency>-->
     <dependency>
       <groupId>xml-apis</groupId>
       <artifactId>xml-apis</artifactId>
@@ -290,6 +293,7 @@
       <artifactId>DynamicJasper-core-fonts</artifactId>
       <version>2.0</version>
     </dependency>
+
     <dependency>
       <groupId>org.eclipse.jdt.core.compiler</groupId>
       <artifactId>ecj</artifactId>
@@ -357,7 +361,7 @@
     <dependency>
       <groupId>com.unicenta</groupId>
       <artifactId>unicenta-plugins</artifactId>
-      <version>1.3.2-SNAPSHOT</version>
+      <version>1.4.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.gluonhq</groupId>
@@ -446,6 +450,7 @@
       <version>4.2.0</version>
       <scope>test</scope>
     </dependency>
+
   </dependencies>
   <build>
     <plugins>

src/main/java/com/unicenta/data/loader/StaticSentence.java

@@ -34,191 +34,192 @@ import java.util.regex.Pattern;
 @Slf4j
 public class StaticSentence extends JDBCSentence {
 
+  private ISQLBuilderStatic iSQLBuilder;
 
-    private ISQLBuilderStatic iSQLBuilder;
+  /**
+   *
+   */
+  protected SerializerWrite m_SerWrite = null;
 
-    /**
+  /**
-     *
+   *
-     */
+   */
-    protected SerializerWrite m_SerWrite = null;
+  protected SerializerRead m_SerRead = null;
 
-    /**
+  // Estado
-     *
+  private Statement statement;
-     */
-    protected SerializerRead m_SerRead = null;
 
-    // Estado
+  /**
-    private Statement statement;
+   * Creates a new instance of StaticSentence
+   *
+   * @param s
+   * @param sentence
+   * @param serread
+   * @param serwrite
+   */
+  public StaticSentence(Session s, ISQLBuilderStatic sentence, SerializerWrite serwrite, SerializerRead serread) {
+    super(s);
+    iSQLBuilder = sentence;
+    m_SerWrite = serwrite;
+    m_SerRead = serread;
+    statement = null;
+  }
 
-    /**
+  /**
-     * Creates a new instance of StaticSentence
+   * Creates a new instance of StaticSentence
-     *
+   *
-     * @param s
+   * @param s
-     * @param sentence
+   * @param sentence
-     * @param serread
+   */
-     * @param serwrite
+  public StaticSentence(Session s, ISQLBuilderStatic sentence) {
-     */
+    this(s, sentence, null, null);
-    public StaticSentence(Session s, ISQLBuilderStatic sentence, SerializerWrite serwrite, SerializerRead serread) {
+  }
-        super(s);
+
-        iSQLBuilder = sentence;
+  /**
-        m_SerWrite = serwrite;
+   * Creates a new instance of StaticSentence
-        m_SerRead = serread;
+   *
+   * @param s
+   * @param sentence
+   * @param serwrite
+   */
+  public StaticSentence(Session s, ISQLBuilderStatic sentence, SerializerWrite serwrite) {
+    this(s, sentence, serwrite, null);
+  }
+
+  /**
+   * Creates a new instance of StaticSentence
+   *
+   * @param s
+   * @param sentence
+   * @param serread
+   * @param serwrite
+   */
+  public StaticSentence(Session s, String sentence, SerializerWrite serwrite, SerializerRead serread) {
+    this(s, new NormalBuilder(sentence), serwrite, serread);
+  }
+
+  /**
+   * Creates a new instance of StaticSentence
+   *
+   * @param s
+   * @param sentence
+   * @param serwrite
+   */
+  public StaticSentence(Session s, String sentence, SerializerWrite serwrite) {
+    this(s, new NormalBuilder(sentence), serwrite, null);
+  }
+
+  /**
+   * Creates a new instance of StaticSentence
+   *
+   * @param s
+   * @param sentence
+   */
+  public StaticSentence(Session s, String sentence) {
+    this(s, new NormalBuilder(sentence), null, null);
+  }
+
+  public String fixSqliteDate(String sql) {
+
+    try {
+      if (session.getURL().contains("sqlite") && sql.contains("{ts '")) {
+        StringBuilder sqliteSQL = new StringBuilder();
+
+        Pattern date = Pattern.compile("(?<=ts ).*(?=})");
+        Matcher matchPattern = date.matcher(sql);
+
+        if (matchPattern.find()) {
+          sqliteSQL.append(sql.replaceAll("\\{.*}", matchPattern.group(0)));
+        }
+
+        return sqliteSQL.toString();
+      }
+
+    } catch (Exception e) {
+      log.error("Error fixing sql for sqlite {}", e.getMessage());
+      return sql;
+    }
+    return sql;
+  }
+
+  /**
+   * @param params
+   * @return
+   * @throws BasicException
+   */
+  @Override
+  public DataResultSet openExec(Object params) throws BasicException {
+    // true -> un resultset
+    // false -> un updatecount (si -1 entonces se acabo)
+
+    closeExec();
+
+    try {
+      // follow this to find the create category bug when importing a product csv
+      // https://unicenta.atlassian.net/browse/UOCL-317
+      String sql = iSQLBuilder.getSQL(m_SerWrite, params);
+      String sentence = fixSqliteDate(sql);
+      // String sentence = iSQLBuilder.getSQL(m_SerWrite, params);
+
+      statement = session.getConnection().createStatement();
+
+      log.debug("Executing static SQL: {}", sentence);
+
+      if (statement.execute(sentence)) {
+        return new JDBCDataResultSet(statement.getResultSet(), m_SerRead);
+      } else {
+        int iUC = statement.getUpdateCount();
+        if (iUC < 0) {
+          return null;
+        } else {
+          return new SentenceUpdateResultSet(iUC);
+        }
+      }
+    } catch (SQLException eSQL) {
+      throw new BasicException(eSQL);
+    }
+  }
+
+  /**
+   * @throws BasicException
+   */
+  @Override
+  public void closeExec() throws BasicException {
+
+    if (statement != null) {
+      try {
+        statement.close();
+      } catch (SQLException eSQL) {
+        throw new BasicException(eSQL);
+      } finally {
         statement = null;
+      }
     }
+  }
 
-    /**
+  /**
-     * Creates a new instance of StaticSentence
+   * @return
-     *
+   * @throws BasicException
-     * @param s
+   */
-     * @param sentence
+  @Override
-     */
+  public DataResultSet moreResults() throws BasicException {
-    public StaticSentence(Session s, ISQLBuilderStatic sentence) {
-        this(s, sentence, null, null);
-    }
-
-    /**
-     * Creates a new instance of StaticSentence
-     *
-     * @param s
-     * @param sentence
-     * @param serwrite
-     */
-    public StaticSentence(Session s, ISQLBuilderStatic sentence, SerializerWrite serwrite) {
-        this(s, sentence, serwrite, null);
-    }
-
-    /**
-     * Creates a new instance of StaticSentence
-     *
-     * @param s
-     * @param sentence
-     * @param serread
-     * @param serwrite
-     */
-    public StaticSentence(Session s, String sentence, SerializerWrite serwrite, SerializerRead serread) {
-        this(s, new NormalBuilder(sentence), serwrite, serread);
-    }
-
-    /**
-     * Creates a new instance of StaticSentence
-     *
-     * @param s
-     * @param sentence
-     * @param serwrite
-     */
-    public StaticSentence(Session s, String sentence, SerializerWrite serwrite) {
-        this(s, new NormalBuilder(sentence), serwrite, null);
-    }
-
-    /**
-     * Creates a new instance of StaticSentence
-     *
-     * @param s
-     * @param sentence
-     */
-    public StaticSentence(Session s, String sentence) {
-        this(s, new NormalBuilder(sentence), null, null);
-    }
-
-    public String fixSqliteDate(String sql) {
-
-        try {
-            if (session.getURL().contains("sqlite") && sql.contains("{ts '")) {
-                StringBuilder sqliteSQL = new StringBuilder();
-
-                Pattern date = Pattern.compile("(?<=ts ).*(?=})");
-                Matcher matchPattern = date.matcher(sql);
-
-                if (matchPattern.find()) {
-                    sqliteSQL.append(sql.replaceAll("\\{.*}", matchPattern.group(0)));
-                }
-
-                return sqliteSQL.toString();
-            }
 
+    try {
+      if (statement.getMoreResults()) {
+        // tenemos resultset
+        return new JDBCDataResultSet(statement.getResultSet(), m_SerRead);
+      } else {
+        // tenemos updatecount o si devuelve -1 ya no hay mas
+        int iUC = statement.getUpdateCount();
+        if (iUC < 0) {
+          return null;
+        } else {
+          return new SentenceUpdateResultSet(iUC);
         }
-        catch (Exception e) {
+      }
-            log.error("Error fixing sql for sqlite {}", e.getMessage());
+    } catch (SQLException eSQL) {
-            return sql;
+      throw new BasicException(eSQL);
-        }
-        return sql;
-    }
-    /**
-     * @param params
-     * @return
-     * @throws BasicException
-     */
-    @Override
-    public DataResultSet openExec(Object params) throws BasicException {
-        // true -> un resultset
-        // false -> un updatecount (si -1 entonces se acabo)
-
-        closeExec();
-
-        try {
-
-            String sentence = fixSqliteDate(iSQLBuilder.getSQL(m_SerWrite, params));
-            //String sentence = iSQLBuilder.getSQL(m_SerWrite, params);
-
-            statement = session.getConnection().createStatement();
-
-            log.debug("Executing static SQL: {}", sentence);
-
-            if (statement.execute(sentence)) {
-                return new JDBCDataResultSet(statement.getResultSet(), m_SerRead);
-            } else {
-                int iUC = statement.getUpdateCount();
-                if (iUC < 0) {
-                    return null;
-                } else {
-                    return new SentenceUpdateResultSet(iUC);
-                }
-            }
-        } catch (SQLException eSQL) {
-            throw new BasicException(eSQL);
-        }
-    }
-
-    /**
-     * @throws BasicException
-     */
-    @Override
-    public void closeExec() throws BasicException {
-
-        if (statement != null) {
-            try {
-                statement.close();
-            } catch (SQLException eSQL) {
-                throw new BasicException(eSQL);
-            } finally {
-                statement = null;
-            }
-        }
-    }
-
-    /**
-     * @return
-     * @throws BasicException
-     */
-    @Override
-    public DataResultSet moreResults() throws BasicException {
-
-        try {
-            if (statement.getMoreResults()) {
-                // tenemos resultset
-                return new JDBCDataResultSet(statement.getResultSet(), m_SerRead);
-            } else {
-                // tenemos updatecount o si devuelve -1 ya no hay mas
-                int iUC = statement.getUpdateCount();
-                if (iUC < 0) {
-                    return null;
-                } else {
-                    return new SentenceUpdateResultSet(iUC);
-                }
-            }
-        } catch (SQLException eSQL) {
-            throw new BasicException(eSQL);
-        }
     }
+  }
 
 }

src/main/java/com/unicenta/pos/admin/DataLogicAdmin.java

@@ -50,10 +50,12 @@ public class DataLogicAdmin extends BeanFactoryDataSingle {
         
         m_tpeople = new TableDefinition(s,
             "people"
-            , new String[] {"ID", "NAME", "APPPASSWORD", "ROLE", "VISIBLE", "CARD", "IMAGE"}
+            , new String[] {"ID", "NAME", "APPPASSWORD", "ROLE", "VISIBLE", "CARD", "IMAGE", "TAXID"}
-            , new String[] {"ID", AppLocal.getIntString("label.peoplename"), AppLocal.getIntString("label.Password"), AppLocal.getIntString("label.role"), AppLocal.getIntString("label.peoplevisible"), AppLocal.getIntString("label.card"), AppLocal.getIntString("label.peopleimage")}
+            , new String[] {"ID", AppLocal.getIntString("label.peoplename"), AppLocal.getIntString("label.Password"),
-            , new Datas[] {Datas.STRING, Datas.STRING, Datas.STRING, Datas.STRING, Datas.BOOLEAN, Datas.STRING, Datas.IMAGE}
+                AppLocal.getIntString("label.role"), AppLocal.getIntString("label.peoplevisible"),
-            , new Formats[] {Formats.STRING, Formats.STRING, Formats.STRING, Formats.STRING, Formats.BOOLEAN, Formats.STRING, Formats.NULL}
+                AppLocal.getIntString("label.card"), AppLocal.getIntString("label.peopleimage"), "tax ID"}
+            , new Datas[] {Datas.STRING, Datas.STRING, Datas.STRING, Datas.STRING, Datas.BOOLEAN, Datas.STRING, Datas.IMAGE, Datas.STRING}
+            , new Formats[] {Formats.STRING, Formats.STRING, Formats.STRING, Formats.STRING, Formats.BOOLEAN, Formats.STRING, Formats.NULL, Formats.STRING}
             , new int[] {0}
         );   
                         

src/main/java/com/unicenta/pos/admin/PeopleView.form

@@ -52,16 +52,18 @@
                   <Group type="102" alignment="0" attributes="0">
                       <Group type="103" groupAlignment="0" attributes="0">
                           <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
-                          <Component id="jLabel6" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Component id="passwordLabel" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Component id="taxIdLabel" alignment="0" min="-2" max="-2" attributes="0"/>
                       </Group>
                       <EmptySpace type="unrelated" max="-2" attributes="0"/>
                       <Group type="103" groupAlignment="0" attributes="0">
+                          <Component id="taxIdTextField" min="-2" pref="180" max="-2" attributes="0"/>
                           <Component id="jButton1" min="-2" max="-2" attributes="0"/>
                           <Component id="m_jName" min="-2" pref="180" max="-2" attributes="0"/>
                       </Group>
                   </Group>
               </Group>
-              <EmptySpace max="-2" attributes="0"/>
+              <EmptySpace pref="50" max="32767" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
@@ -75,10 +77,15 @@
               </Group>
               <EmptySpace type="unrelated" max="-2" attributes="0"/>
               <Group type="103" groupAlignment="2" attributes="0">
-                  <Component id="jLabel6" alignment="2" min="-2" max="-2" attributes="0"/>
+                  <Component id="passwordLabel" alignment="2" min="-2" max="-2" attributes="0"/>
                   <Component id="jButton1" alignment="2" min="-2" max="-2" attributes="0"/>
               </Group>
-              <EmptySpace type="unrelated" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="3" attributes="0">
+                  <Component id="taxIdTextField" alignment="3" min="-2" max="-2" attributes="0"/>
+                  <Component id="taxIdLabel" alignment="3" min="-2" max="-2" attributes="0"/>
+              </Group>
+              <EmptySpace max="-2" attributes="0"/>
               <Group type="103" groupAlignment="2" attributes="0">
                   <Component id="jLblCardID" alignment="2" min="-2" max="-2" attributes="0"/>
                   <Component id="m_jcard" alignment="2" min="-2" max="-2" attributes="0"/>
@@ -99,7 +106,7 @@
                   <Component id="m_jImage" min="-2" max="-2" attributes="0"/>
                   <Component id="jLabel4" min="-2" max="-2" attributes="0"/>
               </Group>
-              <EmptySpace max="32767" attributes="0"/>
+              <EmptySpace pref="110" max="32767" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
@@ -246,8 +253,11 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="com.alee.laf.combobox.WebComboBox" name="webCBSecurity">
+    <Component class="javax.swing.JComboBox" name="webCBSecurity">
       <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+          <Font name="Arial" size="14" style="0"/>
+        </Property>
         <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
           <StringArray count="3">
             <StringItem index="0" value="Generate new key"/>
@@ -261,9 +271,6 @@
         <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="pos_messages.properties" key="tooltip.peoplesecurity" replaceFormat="AppLocal.getIntString(&quot;tooltip.peoplesecurity&quot;)"/>
         </Property>
-        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-          <Font name="Arial" size="14" style="0"/>
-        </Property>
         <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
           <Dimension value="[140, 45]"/>
         </Property>
@@ -272,7 +279,7 @@
         <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="webCBSecurityActionPerformed"/>
       </Events>
     </Component>
-    <Component class="javax.swing.JLabel" name="jLabel6">
+    <Component class="javax.swing.JLabel" name="passwordLabel">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -285,5 +292,23 @@
         </Property>
       </Properties>
     </Component>
+    <Component class="javax.swing.JTextField" name="taxIdTextField">
+      <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+          <Font name="Arial" size="14" style="0"/>
+        </Property>
+        <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+          <Dimension value="[0, 30]"/>
+        </Property>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JLabel" name="taxIdLabel">
+      <Properties>
+        <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+          <Font name="Arial" size="14" style="0"/>
+        </Property>
+        <Property name="text" type="java.lang.String" value="Tax ID"/>
+      </Properties>
+    </Component>
   </SubComponents>
 </Form>

src/main/java/com/unicenta/pos/admin/PeopleView.java

@@ -42,426 +42,479 @@ import javax.swing.*;
  */
 public class PeopleView extends JPanel implements EditorRecord {
 
-    private Object m_oId;
+  private Object m_oId;
-    private String m_sPassword;
+  private String m_sPassword;
 
-    private final DirtyManager m_Dirty;
+  private final DirtyManager m_Dirty;
 
-    private final SentenceList m_sentrole;
+  private final SentenceList m_sentrole;
-    private ComboBoxValModel m_RoleModel;  
+  private ComboBoxValModel m_RoleModel;
 
-    private final ComboBoxValModel m_ReasonModel;        
+  private final ComboBoxValModel m_ReasonModel;
 
-    /** Creates new form PeopleEditor
+  /**
-     * @param dlAdmin
+   * Creates new form PeopleEditor
-     * @param dirty */
+   * 
-    public PeopleView(DataLogicAdmin dlAdmin, DirtyManager dirty) {
+   * @param dlAdmin
+   * @param dirty
+   */
+  public PeopleView(DataLogicAdmin dlAdmin, DirtyManager dirty) {
 
-        initComponents();
+    initComponents();
 
-        // El modelo de roles
+    // El modelo de roles
-        m_sentrole = dlAdmin.getRolesList();
+    m_sentrole = dlAdmin.getRolesList();
-        m_RoleModel = new ComboBoxValModel();
+    m_RoleModel = new ComboBoxValModel();
 
-        m_Dirty = dirty;
+    m_Dirty = dirty;
-        m_jName.getDocument().addDocumentListener(dirty);
+    m_jName.getDocument().addDocumentListener(dirty);
-        m_jRole.addActionListener(dirty);
+    m_jRole.addActionListener(dirty);
-        m_jVisible.addActionListener(dirty);
+    m_jVisible.addActionListener(dirty);
-        m_jImage.addPropertyChangeListener("image", dirty);
+    m_jImage.addPropertyChangeListener("image", dirty);
-        m_jcard.getDocument().addDocumentListener(dirty);
+    m_jcard.getDocument().addDocumentListener(dirty);
 
-        m_ReasonModel = new ComboBoxValModel();
+    m_ReasonModel = new ComboBoxValModel();
-        m_ReasonModel.add(AppLocal.getIntString("cboption.generate"));
+    m_ReasonModel.add(AppLocal.getIntString("cboption.generate"));
-        m_ReasonModel.add(AppLocal.getIntString("cboption.clear"));              
+    m_ReasonModel.add(AppLocal.getIntString("cboption.clear"));
-        m_ReasonModel.add(AppLocal.getIntString("cboption.iButton"));                      
+    m_ReasonModel.add(AppLocal.getIntString("cboption.iButton"));
 
-        webCBSecurity.setModel(m_ReasonModel);
+    webCBSecurity.setModel(m_ReasonModel);
 
-        writeValueEOF();
+    taxIdTextField.getDocument().addDocumentListener(dirty);
+    writeValueEOF();
+  }
+
+  /**
+   *
+   */
+  @Override
+  public void writeValueEOF() {
+    m_oId = null;
+    m_jName.setText(null);
+    m_sPassword = null;
+    m_RoleModel.setSelectedKey(null);
+    m_jVisible.setSelected(false);
+    m_jcard.setText(null);
+    m_jImage.setImage(null);
+    taxIdTextField.setText(null);
+    m_jName.setEnabled(false);
+    m_jRole.setEnabled(false);
+    m_jVisible.setEnabled(false);
+    m_jcard.setEnabled(false);
+    m_jImage.setEnabled(false);
+    jButton1.setEnabled(false);
+    webCBSecurity.setEnabled(false);
+    taxIdTextField.setEnabled(false);
+  }
+
+  /**
+   *
+   */
+  @Override
+  public void writeValueInsert() {
+    m_oId = null;
+    m_jName.setText(null);
+    m_sPassword = null;
+    m_RoleModel.setSelectedKey(null);
+    m_jVisible.setSelected(true);
+    m_jcard.setText(null);
+    m_jImage.setImage(null);
+    taxIdTextField.setText(null);
+    m_jName.setEnabled(true);
+    m_jRole.setEnabled(true);
+    m_jVisible.setEnabled(true);
+    m_jcard.setEnabled(true);
+    m_jImage.setEnabled(true);
+    jButton1.setEnabled(true);
+    webCBSecurity.setEnabled(true);
+    taxIdTextField.setEnabled(true);
+  }
+
+  /**
+   *
+   * @param value
+   */
+  @Override
+  public void writeValueDelete(Object value) {
+    Object[] people = (Object[]) value;
+    m_oId = people[0];
+    m_jName.setText(Formats.STRING.formatValue(people[1]));
+    m_sPassword = Formats.STRING.formatValue(people[2]);
+    m_RoleModel.setSelectedKey(people[3]);
+    m_jVisible.setSelected(((Boolean) people[4]).booleanValue());
+    m_jcard.setText(Formats.STRING.formatValue(people[5]));
+    m_jImage.setImage((BufferedImage) people[6]);
+    taxIdTextField.setText(Formats.STRING.formatValue(people[7]));
+
+    m_jName.setEnabled(false);
+    m_jRole.setEnabled(false);
+    m_jVisible.setEnabled(false);
+    m_jcard.setEnabled(false);
+    m_jImage.setEnabled(false);
+    jButton1.setEnabled(false);
+    webCBSecurity.setEnabled(false);
+    taxIdTextField.setEnabled(false);
+  }
+
+  /**
+   *
+   * @param value
+   */
+  @Override
+  public void writeValueEdit(Object value) {
+    Object[] people = (Object[]) value;
+    m_oId = people[0];
+    m_jName.setText(Formats.STRING.formatValue(people[1]));
+    m_sPassword = Formats.STRING.formatValue(people[2]);
+    m_RoleModel.setSelectedKey(people[3]);
+    m_jVisible.setSelected(((Boolean) people[4]).booleanValue());
+    m_jcard.setText(Formats.STRING.formatValue(people[5]));
+    m_jImage.setImage((BufferedImage) people[6]);
+    taxIdTextField.setText(Formats.STRING.formatValue(people[7]));
+    if (m_jcard.getText().length() == 16) {
+      jLblCardID.setText(AppLocal.getIntString("label.ibutton"));
+    } else {
+      jLblCardID.setText(AppLocal.getIntString("label.card"));
     }
+    // System.out.println(m_jcard.getText().length());
 
-    /**
+    m_jName.setEnabled(true);
-     *
+    m_jRole.setEnabled(true);
-     */
+    m_jVisible.setEnabled(true);
-    @Override
+    m_jcard.setEnabled(true);
-    public void writeValueEOF() {
+    m_jImage.setEnabled(true);
-        m_oId = null;
+    jButton1.setEnabled(true);
-        m_jName.setText(null);
+    webCBSecurity.setEnabled(true);
-        m_sPassword = null;
+    taxIdTextField.setEnabled(true);
-        m_RoleModel.setSelectedKey(null);
+  }
-        m_jVisible.setSelected(false);
-        m_jcard.setText(null);
-        m_jImage.setImage(null);
-        m_jName.setEnabled(false);
-        m_jRole.setEnabled(false);
-        m_jVisible.setEnabled(false);
-        m_jcard.setEnabled(false);
-        m_jImage.setEnabled(false);
-        jButton1.setEnabled(false);
-        webCBSecurity.setEnabled(false);
-    }
 
-    /**
+  /**
-     *
+   *
-     */
+   * @return
-    @Override
+   * @throws BasicException
-    public void writeValueInsert() {
+   */
-        m_oId = null;
+  @Override
-        m_jName.setText(null);
+  public Object createValue() throws BasicException {
-        m_sPassword = null;
+    Object[] people = new Object[8];
-        m_RoleModel.setSelectedKey(null);
+    people[0] = m_oId == null ? UUID.randomUUID().toString() : m_oId;
-        m_jVisible.setSelected(true);
+    people[1] = Formats.STRING.parseValue(m_jName.getText());
-        m_jcard.setText(null);
+    people[2] = Formats.STRING.parseValue(m_sPassword);
-        m_jImage.setImage(null);
+    people[3] = m_RoleModel.getSelectedKey();
-        m_jName.setEnabled(true);
+    people[4] = m_jVisible.isSelected();
-        m_jRole.setEnabled(true);
+    people[5] = Formats.STRING.parseValue(m_jcard.getText());
-        m_jVisible.setEnabled(true);
+    people[6] = m_jImage.getImage();
-        m_jcard.setEnabled(true);
+    people[7] = Formats.STRING.parseValue(taxIdTextField.getText());
-        m_jImage.setEnabled(true);
+    return people;
-        jButton1.setEnabled(true);
+  }
-        webCBSecurity.setEnabled(true);        
-    }
 
-    /**
+  /**
-     *
+   *
-     * @param value
+   * @return
-     */
+   */
-    @Override
+  @Override
-    public void writeValueDelete(Object value) {
+  public Component getComponent() {
-        Object[] people = (Object[]) value;
+    return this;
-        m_oId = people[0];
+  }
-        m_jName.setText(Formats.STRING.formatValue(people[1]));
-        m_sPassword = Formats.STRING.formatValue(people[2]);
-        m_RoleModel.setSelectedKey(people[3]);
-        m_jVisible.setSelected(((Boolean) people[4]).booleanValue());
-        m_jcard.setText(Formats.STRING.formatValue(people[5]));
-        m_jImage.setImage((BufferedImage) people[6]);
 
-        m_jName.setEnabled(false);
+  /**
-        m_jRole.setEnabled(false);
+   *
-        m_jVisible.setEnabled(false);
+   * @throws BasicException
-        m_jcard.setEnabled(false);
+   */
-        m_jImage.setEnabled(false);        
+  public void activate() throws BasicException {
-        jButton1.setEnabled(false);
-        webCBSecurity.setEnabled(false);        
-    }
 
-    /**
+    m_RoleModel = new ComboBoxValModel(m_sentrole.list());
-     *
+    m_jRole.setModel(m_RoleModel);
-     * @param value
+  }
-     */
-    @Override
-    public void writeValueEdit(Object value) {
-        Object[] people = (Object[]) value;
-        m_oId = people[0];
-        m_jName.setText(Formats.STRING.formatValue(people[1]));
-        m_sPassword = Formats.STRING.formatValue(people[2]);
-        m_RoleModel.setSelectedKey(people[3]);
-        m_jVisible.setSelected(((Boolean) people[4]).booleanValue());
-        m_jcard.setText(Formats.STRING.formatValue(people[5]));
-        m_jImage.setImage((BufferedImage) people[6]);
 
-        if (m_jcard.getText().length() == 16) {
+  /**
-            jLblCardID.setText(AppLocal.getIntString("label.ibutton"));
+   *
-        } else {
+   */
-            jLblCardID.setText(AppLocal.getIntString("label.card"));            
+  @Override
-        }
+  public void refresh() {
-        System.out.println(m_jcard.getText().length());        
+  }
 
-        m_jName.setEnabled(true);
+  /**
-        m_jRole.setEnabled(true);
+   * This method is called from within the constructor to
-        m_jVisible.setEnabled(true);
+   * initialize the form.
-        m_jcard.setEnabled(true);
+   * WARNING: Do NOT modify this code. The content of this method is
-        m_jImage.setEnabled(true);
+   * always regenerated by the Form Editor.
-        jButton1.setEnabled(true);
+   */
-        webCBSecurity.setEnabled(true);        
+  // <editor-fold defaultstate="collapsed" desc="Generated
-    }
+  // <editor-fold defaultstate="collapsed" desc="Generated
+  // Code">//GEN-BEGIN:initComponents
+  private void initComponents() {
 
-    /**
+    jLabel1 = new javax.swing.JLabel();
-     *
+    m_jName = new javax.swing.JTextField();
-     * @return
+    m_jVisible = new javax.swing.JCheckBox();
-     * @throws BasicException
+    jLabel3 = new javax.swing.JLabel();
-     */
+    jLabel4 = new javax.swing.JLabel();
-    @Override
+    m_jImage = new com.unicenta.data.gui.JImageEditor();
-    public Object createValue() throws BasicException {
+    jButton1 = new javax.swing.JButton();
-        Object[] people = new Object[7];
+    m_jRole = new javax.swing.JComboBox();
-        people[0] = m_oId == null ? UUID.randomUUID().toString() : m_oId;
+    jLabel2 = new javax.swing.JLabel();
-        people[1] = Formats.STRING.parseValue(m_jName.getText());
+    m_jcard = new javax.swing.JTextField();
-        people[2] = Formats.STRING.parseValue(m_sPassword);
+    jLblCardID = new javax.swing.JLabel();
-        people[3] = m_RoleModel.getSelectedKey();
+    webCBSecurity = new javax.swing.JComboBox();
-        people[4] = m_jVisible.isSelected();
+    passwordLabel = new javax.swing.JLabel();
-        people[5] = Formats.STRING.parseValue(m_jcard.getText());
+    taxIdTextField = new javax.swing.JTextField();
-        people[6] = m_jImage.getImage();
+    taxIdLabel = new javax.swing.JLabel();
-        return people;
-    }
 
-    /**
+    setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
-     *
+    setPreferredSize(new java.awt.Dimension(500, 500));
-     * @return
-     */
-    @Override
-    public Component getComponent() {
-        return this;
-    }
 
-    /**
+    jLabel1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-     *
+    jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/info.png"))); // NOI18N
-     * @throws BasicException
+    jLabel1.setText(AppLocal.getIntString("label.peoplenamem")); // NOI18N
-     */
+    jLabel1.setPreferredSize(new java.awt.Dimension(110, 30));
-    public void activate() throws BasicException {
+    jLabel1.addMouseListener(new java.awt.event.MouseAdapter() {
+      public void mouseClicked(java.awt.event.MouseEvent evt) {
+        jLabel1MouseClicked(evt);
+      }
+    });
 
-        m_RoleModel = new ComboBoxValModel(m_sentrole.list());
+    m_jName.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        m_jRole.setModel(m_RoleModel);
+    m_jName.setPreferredSize(new java.awt.Dimension(0, 30));
-    }
 
+    m_jVisible.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
+    m_jVisible.setPreferredSize(new java.awt.Dimension(0, 30));
 
-    /**
+    jLabel3.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-     *
+    jLabel3.setText(AppLocal.getIntString("label.peoplevisible")); // NOI18N
-     */
+    jLabel3.setPreferredSize(new java.awt.Dimension(110, 30));
-    @Override
-    public void refresh() {
-    }
 
-    /** This method is called from within the constructor to
+    jLabel4.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-     * initialize the form.
+    jLabel4.setText(AppLocal.getIntString("label.peopleimage")); // NOI18N
-     * WARNING: Do NOT modify this code. The content of this method is
+    jLabel4.setPreferredSize(new java.awt.Dimension(110, 30));
-     * always regenerated by the Form Editor.
-     */
-    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
-    private void initComponents() {
 
-        jLabel1 = new javax.swing.JLabel();
+    m_jImage.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
-        m_jName = new javax.swing.JTextField();
+    m_jImage.setPreferredSize(new java.awt.Dimension(300, 250));
-        m_jVisible = new javax.swing.JCheckBox();
-        jLabel3 = new javax.swing.JLabel();
-        jLabel4 = new javax.swing.JLabel();
-        m_jImage = new com.unicenta.data.gui.JImageEditor();
-        jButton1 = new javax.swing.JButton();
-        m_jRole = new javax.swing.JComboBox();
-        jLabel2 = new javax.swing.JLabel();
-        m_jcard = new javax.swing.JTextField();
-        jLblCardID = new javax.swing.JLabel();
-        webCBSecurity = new com.alee.laf.combobox.WebComboBox();
-        jLabel6 = new javax.swing.JLabel();
 
-        setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
+    jButton1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        setPreferredSize(new java.awt.Dimension(500, 500));
+    jButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/password.png"))); // NOI18N
+    jButton1.setText(AppLocal.getIntString("button.peoplepassword")); // NOI18N
+    jButton1.setToolTipText("");
+    jButton1.setPreferredSize(new java.awt.Dimension(80, 45));
+    jButton1.addActionListener(new java.awt.event.ActionListener() {
+      public void actionPerformed(java.awt.event.ActionEvent evt) {
+        jButton1ActionPerformed(evt);
+      }
+    });
 
-        jLabel1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    m_jRole.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/info.png"))); // NOI18N
+    m_jRole.setPreferredSize(new java.awt.Dimension(0, 30));
-        jLabel1.setText(AppLocal.getIntString("label.peoplenamem")); // NOI18N
-        jLabel1.setPreferredSize(new java.awt.Dimension(110, 30));
-        jLabel1.addMouseListener(new java.awt.event.MouseAdapter() {
-            public void mouseClicked(java.awt.event.MouseEvent evt) {
-                jLabel1MouseClicked(evt);
-            }
-        });
 
-        m_jName.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    jLabel2.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        m_jName.setPreferredSize(new java.awt.Dimension(0, 30));
+    jLabel2.setText(AppLocal.getIntString("label.rolem")); // NOI18N
+    jLabel2.setPreferredSize(new java.awt.Dimension(110, 30));
 
-        m_jVisible.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
+    m_jcard.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        m_jVisible.setPreferredSize(new java.awt.Dimension(0, 30));
+    m_jcard.setPreferredSize(new java.awt.Dimension(0, 30));
 
-        jLabel3.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    jLblCardID.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        jLabel3.setText(AppLocal.getIntString("label.peoplevisible")); // NOI18N
+    jLblCardID.setText(AppLocal.getIntString("label.card")); // NOI18N
-        jLabel3.setPreferredSize(new java.awt.Dimension(110, 30));
+    jLblCardID.setPreferredSize(new java.awt.Dimension(110, 30));
 
-        jLabel4.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    webCBSecurity.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        jLabel4.setText(AppLocal.getIntString("label.peopleimage")); // NOI18N
+    webCBSecurity.setModel(new javax.swing.DefaultComboBoxModel(
-        jLabel4.setPreferredSize(new java.awt.Dimension(110, 30));
+        new String[] { "Generate new key", "Delete exisitng key", "Use iButton ID" }));
+    webCBSecurity.setSelectedIndex(0);
+    webCBSecurity.setToolTipText(AppLocal.getIntString("tooltip.peoplesecurity")); // NOI18N
+    webCBSecurity.setPreferredSize(new java.awt.Dimension(140, 45));
+    webCBSecurity.addActionListener(new java.awt.event.ActionListener() {
+      public void actionPerformed(java.awt.event.ActionEvent evt) {
+        webCBSecurityActionPerformed(evt);
+      }
+    });
 
-        m_jImage.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
+    passwordLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        m_jImage.setPreferredSize(new java.awt.Dimension(300, 250));
+    passwordLabel.setText(AppLocal.getIntString("label.Password")); // NOI18N
+    passwordLabel.setPreferredSize(new java.awt.Dimension(110, 30));
 
-        jButton1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    taxIdTextField.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        jButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/password.png"))); // NOI18N
+    taxIdTextField.setPreferredSize(new java.awt.Dimension(0, 30));
-        jButton1.setText(AppLocal.getIntString("button.peoplepassword")); // NOI18N
-        jButton1.setToolTipText("");
-        jButton1.setPreferredSize(new java.awt.Dimension(80, 45));
-        jButton1.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                jButton1ActionPerformed(evt);
-            }
-        });
 
-        m_jRole.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    taxIdLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        m_jRole.setPreferredSize(new java.awt.Dimension(0, 30));
+    taxIdLabel.setText("Tax ID");
 
-        jLabel2.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
-        jLabel2.setText(AppLocal.getIntString("label.rolem")); // NOI18N
+    this.setLayout(layout);
-        jLabel2.setPreferredSize(new java.awt.Dimension(110, 30));
+    layout.setHorizontalGroup(
-
+        layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-        m_jcard.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        m_jcard.setPreferredSize(new java.awt.Dimension(0, 30));
-
-        jLblCardID.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        jLblCardID.setText(AppLocal.getIntString("label.card")); // NOI18N
-        jLblCardID.setPreferredSize(new java.awt.Dimension(110, 30));
-
-        webCBSecurity.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Generate new key", "Delete exisitng key", "Use iButton ID" }));
-        webCBSecurity.setSelectedIndex(0);
-        webCBSecurity.setToolTipText(AppLocal.getIntString("tooltip.peoplesecurity")); // NOI18N
-        webCBSecurity.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        webCBSecurity.setPreferredSize(new java.awt.Dimension(140, 45));
-        webCBSecurity.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
-                webCBSecurityActionPerformed(evt);
-            }
-        });
-
-        jLabel6.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        jLabel6.setText(AppLocal.getIntString("label.Password")); // NOI18N
-        jLabel6.setPreferredSize(new java.awt.Dimension(110, 30));
-
-        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
-        this.setLayout(layout);
-        layout.setHorizontalGroup(
-            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(layout.createSequentialGroup()
                 .addContainerGap()
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addGroup(layout.createSequentialGroup()
-                        .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE,
+                            javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                         .addGap(18, 18, 18)
-                        .addComponent(m_jVisible, javax.swing.GroupLayout.PREFERRED_SIZE, 207, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        .addComponent(m_jVisible, javax.swing.GroupLayout.PREFERRED_SIZE, 207,
+                            javax.swing.GroupLayout.PREFERRED_SIZE))
                     .addGroup(layout.createSequentialGroup()
-                        .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE,
+                            javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                        .addComponent(m_jRole, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        .addComponent(m_jRole, javax.swing.GroupLayout.PREFERRED_SIZE, 180,
+                            javax.swing.GroupLayout.PREFERRED_SIZE))
                     .addGroup(layout.createSequentialGroup()
-                        .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE,
+                            javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                        .addComponent(m_jImage, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        .addComponent(m_jImage, javax.swing.GroupLayout.PREFERRED_SIZE,
+                            javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                     .addGroup(layout.createSequentialGroup()
-                        .addComponent(jLblCardID, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addComponent(jLblCardID, javax.swing.GroupLayout.PREFERRED_SIZE,
+                            javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                        .addComponent(m_jcard, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addComponent(m_jcard, javax.swing.GroupLayout.PREFERRED_SIZE, 180,
+                            javax.swing.GroupLayout.PREFERRED_SIZE)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(webCBSecurity, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        .addComponent(webCBSecurity, 0, javax.swing.GroupLayout.DEFAULT_SIZE,
+                            javax.swing.GroupLayout.PREFERRED_SIZE))
                     .addGroup(layout.createSequentialGroup()
                         .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE,
-                            .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                                javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addComponent(passwordLabel, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addComponent(taxIdLabel))
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                         .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                            .addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addComponent(taxIdTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 180,
-                            .addComponent(m_jName, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE))))
+                                javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addContainerGap())
+                            .addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE,
-        );
+                                javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-        layout.setVerticalGroup(
+                            .addComponent(m_jName, javax.swing.GroupLayout.PREFERRED_SIZE, 180,
-            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                                javax.swing.GroupLayout.PREFERRED_SIZE))))
+                .addContainerGap(50, Short.MAX_VALUE)));
+    layout.setVerticalGroup(
+        layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
                 .addGap(18, 18, 18)
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
-                    .addComponent(m_jName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(m_jName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
+                        javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
-                    .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(passwordLabel, javax.swing.GroupLayout.PREFERRED_SIZE,
-                    .addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                    .addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE,
+                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(taxIdTextField, javax.swing.GroupLayout.PREFERRED_SIZE,
+                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(taxIdLabel))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
-                    .addComponent(jLblCardID, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLblCardID, javax.swing.GroupLayout.PREFERRED_SIZE,
-                    .addComponent(m_jcard, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(webCBSecurity, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addComponent(m_jcard, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
+                        javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(webCBSecurity, javax.swing.GroupLayout.PREFERRED_SIZE,
+                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
-                    .addComponent(m_jRole, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(m_jRole, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
+                        javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 25,
-                    .addComponent(m_jVisible, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(m_jVisible, javax.swing.GroupLayout.PREFERRED_SIZE, 25,
+                        javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addGap(15, 15, 15)
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(m_jImage, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(m_jImage, javax.swing.GroupLayout.PREFERRED_SIZE,
-                    .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                    .addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
-        );
+                        javax.swing.GroupLayout.PREFERRED_SIZE))
-    }// </editor-fold>//GEN-END:initComponents
+                .addContainerGap(110, Short.MAX_VALUE)));
+  }// </editor-fold>//GEN-END:initComponents
 
-    private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
+  private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_jButton1ActionPerformed
 
-        String sNewPassword = Hashcypher.changePassword(this);
+    String sNewPassword = Hashcypher.changePassword(this);
-        if (sNewPassword != null) {
+    if (sNewPassword != null) {
-            m_sPassword = sNewPassword;
+      m_sPassword = sNewPassword;
-            m_Dirty.setDirty(true);
+      m_Dirty.setDirty(true);
-        }
+    }
 
-    }//GEN-LAST:event_jButton1ActionPerformed
+  }// GEN-LAST:event_jButton1ActionPerformed
 
-    private void webCBSecurityActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_webCBSecurityActionPerformed
+  private void webCBSecurityActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_webCBSecurityActionPerformed
 
+    if (webCBSecurity.getSelectedIndex() == 0) {
+      if (JOptionPane.showConfirmDialog(this,
+          AppLocal.getIntString("message.cardnew"),
+          AppLocal.getIntString("title.editor"),
+          JOptionPane.YES_NO_OPTION,
+          JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
+        m_jcard.setText("C" + StringUtils.getCardNumber());
+        m_Dirty.setDirty(true);
+      }
+    }
 
-        if(webCBSecurity.getSelectedIndex() == 0){
+    if (webCBSecurity.getSelectedIndex() == 1) {
-            if (JOptionPane.showConfirmDialog(this, 
+      if (JOptionPane.showConfirmDialog(this,
-                AppLocal.getIntString("message.cardnew"), 
+          AppLocal.getIntString("message.cardremove"),
-                AppLocal.getIntString("title.editor"), 
+          AppLocal.getIntString("title.editor"),
-                JOptionPane.YES_NO_OPTION, 
+          JOptionPane.YES_NO_OPTION,
-                JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) 
+          JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
-            {  
+        m_jcard.setText(null);
-                m_jcard.setText("C" + StringUtils.getCardNumber());
+        m_Dirty.setDirty(true);
-                m_Dirty.setDirty(true);
+      }
-            }        
+    }
-        }         
 
-        if(webCBSecurity.getSelectedIndex() == 1){
+    if (webCBSecurity.getSelectedIndex() == 2) {
-            if (JOptionPane.showConfirmDialog(this, 
+      if (JOptionPane.showConfirmDialog(this,
-                AppLocal.getIntString("message.cardremove"), 
+          AppLocal.getIntString("message.ibuttonassign"),
-                AppLocal.getIntString("title.editor"), 
+          AppLocal.getIntString("title.editor"),
-                JOptionPane.YES_NO_OPTION, 
+          JOptionPane.OK_CANCEL_OPTION,
-                JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) 
+          JOptionPane.INFORMATION_MESSAGE) == JOptionPane.OK_OPTION)
-            {  
-                m_jcard.setText(null);
-                m_Dirty.setDirty(true);
-            }
-        }
 
-        if(webCBSecurity.getSelectedIndex() == 2){
+      {
-            if (JOptionPane.showConfirmDialog(this, 
+        m_jcard.setText(uOWWatch.getibuttonid());
-                AppLocal.getIntString("message.ibuttonassign"), 
+        jLblCardID.setText(AppLocal.getIntString("label.ibutton"));
-                AppLocal.getIntString("title.editor"), 
+        m_Dirty.setDirty(true);
-                JOptionPane.OK_CANCEL_OPTION, 
+      }
-                JOptionPane.INFORMATION_MESSAGE) == JOptionPane.OK_OPTION) 
 
-            {  
+    }
-                m_jcard.setText( uOWWatch.getibuttonid() );
-                jLblCardID.setText(AppLocal.getIntString("label.ibutton"));
-                m_Dirty.setDirty(true);
-            }
 
-        }                
+  }// GEN-LAST:event_webCBSecurityActionPerformed
 
-    }//GEN-LAST:event_webCBSecurityActionPerformed
+  private void jLabel1MouseClicked(java.awt.event.MouseEvent evt) {// GEN-FIRST:event_jLabel1MouseClicked
+    if (evt.getClickCount() == 2) {
+      String uuidString = m_oId.toString();
+      StringSelection stringSelection = new StringSelection(uuidString);
+      Clipboard clpbrd = Toolkit.getDefaultToolkit().getSystemClipboard();
+      clpbrd.setContents(stringSelection, null);
 
-    private void jLabel1MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jLabel1MouseClicked
+      JOptionPane.showMessageDialog(null,
-        if (evt.getClickCount() == 2) {
+          AppLocal.getIntString("message.uuidcopy"));
-            String uuidString = m_oId.toString();
+    }
-            StringSelection stringSelection = new StringSelection(uuidString);
+  }// GEN-LAST:event_jLabel1MouseClicked
-            Clipboard clpbrd = Toolkit.getDefaultToolkit().getSystemClipboard();
-            clpbrd.setContents(stringSelection, null);
 
-            JOptionPane.showMessageDialog(null, 
+  // Variables declaration - do not modify//GEN-BEGIN:variables
-                AppLocal.getIntString("message.uuidcopy"));
+  private javax.swing.JButton jButton1;
-        }
+  private javax.swing.JLabel jLabel1;
-    }//GEN-LAST:event_jLabel1MouseClicked
+  private javax.swing.JLabel jLabel2;
-    
+  private javax.swing.JLabel jLabel3;
-    
+  private javax.swing.JLabel jLabel4;
-    // Variables declaration - do not modify//GEN-BEGIN:variables
+  private javax.swing.JLabel jLblCardID;
-    private javax.swing.JButton jButton1;
+  private com.unicenta.data.gui.JImageEditor m_jImage;
-    private javax.swing.JLabel jLabel1;
+  private javax.swing.JTextField m_jName;
-    private javax.swing.JLabel jLabel2;
+  private javax.swing.JComboBox m_jRole;
-    private javax.swing.JLabel jLabel3;
+  private javax.swing.JCheckBox m_jVisible;
-    private javax.swing.JLabel jLabel4;
+  private javax.swing.JTextField m_jcard;
-    private javax.swing.JLabel jLabel6;
+  private javax.swing.JLabel passwordLabel;
-    private javax.swing.JLabel jLblCardID;
+  private javax.swing.JLabel taxIdLabel;
-    private com.unicenta.data.gui.JImageEditor m_jImage;
+  private javax.swing.JTextField taxIdTextField;
-    private javax.swing.JTextField m_jName;
+  private javax.swing.JComboBox webCBSecurity;
-    private javax.swing.JComboBox m_jRole;
+  // End of variables declaration//GEN-END:variables
-    private javax.swing.JCheckBox m_jVisible;
-    private javax.swing.JTextField m_jcard;
-    private com.alee.laf.combobox.WebComboBox webCBSecurity;
-    // End of variables declaration//GEN-END:variables
 
 }

src/main/java/com/unicenta/pos/config/JPanelConfigPayment.java

@@ -53,7 +53,6 @@ public class JPanelConfigPayment extends javax.swing.JPanel implements PanelConf
         initPayments("external", new ConfigPaymentPanelEmpty());
         initPayments("PaymentSense",  new ConfigPaymentPanelEmpty());
         initPayments("Teya",  new ConfigPaymentPanelEmpty());
-        initPayments("MediaPayments",  new ConfigPaymentPanelEmpty());
 
         // Lector de tarjetas.
         jcboCardReader.addItem("Not defined");
@@ -92,17 +91,9 @@ public class JPanelConfigPayment extends javax.swing.JPanel implements PanelConf
 
         jcboCardReader.setSelectedItem(config.getProperty("payment.magcardreader"));
         jcboPaymentGateway.setSelectedItem(config.getProperty("payment.gateway"));
-
+        urlValue.setText(config.getProperty("payment.URL"));
-        String gateway = comboValue(jcboPaymentGateway.getSelectedItem());
+        deviceIdValue.setText(config.getProperty("payment.device-id"));
-        if ("MediaPayments".equals(gateway)) {
+        securityKeyValue.setText(config.getProperty("payment.security-key"));
-            urlValue.setText(config.getProperty("media-payments.pdq"));
-            deviceIdValue.setText(config.getProperty("media-payments.api-key"));
-            securityKeyValue.setText(config.getProperty("media-payments.secret"));
-        } else {
-            urlValue.setText(config.getProperty("payment.URL"));
-            deviceIdValue.setText(config.getProperty("payment.device-id"));
-            securityKeyValue.setText(config.getProperty("payment.security-key"));
-        }
         paymentConfiguration.loadProperties(config);
         dirty.setDirty(false);
     }
@@ -116,17 +107,9 @@ public class JPanelConfigPayment extends javax.swing.JPanel implements PanelConf
 
         config.setProperty("payment.magcardreader", comboValue(jcboCardReader.getSelectedItem()));
         config.setProperty("payment.gateway", comboValue(jcboPaymentGateway.getSelectedItem()));
-
+        config.setProperty("payment.URL", urlValue.getText());
-        String gateway = comboValue(jcboPaymentGateway.getSelectedItem());
+        config.setProperty("payment.device-id", deviceIdValue.getText());
-        if ("MediaPayments".equals(gateway)) {
+        config.setProperty("payment.security-key", securityKeyValue.getText());
-            config.setProperty("media-payments.pdq", urlValue.getText());
-            config.setProperty("media-payments.api-key", deviceIdValue.getText());
-            config.setProperty("media-payments.secret", securityKeyValue.getText());
-        } else {
-            config.setProperty("payment.URL", urlValue.getText());
-            config.setProperty("payment.device-id", deviceIdValue.getText());
-            config.setProperty("payment.security-key", securityKeyValue.getText());
-        }
         paymentConfiguration.saveProperties(config);
         dirty.setDirty(false);
     }
@@ -292,9 +275,6 @@ public class JPanelConfigPayment extends javax.swing.JPanel implements PanelConf
         paymentConfiguration = paymentsName.get(comboValue(jcboPaymentGateway.getSelectedItem()));
 
         if (comboValue(jcboPaymentGateway.getSelectedItem()).equals("PaymentSense")) {
-            urlLabel.setText("URL");
-            deviceIdLabel.setText("Device ID");
-            securityKeyLabel.setText("Security Key");
             emvConfigPanel.setVisible(Boolean.TRUE);
             jcboCardReader.setSelectedItem("EMV");
             jcboCardReader.setEnabled(Boolean.FALSE);
@@ -305,18 +285,7 @@ public class JPanelConfigPayment extends javax.swing.JPanel implements PanelConf
             jcboCardReader.setSelectedItem("EMV");
             jcboCardReader.setEnabled(Boolean.FALSE);
         }
-        else if (comboValue(jcboPaymentGateway.getSelectedItem()).equals("MediaPayments")) {
-            urlLabel.setText("Terminal ID");
-            deviceIdLabel.setText("API Key");
-            securityKeyLabel.setText("Security Key");
-            emvConfigPanel.setVisible(Boolean.TRUE);
-            jcboCardReader.setSelectedItem("EMV");
-            jcboCardReader.setEnabled(Boolean.FALSE);
-        }
         else {
-            urlLabel.setText("URL");
-            deviceIdLabel.setText("Device ID");
-            securityKeyLabel.setText("Security Key");
             emvConfigPanel.setVisible(Boolean.FALSE);
             jcboCardReader.setEnabled(Boolean.TRUE);
         }

src/main/java/com/unicenta/pos/forms/AppUser.java

@@ -55,6 +55,7 @@ public class AppUser {
   private final Icon m_Icon;
 
   private Set<String> m_apermissions;
+  private String taxId;
 
   static {
     initOldClasses();
@@ -70,7 +71,7 @@ public class AppUser {
    * @param icon
    * @param role
    */
-  public AppUser(String id, String name, String password, String card, String role, Icon icon) {
+  public AppUser(String id, String name, String password, String card, String role, Icon icon, String taxId) {
     m_sId = id;
     m_sName = name;
     m_sPassword = password;
@@ -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
+        ? classname
-            : newclass;
+        : 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 {
     }
   }
 
-
 }

src/main/java/com/unicenta/pos/forms/DataLogicSystem.java

@@ -121,7 +121,8 @@ public class DataLogicSystem extends BeanFactoryDataSingle {
                 dr.getString(3),
                 dr.getString(4),
                 dr.getString(5),
-                new ImageIcon(tnb.getThumbNail(ImageUtils.readImage(dr.getBytes(6)))));
+                new ImageIcon(tnb.getThumbNail(ImageUtils.readImage(dr.getBytes(6)))),
+          dr.getString(7));
    
 // START OF PRODUCT ************************************************************      
         productIdRead =(DataRead dr) -> (                       
@@ -208,12 +209,12 @@ public class DataLogicSystem extends BeanFactoryDataSingle {
  // END OF CUSTOMER ******************************************************************      
        
         m_peoplevisible = new StaticSentence(s
-            , "SELECT ID, NAME, APPPASSWORD, CARD, ROLE, IMAGE FROM people WHERE VISIBLE = " + s.DB.TRUE() + " ORDER BY NAME"
+            , "SELECT ID, NAME, APPPASSWORD, CARD, ROLE, IMAGE, TAXID FROM people WHERE VISIBLE = " + s.DB.TRUE() + " ORDER BY NAME"
             , null
             , peopleread);
 
         m_peoplebycard = new PreparedSentence(s
-            , "SELECT ID, NAME, APPPASSWORD, CARD, ROLE, IMAGE FROM people WHERE CARD = ? AND VISIBLE = " + s.DB.TRUE()
+            , "SELECT ID, NAME, APPPASSWORD, CARD, ROLE, IMAGE, TAXID FROM people WHERE CARD = ? AND VISIBLE = " + s.DB.TRUE()
             , SerializerWriteString.INSTANCE
             , peopleread);
          

src/main/java/com/unicenta/pos/payment/JPaymentVoucher.form

@@ -40,6 +40,10 @@
                           <EmptySpace type="unrelated" max="-2" attributes="0"/>
                           <Component id="m_jVoucher" min="-2" max="-2" attributes="0"/>
                       </Group>
+                      <Group type="102" alignment="0" attributes="0">
+                          <EmptySpace max="-2" attributes="0"/>
+                          <Component id="jButton1" min="-2" max="-2" attributes="0"/>
+                      </Group>
                   </Group>
                   <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
               </Group>
@@ -83,7 +87,9 @@
                       <Component id="webLblCustomer" alignment="3" min="-2" max="-2" attributes="0"/>
                       <Component id="webLblcustomerName" alignment="3" min="-2" max="-2" attributes="0"/>
                   </Group>
-                  <EmptySpace min="-2" pref="241" max="-2" attributes="0"/>
+                  <EmptySpace min="-2" pref="33" max="-2" attributes="0"/>
+                  <Component id="jButton1" min="-2" max="-2" attributes="0"/>
+                  <EmptySpace max="-2" attributes="0"/>
               </Group>
           </Group>
         </DimensionLayout>
@@ -160,43 +166,43 @@
             </Property>
           </Properties>
         </Component>
-        <Component class="javax.swing.JLabel" name="webLblCustomer">
+        <Component class="com.alee.laf.label.WebLabel" name="webLblCustomer">
           <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="pos_messages.properties" key="label.customer" replaceFormat="AppLocal.getIntString(&quot;label.customer&quot;)"/>
+            </Property>
+            <Property name="toolTipText" type="java.lang.String" value=""/>
             <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
               <Font name="Arial" size="18" style="1"/>
             </Property>
-            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="pos_messages.properties" key="label.customer" replaceFormat="AppLocal.getIntString(&quot;label.customer&quot;)"/>
-            </Property>
-            <Property name="toolTipText" type="java.lang.String" value=""/>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[100, 30]"/>
             </Property>
           </Properties>
         </Component>
-        <Component class="javax.swing.JLabel" name="webLblcustomerName">
+        <Component class="com.alee.laf.label.WebLabel" name="webLblcustomerName">
           <Properties>
-            <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-              <Font name="Arial" size="14" style="0"/>
-            </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
               <ResourceString bundle="pos_messages.properties" key="label.customer" replaceFormat="AppLocal.getIntString(&quot;label.customer&quot;)"/>
             </Property>
             <Property name="toolTipText" type="java.lang.String" value=""/>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+              <Font name="Arial" size="14" style="0"/>
+            </Property>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[100, 30]"/>
             </Property>
           </Properties>
         </Component>
-        <Component class="javax.swing.JLabel" name="voucherStatus">
+        <Component class="com.alee.laf.label.WebLabel" name="voucherStatus">
           <Properties>
-            <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
-              <Font name="Arial" size="14" style="0"/>
-            </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
               <ResourceString bundle="pos_messages.properties" key="label.voucherStatus" replaceFormat="AppLocal.getIntString(&quot;label.voucherStatus&quot;)"/>
             </Property>
             <Property name="toolTipText" type="java.lang.String" value=""/>
+            <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
+              <Font name="Arial" size="14" style="0"/>
+            </Property>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[100, 30]"/>
             </Property>
@@ -218,6 +224,14 @@
             </Property>
           </Properties>
         </Component>
+        <Component class="javax.swing.JButton" name="jButton1">
+          <Properties>
+            <Property name="text" type="java.lang.String" value="jButton1"/>
+          </Properties>
+          <Events>
+            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton1ActionPerformed"/>
+          </Events>
+        </Component>
       </SubComponents>
     </Container>
     <Container class="javax.swing.JPanel" name="jPanel11">

src/main/java/com/unicenta/pos/payment/JPaymentVoucher.java

@@ -183,141 +183,154 @@ public class JPaymentVoucher extends javax.swing.JPanel implements JPaymentInter
    * WARNING: Do NOT modify this code. The content of this method is
    * always regenerated by the Form Editor.
    */
-    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+  // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
-    private void initComponents() {
+  private void initComponents() {
 
-        jPanel4 = new javax.swing.JPanel();
+    jPanel4 = new javax.swing.JPanel();
-        jLabel5 = new javax.swing.JLabel();
+    jLabel5 = new javax.swing.JLabel();
-        m_jVoucher = new javax.swing.JComboBox();
+    m_jVoucher = new javax.swing.JComboBox();
-        jLabel1 = new javax.swing.JLabel();
+    jLabel1 = new javax.swing.JLabel();
-        m_jMoneyEuros = new javax.swing.JLabel();
+    m_jMoneyEuros = new javax.swing.JLabel();
-        webLblCustomer = new javax.swing.JLabel();
+    webLblCustomer = new com.alee.laf.label.WebLabel();
-        webLblcustomerName = new javax.swing.JLabel();
+    webLblcustomerName = new com.alee.laf.label.WebLabel();
-        voucherStatus = new javax.swing.JLabel();
+    voucherStatus = new com.alee.laf.label.WebLabel();
-        jLabel6 = new javax.swing.JLabel();
+    jLabel6 = new javax.swing.JLabel();
-        jPanel11 = new javax.swing.JPanel();
+    jButton1 = new javax.swing.JButton();
-        jPanel12 = new javax.swing.JPanel();
+    jPanel11 = new javax.swing.JPanel();
-        m_jKeys = new com.unicenta.editor.JEditorKeys();
+    jPanel12 = new javax.swing.JPanel();
-        jPanel1 = new javax.swing.JPanel();
+    m_jKeys = new com.unicenta.editor.JEditorKeys();
-        m_jTendered = new com.unicenta.editor.JEditorCurrencyPositive();
+    jPanel1 = new javax.swing.JPanel();
+    m_jTendered = new com.unicenta.editor.JEditorCurrencyPositive();
 
-        setLayout(new java.awt.BorderLayout());
+    setLayout(new java.awt.BorderLayout());
 
-        jLabel5.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
+    jLabel5.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
-        jLabel5.setLabelFor(m_jVoucher);
+    jLabel5.setLabelFor(m_jVoucher);
-        jLabel5.setText(AppLocal.getIntString("label.voucher")); // NOI18N
+    jLabel5.setText(AppLocal.getIntString("label.voucher")); // NOI18N
-        jLabel5.setPreferredSize(new java.awt.Dimension(100, 30));
+    jLabel5.setPreferredSize(new java.awt.Dimension(100, 30));
 
-        m_jVoucher.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    m_jVoucher.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        m_jVoucher.setPreferredSize(new java.awt.Dimension(180, 30));
+    m_jVoucher.setPreferredSize(new java.awt.Dimension(180, 30));
-        m_jVoucher.addActionListener(new java.awt.event.ActionListener() {
+    m_jVoucher.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
+      public void actionPerformed(java.awt.event.ActionEvent evt) {
-                m_jVoucherActionPerformed(evt);
+        m_jVoucherActionPerformed(evt);
-            }
+      }
-        });
+    });
 
-        jLabel1.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
+    jLabel1.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
-        jLabel1.setText(AppLocal.getIntString("label.voucherValue")); // NOI18N
+    jLabel1.setText(AppLocal.getIntString("label.voucherValue")); // NOI18N
-        jLabel1.setPreferredSize(new java.awt.Dimension(100, 30));
+    jLabel1.setPreferredSize(new java.awt.Dimension(100, 30));
 
-        m_jMoneyEuros.setBackground(new java.awt.Color(204, 255, 51));
+    m_jMoneyEuros.setBackground(new java.awt.Color(204, 255, 51));
-        m_jMoneyEuros.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
+    m_jMoneyEuros.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
-        m_jMoneyEuros.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
+    m_jMoneyEuros.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
-        m_jMoneyEuros.setBorder(javax.swing.BorderFactory.createCompoundBorder(javax.swing.BorderFactory.createLineBorder(javax.swing.UIManager.getDefaults().getColor("Button.darkShadow")), javax.swing.BorderFactory.createEmptyBorder(1, 4, 1, 4)));
+    m_jMoneyEuros.setBorder(javax.swing.BorderFactory.createCompoundBorder(javax.swing.BorderFactory.createLineBorder(javax.swing.UIManager.getDefaults().getColor("Button.darkShadow")), javax.swing.BorderFactory.createEmptyBorder(1, 4, 1, 4)));
-        m_jMoneyEuros.setOpaque(true);
+    m_jMoneyEuros.setOpaque(true);
-        m_jMoneyEuros.setPreferredSize(new java.awt.Dimension(180, 30));
+    m_jMoneyEuros.setPreferredSize(new java.awt.Dimension(180, 30));
 
-        webLblCustomer.setText(AppLocal.getIntString("label.customer")); // NOI18N
+    webLblCustomer.setText(AppLocal.getIntString("label.customer")); // NOI18N
-        webLblCustomer.setToolTipText("");
+    webLblCustomer.setToolTipText("");
-        webLblCustomer.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
+    webLblCustomer.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
-        webLblCustomer.setPreferredSize(new java.awt.Dimension(100, 30));
+    webLblCustomer.setPreferredSize(new java.awt.Dimension(100, 30));
 
-        webLblcustomerName.setText(AppLocal.getIntString("label.customer")); // NOI18N
+    webLblcustomerName.setText(AppLocal.getIntString("label.customer")); // NOI18N
-        webLblcustomerName.setToolTipText("");
+    webLblcustomerName.setToolTipText("");
-        webLblcustomerName.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    webLblcustomerName.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        webLblcustomerName.setPreferredSize(new java.awt.Dimension(100, 30));
+    webLblcustomerName.setPreferredSize(new java.awt.Dimension(100, 30));
 
-        voucherStatus.setText(AppLocal.getIntString("label.voucherStatus")); // NOI18N
+    voucherStatus.setText(AppLocal.getIntString("label.voucherStatus")); // NOI18N
-        voucherStatus.setToolTipText("");
+    voucherStatus.setToolTipText("");
-        voucherStatus.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    voucherStatus.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-        voucherStatus.setPreferredSize(new java.awt.Dimension(100, 30));
+    voucherStatus.setPreferredSize(new java.awt.Dimension(100, 30));
 
-        jLabel6.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
+    jLabel6.setFont(new java.awt.Font("Arial", 1, 18)); // NOI18N
-        jLabel6.setLabelFor(m_jVoucher);
+    jLabel6.setLabelFor(m_jVoucher);
-        jLabel6.setText(AppLocal.getIntString("label.voucherStatus")); // NOI18N
+    jLabel6.setText(AppLocal.getIntString("label.voucherStatus")); // NOI18N
-        jLabel6.setPreferredSize(new java.awt.Dimension(100, 30));
+    jLabel6.setPreferredSize(new java.awt.Dimension(100, 30));
 
-        javax.swing.GroupLayout jPanel4Layout = new javax.swing.GroupLayout(jPanel4);
+    jButton1.setText("jButton1");
-        jPanel4.setLayout(jPanel4Layout);
+    jButton1.addActionListener(new java.awt.event.ActionListener() {
-        jPanel4Layout.setHorizontalGroup(
+      public void actionPerformed(java.awt.event.ActionEvent evt) {
+        jButton1ActionPerformed(evt);
+      }
+    });
+
+    javax.swing.GroupLayout jPanel4Layout = new javax.swing.GroupLayout(jPanel4);
+    jPanel4.setLayout(jPanel4Layout);
+    jPanel4Layout.setHorizontalGroup(
             jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(jPanel4Layout.createSequentialGroup()
-                .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addGroup(jPanel4Layout.createSequentialGroup()
-                        .addGap(10, 10, 10)
+                            .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                        .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addGroup(jPanel4Layout.createSequentialGroup()
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                                            .addGap(10, 10, 10)
-                        .addComponent(m_jMoneyEuros, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                                            .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                                            .addComponent(m_jMoneyEuros, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                                    .addGroup(jPanel4Layout.createSequentialGroup()
+                                            .addContainerGap()
+                                            .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                                            .addComponent(m_jVoucher, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                                    .addGroup(jPanel4Layout.createSequentialGroup()
+                                            .addContainerGap()
+                                            .addComponent(jButton1)))
+                            .addGap(0, 0, Short.MAX_VALUE))
                     .addGroup(jPanel4Layout.createSequentialGroup()
-                        .addContainerGap()
+                            .addContainerGap()
-                        .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                                    .addGroup(jPanel4Layout.createSequentialGroup()
-                        .addComponent(m_jVoucher, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
+                                            .addComponent(webLblCustomer, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addGap(0, 0, Short.MAX_VALUE))
+                                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-            .addGroup(jPanel4Layout.createSequentialGroup()
+                                            .addComponent(webLblcustomerName, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
-                .addContainerGap()
+                                    .addGroup(jPanel4Layout.createSequentialGroup()
-                .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                                            .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addGroup(jPanel4Layout.createSequentialGroup()
+                                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                        .addComponent(webLblCustomer, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                            .addComponent(voucherStatus, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+    );
-                        .addComponent(webLblcustomerName, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+    jPanel4Layout.setVerticalGroup(
-                    .addGroup(jPanel4Layout.createSequentialGroup()
-                        .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                        .addComponent(voucherStatus, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))
-        );
-        jPanel4Layout.setVerticalGroup(
             jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(jPanel4Layout.createSequentialGroup()
+                    .addGroup(jPanel4Layout.createSequentialGroup()
-                .addContainerGap()
+                            .addContainerGap()
-                .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                            .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(m_jVoucher, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                                    .addComponent(m_jVoucher, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+                            .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
-                    .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(voucherStatus, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                                    .addComponent(voucherStatus, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                            .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(m_jMoneyEuros, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                                    .addComponent(m_jMoneyEuros, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
-                .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                            .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(webLblCustomer, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                                    .addComponent(webLblCustomer, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(webLblcustomerName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                                    .addComponent(webLblcustomerName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                .addGap(241, 241, 241))
+                            .addGap(33, 33, 33)
-        );
+                            .addComponent(jButton1)
+                            .addContainerGap())
+    );
 
-        add(jPanel4, java.awt.BorderLayout.CENTER);
+    add(jPanel4, java.awt.BorderLayout.CENTER);
 
-        jPanel11.setLayout(new java.awt.BorderLayout());
+    jPanel11.setLayout(new java.awt.BorderLayout());
 
-        jPanel12.setLayout(new javax.swing.BoxLayout(jPanel12, javax.swing.BoxLayout.Y_AXIS));
+    jPanel12.setLayout(new javax.swing.BoxLayout(jPanel12, javax.swing.BoxLayout.Y_AXIS));
-        jPanel12.add(m_jKeys);
+    jPanel12.add(m_jKeys);
 
-        jPanel1.setBorder(javax.swing.BorderFactory.createEmptyBorder(5, 5, 5, 5));
+    jPanel1.setBorder(javax.swing.BorderFactory.createEmptyBorder(5, 5, 5, 5));
-        jPanel1.setLayout(new java.awt.BorderLayout());
+    jPanel1.setLayout(new java.awt.BorderLayout());
 
-        m_jTendered.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
+    m_jTendered.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
-        m_jTendered.setPreferredSize(new java.awt.Dimension(130, 30));
+    m_jTendered.setPreferredSize(new java.awt.Dimension(130, 30));
-        jPanel1.add(m_jTendered, java.awt.BorderLayout.CENTER);
+    jPanel1.add(m_jTendered, java.awt.BorderLayout.CENTER);
 
-        jPanel12.add(jPanel1);
+    jPanel12.add(jPanel1);
 
-        jPanel11.add(jPanel12, java.awt.BorderLayout.NORTH);
+    jPanel11.add(jPanel12, java.awt.BorderLayout.NORTH);
 
-        add(jPanel11, java.awt.BorderLayout.EAST);
+    add(jPanel11, java.awt.BorderLayout.EAST);
-    }// </editor-fold>//GEN-END:initComponents
+  }// </editor-fold>//GEN-END:initComponents
 
   private void m_jVoucherActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_jVoucherActionPerformed
 
@@ -352,22 +365,27 @@ public class JPaymentVoucher extends javax.swing.JPanel implements JPaymentInter
     }
   }//GEN-LAST:event_m_jVoucherActionPerformed
 
+  private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
 
-    // Variables declaration - do not modify//GEN-BEGIN:variables
+  }//GEN-LAST:event_jButton1ActionPerformed
-    private javax.swing.JLabel jLabel1;
+
-    private javax.swing.JLabel jLabel5;
+
-    private javax.swing.JLabel jLabel6;
+  // Variables declaration - do not modify//GEN-BEGIN:variables
-    private javax.swing.JPanel jPanel1;
+  private javax.swing.JButton jButton1;
-    private javax.swing.JPanel jPanel11;
+  private javax.swing.JLabel jLabel1;
-    private javax.swing.JPanel jPanel12;
+  private javax.swing.JLabel jLabel5;
-    private javax.swing.JPanel jPanel4;
+  private javax.swing.JLabel jLabel6;
-    private com.unicenta.editor.JEditorKeys m_jKeys;
+  private javax.swing.JPanel jPanel1;
-    private javax.swing.JLabel m_jMoneyEuros;
+  private javax.swing.JPanel jPanel11;
-    private com.unicenta.editor.JEditorCurrencyPositive m_jTendered;
+  private javax.swing.JPanel jPanel12;
-    private javax.swing.JComboBox m_jVoucher;
+  private javax.swing.JPanel jPanel4;
-    private javax.swing.JLabel voucherStatus;
+  private com.unicenta.editor.JEditorKeys m_jKeys;
-    private javax.swing.JLabel webLblCustomer;
+  private javax.swing.JLabel m_jMoneyEuros;
-    private javax.swing.JLabel webLblcustomerName;
+  private com.unicenta.editor.JEditorCurrencyPositive m_jTendered;
-    // End of variables declaration//GEN-END:variables
+  private javax.swing.JComboBox m_jVoucher;
+  private com.alee.laf.label.WebLabel voucherStatus;
+  private com.alee.laf.label.WebLabel webLblCustomer;
+  private com.alee.laf.label.WebLabel webLblcustomerName;
+  // End of variables declaration//GEN-END:variables
 
 }

src/main/java/com/unicenta/pos/payment/PaymentGatewayFac.java

@@ -41,8 +41,6 @@ public class PaymentGatewayFac {
                 return new PaymentGatewayPaymentSense();
             case "Teya":
                 return new PaymentGatewayTeya();
-            case "MediaPayments":
-                return new PaymentGatewayMediaPayments();
             default:
                 return null;
         }

src/main/java/com/unicenta/pos/payment/PaymentGatewayMediaPayments.java

@@ -1,97 +0,0 @@
-//    uniCenta oPOS  - Touch Friendly Point Of Sale
-//    Copyright (c) 2009-2018 uniCenta & previous Openbravo POS works
-//    https://unicenta.com
-//
-//    This file is part of uniCenta oPOS
-//
-//    uniCenta oPOS is free software: you can redistribute it and/or modify
-//    it under the terms of the GNU General Public License as published by
-//    the Free Software Foundation, either version 3 of the License, or
-//    (at your option) any later version.
-//
-//   uniCenta oPOS is distributed in the hope that it will be useful,
-//    but WITHOUT ANY WARRANTY; without even the implied warranty of
-//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//    GNU General Public License for more details.
-//
-//    You should have received a copy of the GNU General Public License
-//    along with uniCenta oPOS.  If not, see <http://www.gnu.org/licenses/>.
-
-package com.unicenta.pos.payment;
-
-import com.unicenta.plugins.Application;
-import com.unicenta.plugins.common.AppContext;
-import com.unicenta.pos.util.RoundUtils;
-import lombok.extern.slf4j.Slf4j;
-
-import java.awt.*;
-import java.util.ArrayList;
-
-@Slf4j
-public class PaymentGatewayMediaPayments implements PaymentGateway {
-
-  public PaymentGatewayMediaPayments() {
-  }
-
-  Window getPaymentWindow(double amount) {
-    if (amount > 0) {
-      ArrayList<JPaymentSelectReceipt> paymentWindows = new ArrayList<>();
-      for (Window window : Window.getWindows()) {
-        if (window instanceof JPaymentSelectReceipt) {
-          paymentWindows.add((JPaymentSelectReceipt) window);
-        }
-      }
-      return paymentWindows.get(paymentWindows.size() - 1);
-    } else {
-      ArrayList<JPaymentSelectRefund> paymentWindows = new ArrayList<>();
-      for (Window window : Window.getWindows()) {
-        if (window instanceof JPaymentSelectRefund) {
-          paymentWindows.add((JPaymentSelectRefund) window);
-        }
-      }
-      return paymentWindows.get(paymentWindows.size() - 1);
-    }
-  }
-
-  @Override
-  public void execute(PaymentInfoMagcard payinfo) {
-
-    int timer = 0;
-    int timeout = 180;
-
-    double roundedValue = RoundUtils.round(payinfo.getTotal());
-    new Application().mediaPaymentsTransaction(roundedValue, getPaymentWindow(roundedValue),
-        payinfo.getTransactionID().length() > 12 ? payinfo.getTransactionID() : null);
-
-    while (AppContext.getIsProcessing() == null || AppContext.getIsProcessing()) {
-      try {
-        log.info("uniCenta-oPos: waiting for payment to complete ....");
-        Thread.sleep(1000);
-        timer += 1;
-        if (timer > timeout)
-          break;
-      } catch (InterruptedException e) {
-        log.error(e.getMessage());
-      }
-    }
-
-    if (AppContext.getMediaPaymentsPaymentResult() == null) {
-      payinfo.paymentError("Transaction Error! Please try again", "No Response");
-    } else if ("APPROVED".equals(AppContext.getMediaPaymentsPaymentResult().getProcessingDetails().getStatus())) {
-      payinfo.setCardName(AppContext.getMediaPaymentsPaymentResult().getProcessingDetails().getCard().getType());
-      payinfo
-          .setVerification(AppContext.getMediaPaymentsPaymentResult().getProcessingDetails().getVerificationMethod());
-      payinfo.setChipAndPin(true);
-      payinfo.paymentOK(
-          AppContext.getMediaPaymentsPaymentResult().getAdditionalInformation().getRequestId(),
-          AppContext.getMediaPaymentsPaymentResult().getTransactionDetails().getId(),
-          AppContext.getMediaPaymentsPaymentResult().getProcessingDetails().getStatus());
-    } else {
-      String errorMsg = AppContext.getMediaPaymentsPaymentResult().getErrorMessage();
-      if (errorMsg == null) {
-        errorMsg = AppContext.getMediaPaymentsPaymentResult().getMessage();
-      }
-      payinfo.paymentError("Transaction Error! Please try again", errorMsg);
-    }
-  }
-}

src/main/java/com/unicenta/pos/payment/PaymentInfoCash.java

@@ -23,111 +23,121 @@ import com.unicenta.format.Formats;
 
 public class PaymentInfoCash extends PaymentInfo {
 
-    private double prePayAmount = 0.0;
+  private double prePayAmount = 0.0;
-    private double m_dPaid;
+  private double m_dPaid;
-    private double m_dTotal;
+  private double m_dTotal;
-    private double m_dTendered;
+  private double m_dTendered;
-    private String m_dCardName =null;
+  private String m_dCardName = null;
-//    private double m_dTip;    
+  private String m_sName = "cash";
+  // private double m_dTip;
 
-    /**
+  /**
-     * Creates a new instance of PaymentInfoCash
+   * Creates a new instance of PaymentInfoCash
-     * @param dTotal
+   * 
-     * @param dPaid
+   * @param dTotal
-     * @param dTendered
+   * @param dPaid
-     */
+   * @param dTendered
-    public PaymentInfoCash(double dTotal, double dPaid, double dTendered) {
+   */
-        m_dTotal = dTotal;
+  public PaymentInfoCash(double dTotal, double dPaid, double dTendered) {
-        m_dPaid = dPaid;
+    m_dTotal = dTotal;
-        m_dTendered = dTendered;
+    m_dPaid = dPaid;
-    }
+    m_dTendered = dTendered;
+  }
 
-    /**
+  /**
-     * Creates a new instance of PaymentInfoCash
+   * Creates a new instance of PaymentInfoCash
-     * @param dTotal
+   * 
-     * @param dPaid
+   * @param dTotal
-     * @param dTendered
+   * @param dPaid
-     * @param prePayAmount
+   * @param dTendered
-     */
+   * @param prePayAmount
-    public PaymentInfoCash(double dTotal, double dPaid, double dTendered, double prePayAmount) {
+   */
-        this(dTotal, dTendered, dPaid);
+  public PaymentInfoCash(double dTotal, double dPaid, double dTendered, double prePayAmount) {
-        this.prePayAmount = prePayAmount;
+    this(dTotal, dTendered, dPaid);
-    }
+    this.prePayAmount = prePayAmount;
+  }
 
-    /** Creates a new instance of PaymentInfoCash
+  /**
-     * @param dTotal
+   * Creates a new instance of PaymentInfoCash
-     * @param dPaid */
+   * 
-    public PaymentInfoCash(double dTotal, double dPaid) {
+   * @param dTotal
-        m_dTotal = dTotal;
+   * @param dPaid
-        m_dPaid = dPaid;
+   */
-    }
+  public PaymentInfoCash(double dTotal, double dPaid) {
+    m_dTotal = dTotal;
+    m_dPaid = dPaid;
+  }
 
-    @Override
+  @Override
-    public PaymentInfo copyPayment() {
+  public PaymentInfo copyPayment() {
-       return new PaymentInfoCash(m_dTotal, m_dPaid, m_dTendered, prePayAmount);
+    return new PaymentInfoCash(m_dTotal, m_dPaid, m_dTendered, prePayAmount);
-//        return new PaymentInfoCash(m_dTotal, m_dPaid, prePayAmount);        
+    // return new PaymentInfoCash(m_dTotal, m_dPaid, prePayAmount);
-    }
+  }
 
-    @Override
+  @Override
-    public String getTransactionID() {
+  public String getTransactionID() {
-        return "no ID";
+    return "no ID";
-    }
+  }
 
-    @Override
+  @Override
-    public String getName() {
+  public String getName() {
-        return "cash";
+    return "cash";
-    }
+  }
-    @Override
-    public double getTotal() {
-        return m_dTotal;
-    }
-//    public double getTip() {
-//        return m_dTip;
-//    }
-    @Override
-    public double getPaid() {
-        return m_dPaid;
-    }
 
-    @Override
+  @Override
-    public double getTendered() {
+  public double getTotal() {
-        return m_dTendered;
+    return m_dTotal;
-    }
+  }
 
-    @Override
+  // public double getTip() {
-   public double getChange(){
+  // return m_dTip;
-       return m_dPaid - m_dTotal;
+  // }
-   }
+  @Override
+  public double getPaid() {
+    return m_dPaid;
+  }
 
-    @Override
+  @Override
-    public String getCardName() {
+  public double getTendered() {
-       return m_dCardName;
+    return m_dTendered;
-   }     
+  }
 
-    public boolean hasPrePay() {
+  @Override
-        if (prePayAmount > 0) {
+  public double getChange() {
-            return true;
+    return m_dPaid - m_dTotal;
-        }
+  }
-        return false;
-    }
 
-    public double getPrePaid() {
+  @Override
-        return prePayAmount;
+  public String getCardName() {
-    }
+    return m_dCardName;
+  }
 
-    public String printTendered() {
+  public boolean hasPrePay() {
-       return Formats.CURRENCY.formatValue(m_dTendered);
+    if (prePayAmount > 0) {
-   }    
+      return true;
-    public String printPaid() {
-        return Formats.CURRENCY.formatValue(m_dPaid);
-    }
-    public String printChange() {
-        return Formats.CURRENCY.formatValue(m_dPaid - m_dTotal);
     }
+    return false;
+  }
 
-    @Override
+  public double getPrePaid() {
-    public String getVoucher() {
+    return prePayAmount;
-        return null;
+  }
-    }    
+
+  public String printTendered() {
+    return Formats.CURRENCY.formatValue(m_dTendered);
+  }
+
+  public String printPaid() {
+    return Formats.CURRENCY.formatValue(m_dPaid);
+  }
+
+  public String printChange() {
+    return Formats.CURRENCY.formatValue(m_dPaid - m_dTotal);
+  }
+
+  @Override
+  public String getVoucher() {
+    return null;
+  }
 
 }

src/main/java/com/unicenta/pos/payment/PaymentInfoCash_original.java

@@ -27,72 +27,82 @@ import com.unicenta.format.Formats;
  */
 public class PaymentInfoCash_original extends PaymentInfo {
 
-    private final double m_dPaid;
+  private final double m_dPaid;
-    private final double m_dTotal;
+  private final double m_dTotal;
-    private double m_dTendered;    
+  private double m_dTendered;
-    private final String m_dCardName =null;
+  private final String m_dCardName = null;
-//    private double m_dTip;    
+  private String m_sName = "cash";
+  // private double m_dTip;
 
-    /** Creates a new instance of PaymentInfoCash
+  /**
-     * @param dTotal
+   * Creates a new instance of PaymentInfoCash
-     * @param dPaid */
+   * 
-    public PaymentInfoCash_original(double dTotal, double dPaid) {
+   * @param dTotal
-        m_dTotal = dTotal;
+   * @param dPaid
-        m_dPaid = dPaid;
+   */
-    }
+  public PaymentInfoCash_original(double dTotal, double dPaid) {
+    m_dTotal = dTotal;
+    m_dPaid = dPaid;
+  }
 
-    @Override
+  @Override
-    public PaymentInfo copyPayment(){
+  public PaymentInfo copyPayment() {
-        return new PaymentInfoCash_original(m_dTotal, m_dPaid);
+    return new PaymentInfoCash_original(m_dTotal, m_dPaid);
-    }
+  }
 
-    @Override
+  @Override
-    public String getTransactionID(){
+  public String getTransactionID() {
-        return "no ID";
+    return "no ID";
-    }
+  }
 
-    @Override
+  @Override
-    public String getName() {
+  public String getName() {
-        return "cash";
+    return "cash";
-    }   
+  }
-    @Override
-    public double getTotal() {
-        return m_dTotal;
-    }   
-/**    public double getTip() {
-        return m_dTip;
-    }
-     * @return 
-*/
-    @Override
-    public double getPaid() {
-        return m_dPaid;
-    }
 
-    @Override
+  @Override
-    public double getTendered() {
+  public double getTotal() {
-        return m_dTendered;
+    return m_dTotal;
-    }
+  }
 
-    @Override
+  /**
-    public double getChange(){
+   * public double getTip() {
-       return m_dPaid - m_dTotal;
+   * return m_dTip;
-   }
+   * }
+   * 
+   * @return
+   */
+  @Override
+  public double getPaid() {
+    return m_dPaid;
+  }
 
-    @Override
+  @Override
-   public String getCardName() {
+  public double getTendered() {
-       return m_dCardName;
+    return m_dTendered;
-   }
+  }
-    public String printPaid() {
-        return Formats.CURRENCY.formatValue(m_dPaid);
-    }   
-    public String printChange() {
-        return Formats.CURRENCY.formatValue(m_dPaid - m_dTotal);
-    }
 
-    @Override
+  @Override
-    public String getVoucher() {
+  public double getChange() {
-        return null;
+    return m_dPaid - m_dTotal;
-    }
+  }
+
+  @Override
+  public String getCardName() {
+    return m_dCardName;
+  }
+
+  public String printPaid() {
+    return Formats.CURRENCY.formatValue(m_dPaid);
+  }
+
+  public String printChange() {
+    return Formats.CURRENCY.formatValue(m_dPaid - m_dTotal);
+  }
+
+  @Override
+  public String getVoucher() {
+    return null;
+  }
 
 }

src/main/java/com/unicenta/pos/payment/PaymentInfoMagcard.java

@@ -21,290 +21,292 @@ package com.unicenta.pos.payment;
 
 public class PaymentInfoMagcard extends PaymentInfo {
 
-    protected double m_dTotal;
+  private String m_sName = "creditcard";
-    protected double m_dTip;
+  protected double m_dTotal;
-    protected String m_sHolderName;
+  protected double m_dTip;
-    protected String m_sCardNumber;
+  protected String m_sHolderName;
-    protected String m_sExpirationDate;
+  protected String m_sCardNumber;
-    protected String track1;
+  protected String m_sExpirationDate;
-    protected String track2;
+  protected String track1;
-    protected String track3;
+  protected String track2;
-    protected String m_sTransactionID;
+  protected String track3;
-    protected String m_sAuthorization;
+  protected String m_sTransactionID;
-    protected String m_sErrorMessage;
+  protected String m_sAuthorization;
-    protected String m_sReturnMessage;
+  protected String m_sErrorMessage;
-    //JG Jan 2018 
+  protected String m_sReturnMessage;
-    protected String encryptedTrack;
+  // JG Jan 2018
-    protected String encryptionKey;
+  protected String encryptedTrack;
-    protected String m_dCardName =null;
+  protected String encryptionKey;
+  protected String m_dCardName = null;
 
-    protected Boolean chipAndPin = Boolean.FALSE;
+  protected Boolean chipAndPin = Boolean.FALSE;
-    protected String verification;
+  protected String verification;
-    protected String lastFourDigits;
+  protected String lastFourDigits;
 
-    /**
+  /**
-     * Creates a new instance of PaymentInfoMagcard
+   * Creates a new instance of PaymentInfoMagcard
-     * @param sHolderName
+   * 
-     * @param sCardNumber
+   * @param sHolderName
-     * @param sExpirationDate
+   * @param sCardNumber
-     * @param track1
+   * @param sExpirationDate
-     * @param track2
+   * @param track1
-     * @param track3
+   * @param track2
-     * @param encryptedCard
+   * @param track3
-     * @param encryptKey
+   * @param encryptedCard
-     * @param sTransactionID
+   * @param encryptKey
-     * @param dTotal
+   * @param sTransactionID
-     */
+   * @param dTotal
-    public PaymentInfoMagcard(String sHolderName, String sCardNumber,
+   */
-                              String sExpirationDate, String track1, String track2, String track3, String encryptedCard, String encryptKey,
+  public PaymentInfoMagcard(String sHolderName, String sCardNumber,
-                              String sTransactionID, double dTotal) {
+      String sExpirationDate, String track1, String track2, String track3, String encryptedCard, String encryptKey,
-        m_sHolderName = sHolderName;
+      String sTransactionID, double dTotal) {
-        m_sCardNumber = sCardNumber;
+    m_sHolderName = sHolderName;
-        m_sExpirationDate = sExpirationDate;
+    m_sCardNumber = sCardNumber;
-        this.track1 = track1;
+    m_sExpirationDate = sExpirationDate;
-        this.track2 = track2;
+    this.track1 = track1;
-        this.track3 = track3;
+    this.track2 = track2;
-        encryptedTrack = encryptedCard;
+    this.track3 = track3;
-        encryptionKey = encryptKey;
+    encryptedTrack = encryptedCard;
-        m_sTransactionID = sTransactionID;
+    encryptionKey = encryptKey;
-        m_dTotal = dTotal;
+    m_sTransactionID = sTransactionID;
+    m_dTotal = dTotal;
 
+    m_sAuthorization = null;
+    m_sErrorMessage = null;
+    m_sReturnMessage = null;
+  }
 
-        m_sAuthorization = null;
+  /**
-        m_sErrorMessage = null;
+   * Creates a new instance of PaymentInfoMagcard
-        m_sReturnMessage = null;
+   * 
+   * @param sHolderName
+   * @param sCardNumber
+   * @param sExpirationDate
+   * @param sTransactionID
+   * @param dTotal
+   */
+  public PaymentInfoMagcard(String sHolderName, String sCardNumber,
+      String sExpirationDate, String sTransactionID, double dTotal) {
+    this(sHolderName, sCardNumber, sExpirationDate,
+        null, null, null, null, null, sTransactionID, dTotal);
+  }
+
+  @Override
+  public PaymentInfo copyPayment() {
+    PaymentInfoMagcard p = new PaymentInfoMagcard(m_sHolderName,
+        m_sCardNumber, m_sExpirationDate, track1, track2,
+        track3, encryptedTrack, encryptionKey, m_sTransactionID, m_dTotal);
+    p.m_sAuthorization = m_sAuthorization;
+    p.m_sErrorMessage = m_sErrorMessage;
+    return p;
+  }
+
+  public String getName() {
+    // return "magcard";
+    return "ccard";
+  }
+
+  @Override
+  public double getTotal() {
+    return m_dTotal;
+  }
+
+  public double getTip() {
+    return m_dTip;
+  }
+
+  public boolean isPaymentOK() {
+    return m_sAuthorization != null;
+  }
+
+  public String getHolderName() {
+    return m_sHolderName;
+  }
+
+  @Override
+  public String getCardName() {
+    if (chipAndPin) {
+      return m_dCardName;
     }
+    return getCardType(m_sCardNumber);
+  }
 
-    /**
+  public String getCardNumber() {
-     * Creates a new instance of PaymentInfoMagcard
+    return m_sCardNumber;
-     * @param sHolderName
+  }
-     * @param sCardNumber
+
-     * @param sExpirationDate
+  public String getExpirationDate() {
-     * @param sTransactionID
+    return m_sExpirationDate;
-     * @param dTotal
+  }
-     */
+
-    public PaymentInfoMagcard(String sHolderName, String sCardNumber,
+  @Override
-                              String sExpirationDate, String sTransactionID, double dTotal) {
+  public String getTransactionID() {
-        this(sHolderName, sCardNumber, sExpirationDate,
+    return m_sTransactionID;
-                null, null, null, null, null, sTransactionID, dTotal);
+  }
+
+  /**
+   * Get tracks of magnetic card. Framing characters: - start sentinel (SS) -
+   * end sentinel (ES) - LRC
+   *
+   * @return tracks of the magnetic card
+   */
+  public String getEncryptedCardData() {
+    return encryptedTrack;
+  }
+
+  public String getEncryptionKey() {
+    return encryptionKey;
+  }
+
+  /**
+   * @param sCardNumber
+   * @return
+   */
+  public String getCardType(String sCardNumber) {
+    String c = "UNKNOWN";
+
+    if (sCardNumber.startsWith("4")) {
+      c = "VISA";
+    } else if (sCardNumber.startsWith("6")) {
+      c = "DISC";
+    } else if (sCardNumber.startsWith("5")) {
+      c = "MAST";
+    } else if (sCardNumber.startsWith("34") || sCardNumber.startsWith("37")) {
+      c = "AMEX";
+    } else if (sCardNumber.startsWith("3528") || sCardNumber.startsWith("3589")) {
+      c = "JCB";
+    } else if (sCardNumber.startsWith("3")) {
+      c = "DINE";
     }
+    m_sCardNumber = c;
+    return c;
+  }
 
-    @Override
+  public String getTrack1(boolean framingChar) {
-    public PaymentInfo copyPayment() {
+    return (framingChar)
-        PaymentInfoMagcard p = new PaymentInfoMagcard(m_sHolderName,
+        ? track1
-                m_sCardNumber, m_sExpirationDate, track1, track2,
+        : track1.substring(1, track1.length() - 2);
-                track3, encryptedTrack, encryptionKey, m_sTransactionID, m_dTotal);
+  }
-        p.m_sAuthorization = m_sAuthorization;
+
-        p.m_sErrorMessage = m_sErrorMessage;
+  public String getTrack2(boolean framingChar) {
-        return p;
+    return (framingChar)
+        ? track2
+        : track2.substring(1, track2.length() - 2);
+  }
+
+  public String getTrack3(boolean framingChar) {
+    return (framingChar)
+        ? track3
+        : track3.substring(1, track3.length() - 2);
+  }
+
+  public String getAuthorization() {
+    return m_sAuthorization;
+  }
+
+  public String getMessage() {
+    return m_sErrorMessage;
+  }
+
+  public void paymentError(String sMessage, String moreInfo) {
+    m_sAuthorization = null;
+    m_sErrorMessage = sMessage + "\n" + moreInfo;
+  }
+
+  public void setReturnMessage(String returnMessage) {
+    m_sReturnMessage = returnMessage;
+  }
+
+  public String getReturnMessage() {
+    return m_sReturnMessage;
+  }
+
+  public void paymentOK(String sAuthorization, String sTransactionId, String sReturnMessage) {
+    m_sAuthorization = sAuthorization;
+    m_sTransactionID = sTransactionId;
+    m_sReturnMessage = sReturnMessage;
+    m_sErrorMessage = null;
+  }
+
+  public String printCardNumber() {
+    System.out.println(m_sCardNumber);
+    if (m_sCardNumber.length() > 4) {
+      return m_sCardNumber.substring(0, m_sCardNumber.length() - 4).replaceAll("\\.", "*")
+          + m_sCardNumber.substring(m_sCardNumber.length() - 4);
+    } else {
+      return "****";
     }
+  }
 
-    public String getName() {
+  public String printExpirationDate() {
-//        return "magcard";
+    return m_sExpirationDate;
-        return "ccard";
+  }
-    }
 
-    @Override
+  public String printAuthorization() {
-    public double getTotal() {
+    return m_sAuthorization;
-        return m_dTotal;
+  }
-    }
 
-    public double getTip() {
+  public String printTransactionID() {
-        return m_dTip;
+    return m_sTransactionID;
-    }
+  }
 
-    public boolean isPaymentOK() {
+  public boolean getIsProcessed() {
-        return m_sAuthorization != null;
+    throw new UnsupportedOperationException("Not supported yet.");
-    }
+  }
 
-    public String getHolderName() {
+  public void setIsProcessed(boolean value) {
-        return m_sHolderName;
+    throw new UnsupportedOperationException("Not supported yet.");
-    }
+  }
 
-    @Override
+  @Override
-    public String getCardName() {
+  public double getPaid() {
-        if (chipAndPin){
+    return (0.0);
-            return m_dCardName;
+  }
-        }
-        return getCardType(m_sCardNumber);
-    }
 
-    public String getCardNumber() {
+  @Override
-        return m_sCardNumber;
+  public double getChange() {
-    }
+    return 0.00;
+  }
 
-    public String getExpirationDate() {
+  @Override
-        return m_sExpirationDate;
+  public double getTendered() {
-    }
+    return 0.00;
+  }
 
-    @Override
+  @Override
-    public String getTransactionID() {
+  public String getVoucher() {
-        return m_sTransactionID;
+    return null;
-    }
+  }
 
-    /**
+  public void setCardName(String m_dCardName) {
-     * Get tracks of magnetic card. Framing characters: - start sentinel (SS) -
+    this.m_dCardName = m_dCardName;
-     * end sentinel (ES) - LRC
+  }
-     *
-     * @return tracks of the magnetic card
-     */
-    public String getEncryptedCardData() {
-        return encryptedTrack;
-    }
 
-    public String getEncryptionKey() {
+  public Boolean isChipAndPin() {
-        return encryptionKey;
+    return chipAndPin;
-    }
+  }
 
-    /** @param sCardNumber
+  public void setChipAndPin(Boolean chipAndPin) {
-     * @return
+    this.chipAndPin = chipAndPin;
-     */
+  }
-    public String getCardType(String sCardNumber){
-        String c = "UNKNOWN";
 
-        if (sCardNumber.startsWith("4")) {
+  public String printVerification() {
-            c = "VISA";
+    return verification;
-        } else if (sCardNumber.startsWith("6")) {
+  }
-            c = "DISC";
-        } else if (sCardNumber.startsWith("5")) {
-            c = "MAST";
-        } else if (sCardNumber.startsWith("34") || sCardNumber.startsWith("37")) {
-            c = "AMEX";
-        } else if (sCardNumber.startsWith("3528") || sCardNumber.startsWith("3589")) {
-            c = "JCB";
-        } else if (sCardNumber.startsWith("3")) {
-            c = "DINE";
-        }
-        m_sCardNumber = c;
-        return c;
-    }
 
-    public String getTrack1(boolean framingChar) {
+  public void setVerification(String verification) {
-        return (framingChar)
+    this.verification = verification;
-                ? track1
+  }
-                : track1.substring(1, track1.length() - 2);
-    }
 
-    public String getTrack2(boolean framingChar) {
+  public String getLastFourDigits() {
-        return (framingChar)
+    return lastFourDigits;
-                ? track2
+  }
-                : track2.substring(1, track2.length() - 2);
-    }
 
-    public String getTrack3(boolean framingChar) {
+  public String printLastFourDigits() {
-        return (framingChar)
+    return lastFourDigits;
-                ? track3
+  }
-                : track3.substring(1, track3.length() - 2);
-    }
 
-    public String getAuthorization() {
+  public void setLastFourDigits(String lastFourDigits) {
-        return m_sAuthorization;
+    this.lastFourDigits = lastFourDigits;
-    }
+  }
-
-    public String getMessage() {
-        return m_sErrorMessage;
-    }
-
-    public void paymentError(String sMessage, String moreInfo) {
-        m_sAuthorization = null;
-        m_sErrorMessage = sMessage + "\n" + moreInfo;
-    }
-
-    public void setReturnMessage(String returnMessage) {
-        m_sReturnMessage = returnMessage;
-    }
-
-    public String getReturnMessage() {
-        return m_sReturnMessage;
-    }
-
-    public void paymentOK(String sAuthorization, String sTransactionId, String sReturnMessage) {
-        m_sAuthorization = sAuthorization;
-        m_sTransactionID = sTransactionId;
-        m_sReturnMessage = sReturnMessage;
-        m_sErrorMessage = null;
-    }
-
-    public String printCardNumber() {
-        System.out.println(m_sCardNumber);
-        if (m_sCardNumber.length() > 4) {
-            return m_sCardNumber.substring(0, m_sCardNumber.length() - 4).replaceAll("\\.", "*")
-                    + m_sCardNumber.substring(m_sCardNumber.length() - 4);
-        } else {
-            return "****";
-        }
-    }
-
-    public String printExpirationDate() {
-        return m_sExpirationDate;
-    }
-
-    public String printAuthorization() {
-        return m_sAuthorization;
-    }
-
-    public String printTransactionID() {
-        return m_sTransactionID;
-    }
-
-    public boolean getIsProcessed() {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-
-    public void setIsProcessed(boolean value) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
-    @Override
-    public double getPaid() {
-        return (0.0);
-    }
-
-    @Override
-    public double getChange(){
-        return 0.00;
-    }
-
-    @Override
-    public double getTendered() {
-        return 0.00;
-    }
-
-    @Override
-    public String getVoucher() {
-        return null;
-    }
-
-    public void setCardName(String m_dCardName){
-        this.m_dCardName = m_dCardName;
-    }
-
-    public Boolean isChipAndPin() {
-        return chipAndPin;
-    }
-
-    public void setChipAndPin(Boolean chipAndPin) {
-        this.chipAndPin = chipAndPin;
-    }
-
-    public String printVerification() {
-        return verification;
-    }
-
-    public void setVerification(String verification) {
-        this.verification = verification;
-    }
-
-    public String getLastFourDigits() {
-        return lastFourDigits;
-    }
-
-    public String printLastFourDigits() {
-        return lastFourDigits;
-    }
-
-    public void setLastFourDigits(String lastFourDigits) {
-        this.lastFourDigits = lastFourDigits;
-    }
 }

src/main/java/com/unicenta/pos/ticket/UserInfo.java

@@ -26,31 +26,45 @@ import java.io.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;
+  }
+
+  public String getTaxID() {
+    return taxId;
+  }
 }

src/main/java/com/unicenta/pos/voucher/VoucherInfo.java

@@ -24,132 +24,124 @@ import com.unicenta.data.loader.DataRead;
 import com.unicenta.data.loader.IKeyed;
 import com.unicenta.data.loader.SerializerRead;
 
-import lombok.extern.slf4j.Slf4j;
 
-@Slf4j
 public class VoucherInfo implements IKeyed {
-  private String id;
+    private String id;
-  private String voucherNumber;
+    private String voucherNumber;
-  private String customerName;
+    private String customerName;
-  private double amount;
+    private double amount;
-  private String status;
+    private String status;
 
-  public VoucherInfo() {
+    public VoucherInfo() {
-  }
+    }
 
-  public VoucherInfo(
+    public VoucherInfo(
-      String id,
+        String id, 
-      String voucherNumber,
+        String voucherNumber, 
-      String customerName,
+        String customerName,
-      double amount,
+        double amount, 
-      String status) {
+        String status) 
-    this.id = id;
+    {
-    this.voucherNumber = voucherNumber;
+        this.id = id;
-    this.customerName = customerName;
+        this.voucherNumber = voucherNumber;
-    this.amount = amount;
+        this.customerName = customerName;
-    this.status = status;
+        this.amount = amount;
-  }
+        this.status = status;
+    }
       
-  @Override
-  public Object getKey() {
-    return getId();
-  }
 
-  /**
+    @Override
-   * @return the id
+    public Object getKey() {
-   */
+        return getId();
-  public String getId() {
+    }
-    return id;
-  }
 
-  /**
+    /**
-   * @param id the id to set
+     * @return the id
-   */
+     */
-  public void setId(String id) {
+    public String getId() {
-    this.id = id;
+        return id;
-  }
+    }
 
-  /**
+    /**
-   * @return the voucherNumber
+     * @param id the id to set
-   */
+     */
-  public String getVoucherNumber() {
+    public void setId(String id) {
-    return voucherNumber;
+        this.id = id;
-  }
+    }
 
-  /**
+    /**
-   * @param voucherNumber the voucherNumber to set
+     * @return the voucherNumber
-   */
+     */
-  public void setVoucherNumber(String voucherNumber) {
+    public String getVoucherNumber() {
-    this.voucherNumber = voucherNumber;
+        return voucherNumber;
-  }
+    }
 
-  /**
+    /**
-   * @return the customerName
+     * @param voucherNumber the voucherNumber to set
-   */
+     */
-  public String getCustomerName() {
+    public void setVoucherNumber(String voucherNumber) {
-    return customerName;
+        this.voucherNumber = voucherNumber;
-  }
+    }
     
-  /**
+    /**
-   * @param customerName the customerName to set
+     * @return the customerName
-   */
+     */
-  public void setCustomerName(String customerName) {
+    public String getCustomerName() {
-    this.customerName = customerName;
+        return customerName;
-  }
+    }
 
-  /**
+    /**
-   * @return the amount
+     * @param customerName the customerName to set
-   */
+     */
-  public double getAmount() {
+    public void setCustomerName(String customerName) {
-    return amount;
+        this.customerName = customerName;
-  }
+    }
 
-  /**
+    /**
-   * @param amount the amount to set
+     * @return the amount
-   */
+     */
-  public void setAmount(double amount) {
+    public double getAmount() {
-    this.amount = amount;
+        return amount;
-  }
+    }
 
-  @Override
+    /**
-  public String toString() {
+     * @param amount the amount to set
-    return voucherNumber;
+     */
-  }
+    public void setAmount(double amount) {
+        this.amount = amount;
+    }
     
-  /**
-   * @return the status
-   */
-  public String getStatus() {
-    return status;
-  }
     
-  /**
+     @Override
-   * @param status the status to set
+    public String toString() {
-   */
+        return voucherNumber;
-  public void setStatus(String status) {
+    }
-    this.status = status;
-  }
     
-  public static SerializerRead getSerializerRead() {
+    /**
-    return new SerializerRead() {
+     * @return the status
-      @Override
+     */
-      public Object readValues(DataRead dr) throws BasicException {
+    public String getStatus() {
-        VoucherInfo voucherInfo = null;
+        return status;
+    }
 
-        try {
+    /**
-          voucherInfo = new VoucherInfo(
+     * @param status the status to set
-              dr.getString(1),
+     */
-              dr.getString(2),
+    public void setStatus(String status) {
-              dr.getString(3),
+        this.status = status;
-              dr.getDouble(4),
+    }
-              dr.getString(5));
-        } catch (Exception e) {
-          log.error("Error reading voucher info: {}", e.getMessage());
-          log.error(dr.getString(2));
-        }
 
-        return voucherInfo;
+    public static SerializerRead getSerializerRead() {
-      }
+        return new SerializerRead() 
-    };
+        {
-  }
+            @Override
+        public Object readValues(DataRead dr) throws BasicException {
+            return new VoucherInfo(
+                    dr.getString(1), 
+                    dr.getString(2), 
+                    dr.getString(3),
+                    dr.getDouble(4),
+                    dr.getString(5));            
+        }};
+    }    
 }

src/main/resources/com/unicenta/pos/scripts/Derby-create.sql

@@ -205,6 +205,7 @@ CREATE TABLE people (
 	 id varchar(255) NOT NULL,
 	 name varchar(255) NOT NULL,
 	 apppassword varchar(255) default NULL,
+	 taxId varchar(255) default NULL,
 	 card varchar(255) default NULL,
 	 role varchar(255) NOT NULL,
 	 visible smallint NOT NULL,

src/main/resources/com/unicenta/pos/scripts/Derby-upgrade_master.sql

@@ -1 +1,3 @@
+ALTER TABLE people ADD COLUMN IF NOT EXISTS taxId VARCHAR(255) AFTER apppassword;
+--ALTER TABLE people ADD COLUMN taxId VARCHAR(100);
 UPDATE applications SET version = $APP_VERSION{} WHERE id = $APP_ID{};

src/main/resources/com/unicenta/pos/scripts/MariaDB-create.sql

@@ -271,6 +271,7 @@ CREATE TABLE `people` (
 	`id` varchar(255) NOT NULL,
 	`name` varchar(255) NOT NULL,
 	`apppassword` varchar(255) default NULL,
+	`taxId` varchar(255) default NULL,
 	`card` varchar(255) default NULL,
 	`role` varchar(255) NOT NULL,
 	`visible` bit(1) NOT NULL,

src/main/resources/com/unicenta/pos/scripts/MariaDB-upgrade_master.sql

@@ -1,2 +1,3 @@
+ALTER TABLE people ADD COLUMN IF NOT EXISTS taxId VARCHAR(255) AFTER apppassword;
 UPDATE applications SET version = $APP_VERSION{} WHERE id = $APP_ID{};
 COMMIT;

src/main/resources/com/unicenta/pos/scripts/MySQL-create.sql

@@ -246,6 +246,7 @@ CREATE TABLE `people` (
 	`id` varchar(255) NOT NULL,
 	`name` varchar(255) NOT NULL,
 	`apppassword` varchar(255) default NULL,
+	`taxId` varchar(255) default NULL,
 	`card` varchar(255) default NULL,
 	`role` varchar(255) NOT NULL,
 	`visible` bit(1) NOT NULL,

src/main/resources/com/unicenta/pos/scripts/MySQL-upgrade_master.sql

@@ -1,62 +1,3 @@
--- CLEAR THE DECKS
+ALTER TABLE people ADD COLUMN IF NOT EXISTS taxId VARCHAR(255) AFTER apppassword;
-DELETE FROM sharedtickets;
+UPDATE applications SET version = $APP_VERSION{} WHERE id = $APP_ID{};
-
--- Switch OFF table foreign key relationships
-set foreign_key_checks = 0;
-
--- RECREATE applications table
-DROP TABLE `applications`;
-CREATE TABLE IF NOT EXISTS `applications` (
-	`id` varchar(255) NOT NULL,
-	`name` varchar(255) NOT NULL,
-	`version` varchar(255) NOT NULL,
-	`instdate` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-	PRIMARY KEY  ( `id` )
-) ENGINE = InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT = Compact;
-
-
--- SYSTEM
-DELETE FROM resources WHERE name = 'script.posapps';
-
-
-DELETE FROM resources WHERE id = '0';
-DELETE FROM resources WHERE id = '00';
-INSERT INTO resources(id, name, restype, content) VALUES('00', 'Menu.Root', 0, $FILE{/com/unicenta/pos/templates/Menu.Root.txt});
-
-UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/Ticket.Buttons.xml} WHERE name = 'Ticket.Buttons';
-COMMIT;
-
-UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/Printer.Ticket.xml} WHERE name = 'Printer.Ticket';
-COMMIT;
-
-UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/Ticket.Close.xml} WHERE name = 'Ticket.Close';
-COMMIT;
-
-UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/Cash.Close.xml} WHERE name = 'Cash.Close';
-COMMIT;
-
-UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/customer.created.xml} WHERE name = 'Customer.Created';
-COMMIT;
-
-UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/customer.deleted.xml} WHERE name = 'Customer.Deleted';
-COMMIT;
-
-UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/customer.updated.xml} WHERE name = 'Customer.Updated';
-COMMIT;
-
-
--- ROLES
-DELETE FROM roles WHERE id = '0';
-INSERT INTO roles(id, name, permissions) VALUES('0', 'Administrator role', $FILE{/com/unicenta/pos/templates/Role.Administrator.xml} );
-DELETE FROM roles WHERE id = '1';
-INSERT INTO roles(id, name, permissions) VALUES('1', 'Manager role', $FILE{/com/unicenta/pos/templates/Role.Manager.xml} );
-DELETE FROM roles WHERE id = '2';
-INSERT INTO roles(id, name, permissions) VALUES('2', 'Employee role', $FILE{/com/unicenta/pos/templates/Role.Employee.xml} );
-
-
--- Switch ON table foreign key relationships
-set foreign_key_checks = 1;
-
-INSERT INTO applications(id, name, version) VALUES($APP_ID{}, $APP_NAME{}, '5.3.1');
-
 COMMIT;

src/main/resources/pos_messages.properties

@@ -1207,3 +1207,4 @@ tooltip.config.db.databaseset1=<html><center>Set the optional secondary DB 2 dat
 tooltip.config.db.reset=<html><center>Clear the settings of the main DB 1 Database Server
 tooltip.config.db.reset1=<html><center>Clear the settings of the optional DB 2 Database Server\t
 label.pickupcurrent=Current Pickup Number
+label.peopletaxid=Tax ID

src/main/resources/pos_messages_al_SQ.properties

@@ -662,3 +662,4 @@ transpayment.slip=Slip
 transpayment.voucherin=Note Input
 transpayment.voucherout=Note Output
 Visor.Title=uniCenta oPOS
+label.peopletaxid=Tax ID

src/main/resources/pos_messages_ar.properties

@@ -542,3 +542,4 @@ label.department=\u0642\u0633\u0645\u060c \u0623\u0642\u0633\u0627\u0645
 message.resetpickup=\u0647\u0644 \u062a\u0631\u064a\u062f \u062d\u0642\u0627 \u0623\u0646 \u0625\u0639\u0627\u062f\u0629 \u062a\u0631\u062a\u064a\u0628 \u0639\u062f\u062f \u0628\u064a\u0643 \u0623\u0628 0\u061f
 label.currentstock=\u0645\u062a\u0627\u062d
 Menu.CSVStockQty=<html>Products<br><b>Scanner Import
+label.peopletaxid=Tax ID

src/main/resources/pos_messages_da.properties

@@ -1008,3 +1008,4 @@ transpayment.ccardrefund=Kort tilbagef\u00f8rsel
 transpayment.ticket=Salgskvittering
 transpayment.voucher=Gavekort
 Visor.Title=uniCenta oPOS
+label.peopletaxid=Tax ID

src/main/resources/pos_messages_de.properties

@@ -902,3 +902,4 @@ transpayment.voucher=Gutschein
 transpayment.voucherin=Gutschein Eingabe
 transpayment.voucherout=Gutschein Ausgabe
 Visor.Title=uniCenta oPOS
+label.peopletaxid=Tax ID

src/main/resources/pos_messages_el.properties

@@ -548,3 +548,4 @@ transpayment.ticket=\u0391\u03c0\u03cc\u03b4\u03b5\u03b9\u03be\u03b7
 transpayment.voucherin=\u039a\u03bf\u03c5\u03c0\u03cc\u03bd\u03b9
 transpayment.voucherout=\u039a\u03bf\u03c5\u03c0\u03cc\u03bd\u03b9
 Visor.Title=uniCenta oPOS
+label.peopletaxid=Tax ID

src/main/resources/pos_messages_en_US.properties

@@ -1116,3 +1116,4 @@ label.override=Use Override?
 title.override.enterpin=Enter PIN Number
 message.override.badpin=<html><center><h4>PIN Number Incorrect
 Menu.CustomersExport=Customer Export
+label.peopletaxid=Tax ID

src/main/resources/pos_messages_es.properties

@@ -1188,3 +1188,4 @@ message.eolupdate=<html><center><h3>uniCenta oPOS Versi\u00f3n {0} detectada!</h
 label.find=Buscar
 label.create=Crear
 label.cancel=Cancelar
+label.peopletaxid=ID de impuesto

src/main/resources/pos_messages_es_AR.properties

@@ -484,3 +484,4 @@ transpayment.ccardrefund=Devoluci\u00f3n con tarjeta
 transpayment.voucherin=Vales cobrados
 transpayment.voucherout=Vales emitidos
 Visor.Title=uniCenta oPOS
+label.peopletaxid=Tax ID

src/main/resources/pos_messages_es_MX.properties

@@ -469,3 +469,5 @@ transpayment.voucherin=Vales cobrados
 transpayment.voucherout=Vales emitidos
 Visor.Title=uniCenta oPOS
 message.eolupdate=<html><center><h3>uniCenta oPOS Versi\u00f3n {0} detectada!</h3><h4>\u00a1Las actualizaciones de la versi\u00f3n est\u00e1n cambiando!</h4> Si su versi\u00f3n es 5.3 o posterior, elija <b>S\u00cd</b> para continuar.<br/><br/> Para versiones anteriores, haga clic en <b>NO</b> para abrir Opciones de configuraci\u00f3n ahora.<br/></br>Lea la Gu\u00eda de transferencia de datos de uniCenta oPOS
+label.peopletaxid=Identificador de taxi
+

src/main/resources/pos_messages_et.properties

@@ -502,3 +502,4 @@ transpayment.ccardrefund=Kaardimakse tagastus
 transpayment.voucherin=Kupongimakse
 transpayment.voucherout=Kupong v\u00e4lja
 Visor.Title=uniCenta oPOS
+label.peopletaxid=Tax ID

src/main/resources/pos_messages_fr.properties

@@ -1083,3 +1083,4 @@ label.add=Ajouter
 label.cancel=Annuler
 label.create=Cr\u00e9er
 label.find=Trouver
+label.peopletaxid=Tax ID

src/main/resources/pos_messages_hr.properties

@@ -482,3 +482,4 @@ transpayment.ccardrefund=Povrat kartice
 transpayment.voucherin=Bilje\u0161ka - ulaz
 transpayment.voucherout=Bilje\u0161ka - izlaz
 Visor.Title=uniCenta oPOS
+label.peopletaxid=Tax ID

src/main/resources/pos_messages_it.properties

@@ -753,3 +753,4 @@ transpayment.ticket=Fattura
 transpayment.voucherin=Nota Ingresso
 transpayment.voucherout=Nota Uscita
 Visor.Title=uniCenta oPOS
+label.peopletaxid=Tax ID

src/main/resources/pos_messages_nl.properties

@@ -1175,3 +1175,4 @@ button.setTransfer=SET
 message.transfersamedatabase=<html><center><h4>Not able to transfer database into itself
 label.configURL=Click this link to see how to create a Database Schema
 tooltip.pickupbarcode=Find Pickup ID
+label.peopletaxid=Tax ID

src/main/resources/pos_messages_pt.properties

@@ -462,3 +462,4 @@ transpayment.ticket=Recibo
 transpayment.voucherin=Entrada de nota
 transpayment.voucherout=Sa\u00edda de nota
 Visor.Title=uniCenta oPOS
+label.peopletaxid=Tax ID

src/main/resources/pos_messages_pt_BR.properties

@@ -404,3 +404,4 @@ transpayment.ticket=Cupom
 transpayment.voucherin=Nota entrada
 transpayment.voucherout=Nota sa\u00edda
 Visor.Title=uniCenta POS
+label.peopletaxid=Tax ID