wip

.gitignore

@@ -7,7 +7,8 @@ nbactions.xml
 *.log
 docker.sock
 .DS_Store
-.settings/
+
 .classpath
-.factorypath
 .project
+.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

@@ -4,12 +4,12 @@
 
   <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>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
     <derby.version>10.14.2.0</derby.version>
   </properties>
   <dependencies>
@@ -361,7 +361,7 @@
     <dependency>
       <groupId>com.unicenta</groupId>
       <artifactId>unicenta-plugins</artifactId>
-      <version>1.3.1</version>
+      <version>1.4.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.gluonhq</groupId>

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;
 
-    /**
-     *
-     */
-    protected SerializerRead m_SerRead = null;
+  // Estado
+  private Statement statement;
 
-    // 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
-     *
-     * @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;
+  /**
+   * Creates a new instance of StaticSentence
+   *
+   * @param s
+   * @param sentence
+   */
+  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();
+      }
+
+    } 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
-     *
-     * @param s
-     * @param sentence
-     */
-    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();
-            }
+  /**
+   * @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 (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 {
-
-            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);
-        }
+      }
+    } 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", 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 Datas[] {Datas.STRING, Datas.STRING, Datas.STRING, Datas.STRING, Datas.BOOLEAN, Datas.STRING, Datas.IMAGE}
-            , new Formats[] {Formats.STRING, Formats.STRING, Formats.STRING, Formats.STRING, Formats.BOOLEAN, Formats.STRING, Formats.NULL}
+            , 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"), "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

@@ -19,10 +19,100 @@
     <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
-    <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,-128,0,0,1,-51"/>
   </AuxValues>
+
+  <Layout>
+    <DimensionLayout dim="0">
+      <Group type="103" groupAlignment="0" attributes="0">
+          <Group type="102" attributes="0">
+              <EmptySpace max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="0" attributes="0">
+                  <Group type="102" attributes="0">
+                      <Component id="jLabel3" min="-2" max="-2" attributes="0"/>
+                      <EmptySpace type="separate" max="-2" attributes="0"/>
+                      <Component id="m_jVisible" min="-2" pref="207" max="-2" attributes="0"/>
+                  </Group>
+                  <Group type="102" alignment="0" attributes="0">
+                      <Component id="jLabel2" min="-2" max="-2" attributes="0"/>
+                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                      <Component id="m_jRole" min="-2" pref="180" max="-2" attributes="0"/>
+                  </Group>
+                  <Group type="102" alignment="0" attributes="0">
+                      <Component id="jLabel4" min="-2" max="-2" attributes="0"/>
+                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                      <Component id="m_jImage" min="-2" max="-2" attributes="0"/>
+                  </Group>
+                  <Group type="102" alignment="0" attributes="0">
+                      <Component id="jLblCardID" min="-2" max="-2" attributes="0"/>
+                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                      <Component id="m_jcard" min="-2" pref="180" max="-2" attributes="0"/>
+                      <EmptySpace max="-2" attributes="0"/>
+                      <Component id="webCBSecurity" max="-2" attributes="0"/>
+                  </Group>
+                  <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="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 pref="50" max="32767" attributes="0"/>
+          </Group>
+      </Group>
+    </DimensionLayout>
+    <DimensionLayout dim="1">
+      <Group type="103" groupAlignment="0" attributes="0">
+          <Group type="102" alignment="1" attributes="0">
+              <EmptySpace type="separate" max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="3" attributes="0">
+                  <Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
+                  <Component id="m_jName" alignment="3" min="-2" max="-2" attributes="0"/>
+              </Group>
+              <EmptySpace type="unrelated" max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="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 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"/>
+                  <Component id="webCBSecurity" alignment="2" min="-2" max="-2" attributes="0"/>
+              </Group>
+              <EmptySpace type="unrelated" max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="3" attributes="0">
+                  <Component id="jLabel2" alignment="3" min="-2" max="-2" attributes="0"/>
+                  <Component id="m_jRole" alignment="3" min="-2" max="-2" attributes="0"/>
+              </Group>
+              <EmptySpace type="unrelated" max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="0" attributes="0">
+                  <Component id="jLabel3" min="-2" pref="25" max="-2" attributes="0"/>
+                  <Component id="m_jVisible" min="-2" pref="25" max="-2" attributes="0"/>
+              </Group>
+              <EmptySpace min="-2" pref="15" max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="0" attributes="0">
+                  <Component id="m_jImage" min="-2" max="-2" attributes="0"/>
+                  <Component id="jLabel4" min="-2" max="-2" attributes="0"/>
+              </Group>
+              <EmptySpace pref="110" max="32767" attributes="0"/>
+          </Group>
+      </Group>
+    </DimensionLayout>
+  </Layout>
   <SubComponents>
-    <Component class="javax.swing.JLabel" name="nameLabel">
+    <Component class="javax.swing.JLabel" name="jLabel1">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -38,10 +128,10 @@
         </Property>
       </Properties>
       <Events>
-        <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="nameLabelMouseClicked"/>
+        <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="jLabel1MouseClicked"/>
       </Events>
     </Component>
-    <Component class="javax.swing.JTextField" name="nameTextField">
+    <Component class="javax.swing.JTextField" name="m_jName">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -51,7 +141,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JCheckBox" name="isVisible">
+    <Component class="javax.swing.JCheckBox" name="m_jVisible">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="12" style="0"/>
@@ -61,7 +151,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JLabel" name="visiableLabel">
+    <Component class="javax.swing.JLabel" name="jLabel3">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -74,7 +164,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JLabel" name="imageLabel">
+    <Component class="javax.swing.JLabel" name="jLabel4">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -87,7 +177,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="com.unicenta.data.gui.JImageEditor" name="imageEditor">
+    <Component class="com.unicenta.data.gui.JImageEditor" name="m_jImage">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="12" style="0"/>
@@ -127,7 +217,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JLabel" name="roleLabel">
+    <Component class="javax.swing.JLabel" name="jLabel2">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -140,7 +230,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JTextField" name="cardIdTextField">
+    <Component class="javax.swing.JTextField" name="m_jcard">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -150,7 +240,7 @@
         </Property>
       </Properties>
     </Component>
-    <Component class="javax.swing.JLabel" name="cardIdLabel">
+    <Component class="javax.swing.JLabel" name="jLblCardID">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
           <Font name="Arial" size="14" style="0"/>
@@ -163,6 +253,32 @@
         </Property>
       </Properties>
     </Component>
+    <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"/>
+            <StringItem index="1" value="Delete exisitng key"/>
+            <StringItem index="2" value="Use iButton ID"/>
+          </StringArray>
+        </Property>
+        <Property name="selectedIndex" type="int" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+          <Connection code="0" type="code"/>
+        </Property>
+        <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="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+          <Dimension value="[140, 45]"/>
+        </Property>
+      </Properties>
+      <Events>
+        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="webCBSecurityActionPerformed"/>
+      </Events>
+    </Component>
     <Component class="javax.swing.JLabel" name="passwordLabel">
       <Properties>
         <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
@@ -176,12 +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>
-    <Component class="javax.swing.JTextField" name="taxIdTextField">
-    </Component>
   </SubComponents>
 </Form>

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

@@ -67,11 +67,11 @@ public class PeopleView extends JPanel implements EditorRecord {
     m_RoleModel = new ComboBoxValModel();
 
     m_Dirty = dirty;
-    nameTextField.getDocument().addDocumentListener(dirty);
+    m_jName.getDocument().addDocumentListener(dirty);
     m_jRole.addActionListener(dirty);
-    isVisible.addActionListener(dirty);
-    imageEditor.addPropertyChangeListener("image", dirty);
-    cardIdTextField.getDocument().addDocumentListener(dirty);
+    m_jVisible.addActionListener(dirty);
+    m_jImage.addPropertyChangeListener("image", dirty);
+    m_jcard.getDocument().addDocumentListener(dirty);
 
     m_ReasonModel = new ComboBoxValModel();
     m_ReasonModel.add(AppLocal.getIntString("cboption.generate"));
@@ -80,6 +80,7 @@ public class PeopleView extends JPanel implements EditorRecord {
 
     webCBSecurity.setModel(m_ReasonModel);
 
+    taxIdTextField.getDocument().addDocumentListener(dirty);
     writeValueEOF();
   }
 
@@ -89,19 +90,21 @@ public class PeopleView extends JPanel implements EditorRecord {
   @Override
   public void writeValueEOF() {
     m_oId = null;
-    nameTextField.setText(null);
+    m_jName.setText(null);
     m_sPassword = null;
     m_RoleModel.setSelectedKey(null);
-    isVisible.setSelected(false);
-    cardIdTextField.setText(null);
-    imageEditor.setImage(null);
-    nameTextField.setEnabled(false);
+    m_jVisible.setSelected(false);
+    m_jcard.setText(null);
+    m_jImage.setImage(null);
+    taxIdTextField.setText(null);
+    m_jName.setEnabled(false);
     m_jRole.setEnabled(false);
-    isVisible.setEnabled(false);
-    cardIdTextField.setEnabled(false);
-    imageEditor.setEnabled(false);
+    m_jVisible.setEnabled(false);
+    m_jcard.setEnabled(false);
+    m_jImage.setEnabled(false);
     jButton1.setEnabled(false);
     webCBSecurity.setEnabled(false);
+    taxIdTextField.setEnabled(false);
   }
 
   /**
@@ -110,19 +113,21 @@ public class PeopleView extends JPanel implements EditorRecord {
   @Override
   public void writeValueInsert() {
     m_oId = null;
-    nameTextField.setText(null);
+    m_jName.setText(null);
     m_sPassword = null;
     m_RoleModel.setSelectedKey(null);
-    isVisible.setSelected(true);
-    cardIdTextField.setText(null);
-    imageEditor.setImage(null);
-    nameTextField.setEnabled(true);
+    m_jVisible.setSelected(true);
+    m_jcard.setText(null);
+    m_jImage.setImage(null);
+    taxIdTextField.setText(null);
+    m_jName.setEnabled(true);
     m_jRole.setEnabled(true);
-    isVisible.setEnabled(true);
-    cardIdTextField.setEnabled(true);
-    imageEditor.setEnabled(true);
+    m_jVisible.setEnabled(true);
+    m_jcard.setEnabled(true);
+    m_jImage.setEnabled(true);
     jButton1.setEnabled(true);
     webCBSecurity.setEnabled(true);
+    taxIdTextField.setEnabled(true);
   }
 
   /**
@@ -133,20 +138,22 @@ public class PeopleView extends JPanel implements EditorRecord {
   public void writeValueDelete(Object value) {
     Object[] people = (Object[]) value;
     m_oId = people[0];
-    nameTextField.setText(Formats.STRING.formatValue(people[1]));
+    m_jName.setText(Formats.STRING.formatValue(people[1]));
     m_sPassword = Formats.STRING.formatValue(people[2]);
     m_RoleModel.setSelectedKey(people[3]);
-    isVisible.setSelected(((Boolean) people[4]).booleanValue());
-    cardIdTextField.setText(Formats.STRING.formatValue(people[5]));
-    imageEditor.setImage((BufferedImage) people[6]);
+    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]));
 
-    nameTextField.setEnabled(false);
+    m_jName.setEnabled(false);
     m_jRole.setEnabled(false);
-    isVisible.setEnabled(false);
-    cardIdTextField.setEnabled(false);
-    imageEditor.setEnabled(false);
+    m_jVisible.setEnabled(false);
+    m_jcard.setEnabled(false);
+    m_jImage.setEnabled(false);
     jButton1.setEnabled(false);
     webCBSecurity.setEnabled(false);
+    taxIdTextField.setEnabled(false);
   }
 
   /**
@@ -157,27 +164,28 @@ public class PeopleView extends JPanel implements EditorRecord {
   public void writeValueEdit(Object value) {
     Object[] people = (Object[]) value;
     m_oId = people[0];
-    nameTextField.setText(Formats.STRING.formatValue(people[1]));
+    m_jName.setText(Formats.STRING.formatValue(people[1]));
     m_sPassword = Formats.STRING.formatValue(people[2]);
     m_RoleModel.setSelectedKey(people[3]);
-    isVisible.setSelected(((Boolean) people[4]).booleanValue());
-    cardIdTextField.setText(Formats.STRING.formatValue(people[5]));
-    imageEditor.setImage((BufferedImage) people[6]);
-
-    if (cardIdTextField.getText().length() == 16) {
-      cardIdLabel.setText(AppLocal.getIntString("label.ibutton"));
+    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 {
-      cardIdLabel.setText(AppLocal.getIntString("label.card"));
+      jLblCardID.setText(AppLocal.getIntString("label.card"));
     }
-    System.out.println(cardIdTextField.getText().length());
+    // System.out.println(m_jcard.getText().length());
 
-    nameTextField.setEnabled(true);
+    m_jName.setEnabled(true);
     m_jRole.setEnabled(true);
-    isVisible.setEnabled(true);
-    cardIdTextField.setEnabled(true);
-    imageEditor.setEnabled(true);
+    m_jVisible.setEnabled(true);
+    m_jcard.setEnabled(true);
+    m_jImage.setEnabled(true);
     jButton1.setEnabled(true);
     webCBSecurity.setEnabled(true);
+    taxIdTextField.setEnabled(true);
   }
 
   /**
@@ -187,14 +195,15 @@ public class PeopleView extends JPanel implements EditorRecord {
    */
   @Override
   public Object createValue() throws BasicException {
-    Object[] people = new Object[7];
+    Object[] people = new Object[8];
     people[0] = m_oId == null ? UUID.randomUUID().toString() : m_oId;
-    people[1] = Formats.STRING.parseValue(nameTextField.getText());
+    people[1] = Formats.STRING.parseValue(m_jName.getText());
     people[2] = Formats.STRING.parseValue(m_sPassword);
     people[3] = m_RoleModel.getSelectedKey();
-    people[4] = isVisible.isSelected();
-    people[5] = Formats.STRING.parseValue(cardIdTextField.getText());
-    people[6] = imageEditor.getImage();
+    people[4] = m_jVisible.isSelected();
+    people[5] = Formats.STRING.parseValue(m_jcard.getText());
+    people[6] = m_jImage.getImage();
+    people[7] = Formats.STRING.parseValue(taxIdTextField.getText());
     return people;
   }
 
@@ -231,59 +240,55 @@ public class PeopleView extends JPanel implements EditorRecord {
    * always regenerated by the Form Editor.
    */
   // <editor-fold defaultstate="collapsed" desc="Generated
+  // <editor-fold defaultstate="collapsed" desc="Generated
   // Code">//GEN-BEGIN:initComponents
   private void initComponents() {
 
-    nameLabel = new javax.swing.JLabel();
-    nameTextField = new javax.swing.JTextField();
-    isVisible = new javax.swing.JCheckBox();
-    visiableLabel = new javax.swing.JLabel();
-    imageLabel = new javax.swing.JLabel();
-    imageEditor = new com.unicenta.data.gui.JImageEditor();
+    jLabel1 = new javax.swing.JLabel();
+    m_jName = new javax.swing.JTextField();
+    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();
-    roleLabel = new javax.swing.JLabel();
-    cardIdTextField = new javax.swing.JTextField();
-    cardIdLabel = new javax.swing.JLabel();
+    jLabel2 = new javax.swing.JLabel();
+    m_jcard = new javax.swing.JTextField();
+    jLblCardID = new javax.swing.JLabel();
+    webCBSecurity = new javax.swing.JComboBox();
     passwordLabel = new javax.swing.JLabel();
-    taxIdLabel = new javax.swing.JLabel();
     taxIdTextField = new javax.swing.JTextField();
+    taxIdLabel = new javax.swing.JLabel();
 
     setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
     setPreferredSize(new java.awt.Dimension(500, 500));
 
-    nameLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    nameLabel.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/info.png"))); // NOI18N
-    nameLabel.setText(AppLocal.getIntString("label.peoplenamem")); // NOI18N
-    nameLabel.setPreferredSize(new java.awt.Dimension(110, 30));
-    nameLabel.addMouseListener(new java.awt.event.MouseAdapter() {
+    jLabel1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/info.png"))); // NOI18N
+    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) {
-        nameLabelMouseClicked(evt);
+        jLabel1MouseClicked(evt);
       }
     });
-    add(nameLabel);
 
-    nameTextField.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    nameTextField.setPreferredSize(new java.awt.Dimension(0, 30));
-    add(nameTextField);
+    m_jName.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    m_jName.setPreferredSize(new java.awt.Dimension(0, 30));
 
-    isVisible.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
-    isVisible.setPreferredSize(new java.awt.Dimension(0, 30));
-    add(isVisible);
+    m_jVisible.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
+    m_jVisible.setPreferredSize(new java.awt.Dimension(0, 30));
 
-    visiableLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    visiableLabel.setText(AppLocal.getIntString("label.peoplevisible")); // NOI18N
-    visiableLabel.setPreferredSize(new java.awt.Dimension(110, 30));
-    add(visiableLabel);
+    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));
 
-    imageLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    imageLabel.setText(AppLocal.getIntString("label.peopleimage")); // NOI18N
-    imageLabel.setPreferredSize(new java.awt.Dimension(110, 30));
-    add(imageLabel);
+    jLabel4.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    jLabel4.setText(AppLocal.getIntString("label.peopleimage")); // NOI18N
+    jLabel4.setPreferredSize(new java.awt.Dimension(110, 30));
 
-    imageEditor.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
-    imageEditor.setPreferredSize(new java.awt.Dimension(300, 250));
-    add(imageEditor);
+    m_jImage.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
+    m_jImage.setPreferredSize(new java.awt.Dimension(300, 250));
 
     jButton1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
     jButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/password.png"))); // NOI18N
@@ -295,34 +300,140 @@ public class PeopleView extends JPanel implements EditorRecord {
         jButton1ActionPerformed(evt);
       }
     });
-    add(jButton1);
 
     m_jRole.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
     m_jRole.setPreferredSize(new java.awt.Dimension(0, 30));
-    add(m_jRole);
 
-    roleLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    roleLabel.setText(AppLocal.getIntString("label.rolem")); // NOI18N
-    roleLabel.setPreferredSize(new java.awt.Dimension(110, 30));
-    add(roleLabel);
+    jLabel2.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    jLabel2.setText(AppLocal.getIntString("label.rolem")); // NOI18N
+    jLabel2.setPreferredSize(new java.awt.Dimension(110, 30));
 
-    cardIdTextField.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    cardIdTextField.setPreferredSize(new java.awt.Dimension(0, 30));
-    add(cardIdTextField);
+    m_jcard.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    m_jcard.setPreferredSize(new java.awt.Dimension(0, 30));
 
-    cardIdLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
-    cardIdLabel.setText(AppLocal.getIntString("label.card")); // NOI18N
-    cardIdLabel.setPreferredSize(new java.awt.Dimension(110, 30));
-    add(cardIdLabel);
+    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.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    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.setPreferredSize(new java.awt.Dimension(140, 45));
+    webCBSecurity.addActionListener(new java.awt.event.ActionListener() {
+      public void actionPerformed(java.awt.event.ActionEvent evt) {
+        webCBSecurityActionPerformed(evt);
+      }
+    });
 
     passwordLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
     passwordLabel.setText(AppLocal.getIntString("label.Password")); // NOI18N
     passwordLabel.setPreferredSize(new java.awt.Dimension(110, 30));
-    add(passwordLabel);
 
+    taxIdTextField.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
+    taxIdTextField.setPreferredSize(new java.awt.Dimension(0, 30));
+
+    taxIdLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
     taxIdLabel.setText("Tax ID");
-    add(taxIdLabel);
-    add(taxIdTextField);
+
+    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)
+                        .addGap(18, 18, 18)
+                        .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)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                        .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)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                        .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)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                        .addComponent(m_jcard, javax.swing.GroupLayout.PREFERRED_SIZE, 180,
+                            javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .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(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(taxIdTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 180,
+                                javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE,
+                                javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addComponent(m_jName, javax.swing.GroupLayout.PREFERRED_SIZE, 180,
+                                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(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(passwordLabel, javax.swing.GroupLayout.PREFERRED_SIZE,
+                        javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .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(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(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(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(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
+                        javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addContainerGap(110, Short.MAX_VALUE)));
   }// </editor-fold>//GEN-END:initComponents
 
   private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_jButton1ActionPerformed
@@ -343,7 +454,7 @@ public class PeopleView extends JPanel implements EditorRecord {
           AppLocal.getIntString("title.editor"),
           JOptionPane.YES_NO_OPTION,
           JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
-        cardIdTextField.setText("C" + StringUtils.getCardNumber());
+        m_jcard.setText("C" + StringUtils.getCardNumber());
         m_Dirty.setDirty(true);
       }
     }
@@ -354,7 +465,7 @@ public class PeopleView extends JPanel implements EditorRecord {
           AppLocal.getIntString("title.editor"),
           JOptionPane.YES_NO_OPTION,
           JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
-        cardIdTextField.setText(null);
+        m_jcard.setText(null);
         m_Dirty.setDirty(true);
       }
     }
@@ -367,8 +478,8 @@ public class PeopleView extends JPanel implements EditorRecord {
           JOptionPane.INFORMATION_MESSAGE) == JOptionPane.OK_OPTION)
 
       {
-        cardIdTextField.setText(uOWWatch.getibuttonid());
-        cardIdLabel.setText(AppLocal.getIntString("label.ibutton"));
+        m_jcard.setText(uOWWatch.getibuttonid());
+        jLblCardID.setText(AppLocal.getIntString("label.ibutton"));
         m_Dirty.setDirty(true);
       }
 
@@ -376,7 +487,7 @@ public class PeopleView extends JPanel implements EditorRecord {
 
   }// GEN-LAST:event_webCBSecurityActionPerformed
 
-  private void nameLabelMouseClicked(java.awt.event.MouseEvent evt) {// GEN-FIRST:event_nameLabelMouseClicked
+  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);
@@ -386,24 +497,24 @@ public class PeopleView extends JPanel implements EditorRecord {
       JOptionPane.showMessageDialog(null,
           AppLocal.getIntString("message.uuidcopy"));
     }
-  }// GEN-LAST:event_nameLabelMouseClicked
+  }// GEN-LAST:event_jLabel1MouseClicked
 
   // Variables declaration - do not modify//GEN-BEGIN:variables
-  private javax.swing.JLabel cardIdLabel;
-  private javax.swing.JTextField cardIdTextField;
-  private com.unicenta.data.gui.JImageEditor imageEditor;
-  private javax.swing.JLabel imageLabel;
-  private javax.swing.JCheckBox isVisible;
   private javax.swing.JButton jButton1;
+  private javax.swing.JLabel jLabel1;
+  private javax.swing.JLabel jLabel2;
+  private javax.swing.JLabel jLabel3;
+  private javax.swing.JLabel jLabel4;
+  private javax.swing.JLabel jLblCardID;
+  private com.unicenta.data.gui.JImageEditor m_jImage;
+  private javax.swing.JTextField m_jName;
   private javax.swing.JComboBox m_jRole;
-  private javax.swing.JLabel nameLabel;
-  private javax.swing.JTextField nameTextField;
+  private javax.swing.JCheckBox m_jVisible;
+  private javax.swing.JTextField m_jcard;
   private javax.swing.JLabel passwordLabel;
-  private javax.swing.JLabel roleLabel;
   private javax.swing.JLabel taxIdLabel;
   private javax.swing.JTextField taxIdTextField;
-  private javax.swing.JLabel visiableLabel;
-  private com.alee.laf.combobox.WebComboBox webCBSecurity;
+  private javax.swing.JComboBox webCBSecurity;
   // End of variables declaration//GEN-END:variables
 
 }

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
-            : newclass;
+        ? classname
+        : newclass;
   }
 
   private static void initOldClasses() {
@@ -222,7 +224,8 @@ public class AppUser {
 
     m_oldclasses.put("Menu.StockManagement", "com.unicenta.pos.forms.MenuStockManagement");
     m_oldclasses.put("net.adrianromero.tpv.inventory.ProductsPanel", "com.unicenta.pos.inventory.ProductsPanel");
-    m_oldclasses.put("net.adrianromero.tpv.inventory.ProductsWarehousePanel", "com.unicenta.pos.inventory.ProductsWarehousePanel");
+    m_oldclasses.put("net.adrianromero.tpv.inventory.ProductsWarehousePanel",
+        "com.unicenta.pos.inventory.ProductsWarehousePanel");
     m_oldclasses.put("net.adrianromero.tpv.inventory.CategoriesPanel", "com.unicenta.pos.inventory.CategoriesPanel");
     m_oldclasses.put("net.adrianromero.tpv.panels.JPanelTax", "com.unicenta.pos.inventory.TaxPanel");
     m_oldclasses.put("net.adrianromero.tpv.inventory.StockDiaryPanel", "com.unicenta.pos.inventory.StockDiaryPanel");
@@ -300,5 +303,4 @@ public class AppUser {
     }
   }
 
-
 }

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/PaymentInfoCash.java

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

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

@@ -26,73 +26,83 @@ import com.unicenta.format.Formats;
  * @author JG uniCenta
  */
 public class PaymentInfoCash_original extends PaymentInfo {
-    
-    private final double m_dPaid;
-    private final double m_dTotal;
-    private double m_dTendered;    
-    private final String m_dCardName =null;
-//    private double m_dTip;    
-    
-    /** Creates a new instance of PaymentInfoCash
-     * @param dTotal
-     * @param dPaid */
-    public PaymentInfoCash_original(double dTotal, double dPaid) {
-        m_dTotal = dTotal;
-        m_dPaid = dPaid;
-    }
-    
-    @Override
-    public PaymentInfo copyPayment(){
-        return new PaymentInfoCash_original(m_dTotal, m_dPaid);
-    }
-    
-    @Override
-    public String getTransactionID(){
-        return "no ID";
-    }
 
-    @Override
-    public String getName() {
-        return "cash";
-    }   
-    @Override
-    public double getTotal() {
-        return m_dTotal;
-    }   
-/**    public double getTip() {
-        return m_dTip;
-    }
-     * @return 
-*/
-    @Override
-    public double getPaid() {
-        return m_dPaid;
-    }
+  private final double m_dPaid;
+  private final double m_dTotal;
+  private double m_dTendered;
+  private final String m_dCardName = null;
+  private String m_sName = "cash";
+  // private double m_dTip;
 
-    @Override
-    public double getTendered() {
-        return m_dTendered;
-    }
+  /**
+   * Creates a new instance of PaymentInfoCash
+   * 
+   * @param dTotal
+   * @param dPaid
+   */
+  public PaymentInfoCash_original(double dTotal, double dPaid) {
+    m_dTotal = dTotal;
+    m_dPaid = dPaid;
+  }
 
-    @Override
-    public double getChange(){
-       return m_dPaid - m_dTotal;
-   }
+  @Override
+  public PaymentInfo copyPayment() {
+    return new PaymentInfoCash_original(m_dTotal, m_dPaid);
+  }
 
-    @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 getTransactionID() {
+    return "no ID";
+  }
+
+  @Override
+  public String getName() {
+    return "cash";
+  }
+
+  @Override
+  public double getTotal() {
+    return m_dTotal;
+  }
+
+  /**
+   * public double getTip() {
+   * return m_dTip;
+   * }
+   * 
+   * @return
+   */
+  @Override
+  public double getPaid() {
+    return m_dPaid;
+  }
+
+  @Override
+  public double getTendered() {
+    return m_dTendered;
+  }
+
+  @Override
+  public double getChange() {
+    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;
+  }
 
-    @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;
-    protected double m_dTip;
-    protected String m_sHolderName;
-    protected String m_sCardNumber;
-    protected String m_sExpirationDate;
-    protected String track1;
-    protected String track2;
-    protected String track3;
-    protected String m_sTransactionID;
-    protected String m_sAuthorization;
-    protected String m_sErrorMessage;
-    protected String m_sReturnMessage;
-    //JG Jan 2018 
-    protected String encryptedTrack;
-    protected String encryptionKey;
-    protected String m_dCardName =null;
+  private String m_sName = "creditcard";
+  protected double m_dTotal;
+  protected double m_dTip;
+  protected String m_sHolderName;
+  protected String m_sCardNumber;
+  protected String m_sExpirationDate;
+  protected String track1;
+  protected String track2;
+  protected String track3;
+  protected String m_sTransactionID;
+  protected String m_sAuthorization;
+  protected String m_sErrorMessage;
+  protected String m_sReturnMessage;
+  // JG Jan 2018
+  protected String encryptedTrack;
+  protected String encryptionKey;
+  protected String m_dCardName = null;
 
-    protected Boolean chipAndPin = Boolean.FALSE;
-    protected String verification;
-    protected String lastFourDigits;
+  protected Boolean chipAndPin = Boolean.FALSE;
+  protected String verification;
+  protected String lastFourDigits;
 
-    /**
-     * Creates a new instance of PaymentInfoMagcard
-     * @param sHolderName
-     * @param sCardNumber
-     * @param sExpirationDate
-     * @param track1
-     * @param track2
-     * @param track3
-     * @param encryptedCard
-     * @param encryptKey
-     * @param sTransactionID
-     * @param dTotal
-     */
-    public PaymentInfoMagcard(String sHolderName, String sCardNumber,
-                              String sExpirationDate, String track1, String track2, String track3, String encryptedCard, String encryptKey,
-                              String sTransactionID, double dTotal) {
-        m_sHolderName = sHolderName;
-        m_sCardNumber = sCardNumber;
-        m_sExpirationDate = sExpirationDate;
-        this.track1 = track1;
-        this.track2 = track2;
-        this.track3 = track3;
-        encryptedTrack = encryptedCard;
-        encryptionKey = encryptKey;
-        m_sTransactionID = sTransactionID;
-        m_dTotal = dTotal;
+  /**
+   * Creates a new instance of PaymentInfoMagcard
+   * 
+   * @param sHolderName
+   * @param sCardNumber
+   * @param sExpirationDate
+   * @param track1
+   * @param track2
+   * @param track3
+   * @param encryptedCard
+   * @param encryptKey
+   * @param sTransactionID
+   * @param dTotal
+   */
+  public PaymentInfoMagcard(String sHolderName, String sCardNumber,
+      String sExpirationDate, String track1, String track2, String track3, String encryptedCard, String encryptKey,
+      String sTransactionID, double dTotal) {
+    m_sHolderName = sHolderName;
+    m_sCardNumber = sCardNumber;
+    m_sExpirationDate = sExpirationDate;
+    this.track1 = track1;
+    this.track2 = track2;
+    this.track3 = track3;
+    encryptedTrack = encryptedCard;
+    encryptionKey = encryptKey;
+    m_sTransactionID = sTransactionID;
+    m_dTotal = dTotal;
 
+    m_sAuthorization = null;
+    m_sErrorMessage = null;
+    m_sReturnMessage = null;
+  }
 
-        m_sAuthorization = null;
-        m_sErrorMessage = null;
-        m_sReturnMessage = null;
+  /**
+   * Creates a new instance of PaymentInfoMagcard
+   * 
+   * @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);
+  }
 
-    /**
-     * Creates a new instance of PaymentInfoMagcard
-     * @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);
+  public String getCardNumber() {
+    return m_sCardNumber;
+  }
+
+  public String getExpirationDate() {
+    return m_sExpirationDate;
+  }
+
+  @Override
+  public String getTransactionID() {
+    return m_sTransactionID;
+  }
+
+  /**
+   * 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 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 getTrack1(boolean framingChar) {
+    return (framingChar)
+        ? track1
+        : track1.substring(1, track1.length() - 2);
+  }
+
+  public String getTrack2(boolean framingChar) {
+    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() {
-//        return "magcard";
-        return "ccard";
-    }
+  public String printExpirationDate() {
+    return m_sExpirationDate;
+  }
 
-    @Override
-    public double getTotal() {
-        return m_dTotal;
-    }
+  public String printAuthorization() {
+    return m_sAuthorization;
+  }
 
-    public double getTip() {
-        return m_dTip;
-    }
+  public String printTransactionID() {
+    return m_sTransactionID;
+  }
 
-    public boolean isPaymentOK() {
-        return m_sAuthorization != null;
-    }
+  public boolean getIsProcessed() {
+    throw new UnsupportedOperationException("Not supported yet.");
+  }
 
-    public String getHolderName() {
-        return m_sHolderName;
-    }
+  public void setIsProcessed(boolean value) {
+    throw new UnsupportedOperationException("Not supported yet.");
+  }
 
-    @Override
-    public String getCardName() {
-        if (chipAndPin){
-            return m_dCardName;
-        }
-        return getCardType(m_sCardNumber);
-    }
+  @Override
+  public double getPaid() {
+    return (0.0);
+  }
 
-    public String getCardNumber() {
-        return m_sCardNumber;
-    }
+  @Override
+  public double getChange() {
+    return 0.00;
+  }
 
-    public String getExpirationDate() {
-        return m_sExpirationDate;
-    }
+  @Override
+  public double getTendered() {
+    return 0.00;
+  }
 
-    @Override
-    public String getTransactionID() {
-        return m_sTransactionID;
-    }
+  @Override
+  public String getVoucher() {
+    return null;
+  }
 
-    /**
-     * 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 void setCardName(String m_dCardName) {
+    this.m_dCardName = m_dCardName;
+  }
 
-    public String getEncryptionKey() {
-        return encryptionKey;
-    }
+  public Boolean isChipAndPin() {
+    return chipAndPin;
+  }
 
-    /** @param sCardNumber
-     * @return
-     */
-    public String getCardType(String sCardNumber){
-        String c = "UNKNOWN";
+  public void setChipAndPin(Boolean chipAndPin) {
+    this.chipAndPin = chipAndPin;
+  }
 
-        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;
-    }
+  public String printVerification() {
+    return verification;
+  }
 
-    public String getTrack1(boolean framingChar) {
-        return (framingChar)
-                ? track1
-                : track1.substring(1, track1.length() - 2);
-    }
+  public void setVerification(String verification) {
+    this.verification = verification;
+  }
 
-    public String getTrack2(boolean framingChar) {
-        return (framingChar)
-                ? track2
-                : track2.substring(1, track2.length() - 2);
-    }
+  public String getLastFourDigits() {
+    return lastFourDigits;
+  }
 
-    public String getTrack3(boolean framingChar) {
-        return (framingChar)
-                ? track3
-                : track3.substring(1, track3.length() - 2);
-    }
+  public String printLastFourDigits() {
+    return lastFourDigits;
+  }
 
-    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 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;
-    }
-}
+  public void setLastFourDigits(String lastFourDigits) {
+    this.lastFourDigits = lastFourDigits;
+  }
+}

src/main/java/com/unicenta/pos/sales/DataLogicReceipts.java

@@ -37,330 +37,348 @@ import java.util.List;
  * @author adrianromero
  */
 public class DataLogicReceipts extends BeanFactoryDataSingle {
-
-  private Session s;
-
-  /** Creates a new instance of DataLogicReceipts */
-  public DataLogicReceipts() {
-  }
-
-  /**
-   *
-   * @param s
-   */
-  @Override
-  public void init(Session s) {
-    this.s = s;
-  }
-
-  /**
-   *
-   * @param Id
-   * @return
-   * @throws BasicException
-   */
-  public final TicketInfo getSharedTicket(String Id) throws BasicException {
-
-    if (Id == null) {
-      return null;
-    } else {
-      Object[] record = (Object[]) new StaticSentence(s, "SELECT CONTENT, LOCKED FROM sharedtickets WHERE ID = ?",
-          SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] {
-              Datas.SERIALIZABLE }))
-          .find(Id);
-      return record == null ? null : (TicketInfo) record[0];
+    
+    private Session s;
+    
+    /** Creates a new instance of DataLogicReceipts */
+    public DataLogicReceipts() {
     }
-  }
-
-  /**
-   *
-   * @param pickupId
-   * @return
-   * @throws BasicException
-   */
-  public final TicketInfo getSharedTicketPickupId(String pickupId) throws BasicException {
-
-    if (pickupId == null) {
-      return null;
-    } else {
-      Object[] record = (Object[]) new StaticSentence(s, "SELECT CONTENT, LOCKED FROM sharedtickets WHERE PICKUPID = ?",
-          SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] {
-              Datas.SERIALIZABLE }))
-          .find(pickupId);
-      return record == null ? null : (TicketInfo) record[0];
+    
+    /**
+     *
+     * @param s
+     */
+    @Override
+    public void init(Session s){
+        this.s = s;
     }
-  }
-
-  /**
-   * JG Dec 14 Administrator and Manager Roles always have access to ALL
-   * SHAREDtickets
-   * 
-   * @return
-   * @throws BasicException
-   */
-  public final List<SharedTicketInfo> getSharedTicketList() throws BasicException {
-
-    return (List<SharedTicketInfo>) new StaticSentence(s
-    // , "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED FROM sharedtickets
-    // ORDER BY ID"
-        , "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED "
-            + "FROM sharedtickets ORDER BY PICKUPID",
-        null, new SerializerReadClass(SharedTicketInfo.class)).list();
-  }
-
-  /**
-   * Return only current APPUSER SHAREDtickets
-   * 
-   * @param appuser
-   * @return
-   * @throws BasicException
-   */
-  public final List<SharedTicketInfo> getUserSharedTicketList(String appuser) throws BasicException {
-    String sql = "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED "
-        + "FROM sharedtickets "
-        + "WHERE APPUSER =\"" + appuser + "\" ORDER BY PICKUPID";
-
-    return (List<SharedTicketInfo>) new StaticSentence(s, sql, null, new SerializerReadClass(SharedTicketInfo.class))
-        .list();
-  }
-
-  /**
-   * For Standard View
-   * 
-   * @param id
-   * @param ticket
-   * @param pickupid
-   * @throws BasicException
-   */
-  public final void insertSharedTicket(final String id, final TicketInfo ticket, int pickupid) throws BasicException {
-
-    Object[] values = new Object[] {
-        id,
-        ticket.getName(),
-        ticket,
-        ticket.getUserInfo().getId(),
-        pickupid
-
-    };
-    Datas[] datas;
-    datas = new Datas[] {
-        Datas.STRING,
-        Datas.STRING,
-        Datas.SERIALIZABLE,
-        Datas.STRING,
-        Datas.INT
-
-    };
-    new PreparedSentence(s, "INSERT INTO sharedtickets ("
-        + "ID, "
-        + "NAME, "
-        + "CONTENT, "
-        + "APPUSER, "
-        + "PICKUPID) "
-        + "VALUES (?, ?, ?, ?, ?)", new SerializerWriteBasicExt(datas, new int[] { 0, 1, 2, 3, 4 })).exec(values);
-  }
-
-  /**
-   *
-   * @param id
-   * @param ticket
-   * @param pickupid
-   * @throws BasicException
-   */
-  public final void updateSharedTicket(final String id, final TicketInfo ticket, int pickupid) throws BasicException {
-
-    Object[] values = new Object[] {
-        id,
-        ticket.getName(),
-        ticket,
-        ticket.getUserInfo().getId(),
-        pickupid
-    };
-    Datas[] datas = new Datas[] {
-        Datas.STRING,
-        Datas.STRING,
-        Datas.SERIALIZABLE,
-        Datas.STRING,
-        Datas.INT
-    };
-    new PreparedSentence(s, "UPDATE sharedtickets SET "
-        + "NAME = ?, "
-        + "CONTENT = ?, "
-        + "APPUSER = ?, "
-        + "PICKUPID = ? "
-        + "WHERE ID = ?",
-        new SerializerWriteBasicExt(datas,
-            new int[] {
-                1, 2, 3, 4, 0 }))
-        .exec(values);
-  }
-
-  /**
-   *
-   * @param id
-   * @param ticket
-   * @param pickupid
-   * @throws BasicException
-   */
-  public final void updateRSharedTicket(
-      final String id,
-      final TicketInfo ticket,
-      int pickupid) throws BasicException {
-
-    Object[] values = new Object[] {
-        id,
-        ticket.getName(),
-        ticket,
-        pickupid
-    };
-    Datas[] datas = new Datas[] {
-        Datas.STRING,
-        Datas.STRING,
-        Datas.SERIALIZABLE,
-        Datas.INT
-    };
-    new PreparedSentence(s, "UPDATE sharedtickets SET "
-        + "NAME = ?, "
-        + "CONTENT = ?, "
-        + "PICKUPID = ? "
-        + "WHERE ID = ?", new SerializerWriteBasicExt(datas, new int[] { 1, 2, 3, 0 })).exec(values);
-  }
-
-  /**
-   * In place for multi-purposing like containing data from elsewhere and/or
-   * using Place and User for Notifications
-   * 
-   * @param id
-   * @param locked
-   * @throws BasicException
-   */
-  public final void lockSharedTicket(final String id, final String locked) throws BasicException {
-
-    Object[] values = new Object[] {
-        id,
-        locked
-    };
-    Datas[] datas = new Datas[] {
-        Datas.STRING,
-        Datas.STRING
-    };
-    new PreparedSentence(s, "UPDATE sharedtickets SET "
-        + "LOCKED = ? "
-        + "WHERE ID = ?", new SerializerWriteBasicExt(datas, new int[] { 1, 0 })).exec(values);
-  }
-
-  /**
-   * In place for multi-purposing like flushing locks from elsewhere and/or
-   * using Place and User for Notifications
-   * 
-   * @param id
-   * @param unlocked
-   * @throws BasicException
-   */
-  public final void unlockSharedTicket(final String id, final String unlocked) throws BasicException {
-
-    Object[] values = new Object[] {
-        id,
-        unlocked
-    };
-    Datas[] datas = new Datas[] {
-        Datas.STRING,
-        Datas.STRING
-    };
-    new PreparedSentence(s, "UPDATE sharedtickets SET "
-        + "LOCKED = ? "
-        + "WHERE ID = ?", new SerializerWriteBasicExt(datas, new int[] { 1, 0 })).exec(values);
-  }
-
-  /**
-   * For Restaurant View
-   * 
-   * @param id
-   * @param ticket
-   * @param pickupid
-   * @throws BasicException
-   */
-  public final void insertRSharedTicket(
-      final String id,
-      final TicketInfo ticket,
-      int pickupid) throws BasicException {
-
-    Object[] values = new Object[] {
-        id,
-        ticket.getName(),
-        ticket,
-        ticket.getUserInfo(),
-        ticket.getPickupId(),
-        ticket.getHost()
-    };
-    Datas[] datas;
-    datas = new Datas[] {
-        Datas.STRING,
-        Datas.STRING,
-        Datas.SERIALIZABLE,
-        Datas.STRING,
-        Datas.INT
-
-    };
-    new PreparedSentence(s, "INSERT INTO sharedtickets ("
-        + "ID, "
-        + "NAME, "
-        + "CONTENT, "
-        + "APPUSER, "
-        + "PICKUPID) "
-        + "VALUES (?, ?, ?, ?, ?)", new SerializerWriteBasicExt(datas, new int[] { 0, 1, 2, 3, 4 })).exec(values);
-  }
-
-  /**
-   * 
-   * @param id
-   * @throws BasicException
-   */
-  public final void deleteSharedTicket(final String id) throws BasicException {
-
-    new StaticSentence(s, "DELETE FROM sharedtickets WHERE ID = ?", SerializerWriteString.INSTANCE).exec(id);
-  }
-
-  /**
-   *
-   * @param Id
-   * @return
-   * @throws BasicException
-   */
-  public final Integer getPickupId(String Id) throws BasicException {
-
-    if (Id == null) {
-      return null;
-    } else {
-      Object[] record = (Object[]) new StaticSentence(s, "SELECT PICKUPID FROM sharedtickets WHERE ID = ?",
-          SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] { Datas.INT })).find(Id);
-      return record == null ? 0 : (Integer) record[0];
+     
+    /**
+     *
+     * @param Id
+     * @return
+     * @throws BasicException
+     */
+    public final TicketInfo getSharedTicket(String Id) throws BasicException {
+        
+        if (Id == null) {
+            return null; 
+        } else {
+            Object[]record = (Object[]) new StaticSentence(s
+                    , "SELECT CONTENT, LOCKED FROM sharedtickets WHERE ID = ?"
+                    , SerializerWriteString.INSTANCE
+                    , new SerializerReadBasic(new Datas[] {
+                        Datas.SERIALIZABLE})).find(Id);
+            return record == null ? null : (TicketInfo) record[0];
+        }
     }
-  }
+    
+        /**
+     *
+     * @param pickupId
+     * @return
+     * @throws BasicException
+     */
+    public final TicketInfo getSharedTicketPickupId(String pickupId) throws BasicException {
+        
+        if (pickupId == null) {
+            return null; 
+        } else {
+            Object[]record = (Object[]) new StaticSentence(s
+                    , "SELECT CONTENT, LOCKED FROM sharedtickets WHERE PICKUPID = ?"
+                    , SerializerWriteString.INSTANCE
+                    , new SerializerReadBasic(new Datas[] {
+                        Datas.SERIALIZABLE})).find(pickupId);
+            return record == null ? null : (TicketInfo) record[0];
+        }
+    } 
 
-  public final String getUserId(final String id) throws BasicException {
-    Object[] userID = (Object[]) new StaticSentence(s, "SELECT APPUSER FROM sharedtickets WHERE ID = ?",
-        SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] { Datas.STRING })).find(id);
-    if (userID == null) {
-      return null;
-    } else {
-      return (String) userID[0];
+    /**
+     * JG Dec 14 Administrator and Manager Roles always have access to ALL SHAREDtickets
+     * @return
+     * @throws BasicException
+     */
+    public final List<SharedTicketInfo> getSharedTicketList() throws BasicException {
+        
+        return (List<SharedTicketInfo>) new StaticSentence(s
+//                , "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED FROM sharedtickets ORDER BY ID"
+                , "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED "
+                        + "FROM sharedtickets ORDER BY PICKUPID" 
+                , null
+                , new SerializerReadClass(SharedTicketInfo.class)).list();
     }
-  }
+    
+    /**
+     * Return only current APPUSER SHAREDtickets
+     * @param appuser
+     * @return
+     * @throws BasicException
+     */
+    public final List<SharedTicketInfo> getUserSharedTicketList(String appuser) throws BasicException {
+        String sql = "SELECT ID, NAME, CONTENT, APPUSER, PICKUPID, LOCKED " 
+                + "FROM sharedtickets "
+                + "WHERE APPUSER =\""+ appuser +"\" ORDER BY PICKUPID";
+        
+            return (List<SharedTicketInfo>) new StaticSentence(s
+            , sql
+            , null
+            , new SerializerReadClass(SharedTicketInfo.class)).list();
+    }
+    
+    /**
+     * For Standard View
+     * @param id
+     * @param ticket
+     * @param pickupid
+     * @throws BasicException
+     */
+    public final void insertSharedTicket(final String id, final TicketInfo ticket, int pickupid) throws BasicException {
+        
+        Object[] values = new Object[] {
+            id, 
+            ticket.getName(), 
+            ticket,
+            ticket.getUser().getId(),
+            pickupid
 
-  public final String getLockState(final String id, String lockState) throws BasicException {
-    Object[] state = (Object[]) new StaticSentence(s, "SELECT LOCKED FROM sharedtickets WHERE ID = ?",
-        SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] {
+        };
+        Datas[] datas;
+        datas = new Datas[] {
+            Datas.STRING, 
+            Datas.STRING, 
+            Datas.SERIALIZABLE, 
+            Datas.STRING,            
+            Datas.INT
+
+        };
+        new PreparedSentence(s
+            , "INSERT INTO sharedtickets ("
+                + "ID, "
+                + "NAME, "
+                + "CONTENT, "
+                + "APPUSER, "                    
+                + "PICKUPID) "
+                + "VALUES (?, ?, ?, ?, ?)"                
+            , new SerializerWriteBasicExt(datas, new int[] {0, 1, 2, 3, 4})).exec(values);                
+    }
+    
+    /**
+     *
+     * @param id
+     * @param ticket
+     * @param pickupid
+     * @throws BasicException
+     */
+    public final void updateSharedTicket(final String id, final TicketInfo ticket, int pickupid) throws BasicException {
+            
+        Object[] values = new Object[] {
+            id, 
+            ticket.getName(), 
+            ticket, 
+            ticket.getUser().getId(),
+            pickupid
+        };
+        Datas[] datas = new Datas[] {
+            Datas.STRING, 
+            Datas.STRING, 
+            Datas.SERIALIZABLE, 
+            Datas.STRING,
+            Datas.INT
+        };
+        new PreparedSentence(s
+                , "UPDATE sharedtickets SET "
+                + "NAME = ?, "
+                + "CONTENT = ?, "
+                + "APPUSER = ?, "                        
+                + "PICKUPID = ? "
+                + "WHERE ID = ?"
+                , new SerializerWriteBasicExt(datas, 
+                        new int[] {
+                            1, 2, 3, 4, 0})).exec(values);
+    }
+
+    /**
+     *
+     * @param id
+     * @param ticket
+     * @param pickupid
+     * @throws BasicException
+     */
+    public final void updateRSharedTicket(
+            final String id, 
+            final TicketInfo ticket, 
+            int pickupid) throws BasicException {
+            
+        Object[] values = new Object[] {
+            id, 
+            ticket.getName(), 
+            ticket, 
+            pickupid
+        };
+        Datas[] datas = new Datas[] {
+            Datas.STRING, 
+            Datas.STRING, 
+            Datas.SERIALIZABLE, 
+            Datas.INT
+        };
+        new PreparedSentence(s
+                , "UPDATE sharedtickets SET "
+                + "NAME = ?, "
+                + "CONTENT = ?, "
+                + "PICKUPID = ? "
+                + "WHERE ID = ?"
+                , new SerializerWriteBasicExt(datas, new int[] {1, 2, 3, 0})).exec(values);                
+    }
+    
+     /**
+     * In place for multi-purposing like containing data from elsewhere and/or
+     * using Place and User for Notifications
+     * @param id
+     * @param locked
+     * @throws BasicException
+     */
+    public final void lockSharedTicket(final String id, final String locked) throws BasicException {
+            
+        Object[] values = new Object[] {
+            id, 
+            locked
+        };
+        Datas[] datas = new Datas[] {
+            Datas.STRING, 
             Datas.STRING
-        })).find(id);
-    return (String) state[0];
-  }
+        };
+        new PreparedSentence(s
+                , "UPDATE sharedtickets SET "
+                + "LOCKED = ? "
+                + "WHERE ID = ?"
+                , new SerializerWriteBasicExt(datas, new int[] {1, 0})).exec(values);
+    }
 
-  public final String getServer(final String id, String user) throws BasicException {
-    Object[] server = (Object[]) new StaticSentence(s, "SELECT appuser FROM sharedtickets WHERE ID = ?",
-        SerializerWriteString.INSTANCE, new SerializerReadBasic(new Datas[] {
+     /**
+     * In place for multi-purposing like flushing locks from elsewhere and/or
+     * using Place and User for Notifications
+     * @param id
+     * @param unlocked
+     * @throws BasicException
+     */
+    public final void unlockSharedTicket(final String id, final String unlocked) throws BasicException {
+            
+        Object[] values = new Object[] {
+            id, 
+            unlocked
+        };
+        Datas[] datas = new Datas[] {
+            Datas.STRING, 
             Datas.STRING
-        })).find(id);
-    return (String) server[0];
-  }
+        };
+        new PreparedSentence(s
+                , "UPDATE sharedtickets SET "
+                + "LOCKED = ? "
+                + "WHERE ID = ?"
+                , new SerializerWriteBasicExt(datas, new int[] {1, 0})).exec(values);
+    }    
+    
+    /**
+     * For Restaurant View
+     * @param id
+     * @param ticket
+     * @param pickupid
+     * @throws BasicException
+     */
+    public final void insertRSharedTicket(
+            final String id, 
+            final TicketInfo ticket, 
+            int pickupid) throws BasicException {
+        
+        Object[] values = new Object[] {
+            id, 
+            ticket.getName(), 
+            ticket,
+            ticket.getUser(),
+            ticket.getPickupId(),
+            ticket.getHost()                          
+        };
+        Datas[] datas;
+        datas = new Datas[] {
+            Datas.STRING, 
+            Datas.STRING, 
+            Datas.SERIALIZABLE, 
+            Datas.STRING,            
+            Datas.INT
+
+        };
+        new PreparedSentence(s
+            , "INSERT INTO sharedtickets ("
+                + "ID, "
+                + "NAME, "
+                + "CONTENT, "
+                + "APPUSER, "                    
+                + "PICKUPID) "
+                + "VALUES (?, ?, ?, ?, ?)"                
+            , new SerializerWriteBasicExt(datas, new int[] {0, 1, 2, 3, 4})).exec(values);                
+    }    
+
+    /**
+     * 
+     * @param id
+     * @throws BasicException
+     */
+    public final void deleteSharedTicket(final String id) throws BasicException {
+
+        new StaticSentence(s
+            , "DELETE FROM sharedtickets WHERE ID = ?"
+            , SerializerWriteString.INSTANCE).exec(id);      
+    }
+
+    /**
+     *
+     * @param Id
+     * @return
+     * @throws BasicException
+     */
+    public final Integer getPickupId(String Id) throws BasicException {
+        
+        if (Id == null) {
+            return null; 
+        } else {
+            Object[]record = (Object[]) new StaticSentence(s
+                    , "SELECT PICKUPID FROM sharedtickets WHERE ID = ?"
+                    , SerializerWriteString.INSTANCE
+                    , new SerializerReadBasic(new Datas[] {Datas.INT})).find(Id);
+            return record == null ? 0 : (Integer)record[0];
+        }
+    } 
+
+
+    public final String getUserId(final String id) throws BasicException {
+        Object[] userID = (Object []) new StaticSentence(s
+            , "SELECT APPUSER FROM sharedtickets WHERE ID = ?"
+            , SerializerWriteString.INSTANCE
+            , new SerializerReadBasic(new Datas[] {Datas.STRING})).find(id);
+            if( userID == null ) {
+                return null;
+            } else {
+                return (String) userID[0];
+        }
+    }
+    
+    public final String getLockState(final String id, String lockState) throws BasicException {
+        Object[] state = (Object[]) new StaticSentence(s
+            , "SELECT LOCKED FROM sharedtickets WHERE ID = ?"
+            , SerializerWriteString.INSTANCE
+            , new SerializerReadBasic(new Datas[] {
+                Datas.STRING
+            })).find(id);
+                return (String) state[0];
+    }
+
+    public final String getServer(final String id, String user) throws BasicException {
+        Object[] server = (Object[]) new StaticSentence(s
+            , "SELECT appuser FROM sharedtickets WHERE ID = ?"
+            , SerializerWriteString.INSTANCE
+            , new SerializerReadBasic(new Datas[] {
+                Datas.STRING
+            })).find(id);
+                return (String) server[0];
+    }    
 }

src/main/java/com/unicenta/pos/sales/JPanelTicket.java

@@ -26,6 +26,7 @@ import com.alee.extended.time.WebClock;
 import com.alee.managers.notification.NotificationIcon;
 import com.alee.managers.notification.NotificationManager;
 import com.alee.managers.notification.WebNotification;
+import com.google.gson.Gson;
 import com.unicenta.basic.BasicException;
 import com.unicenta.beans.JNumberPop;
 import com.unicenta.data.gui.ComboBoxValModel;
@@ -510,7 +511,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
     m_oTicketExt = oTicketExt;
 
     if (m_oTicket != null) {
-      m_oTicket.setUserInfo(m_App.getAppUserView().getUser().getUserInfo());
+      m_oTicket.setUser(m_App.getAppUserView().getUser().getUserInfo());
       m_oTicket.setActiveCash(m_App.getActiveCashIndex());
       m_oTicket.setDate(new Date());
 
@@ -1809,7 +1810,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
 
             ticket.setPayments(paymentdialog.getSelectedPayments());
 
-            ticket.setUserInfo(m_App.getAppUserView().getUser().getUserInfo());
+            ticket.setUser(m_App.getAppUserView().getUser().getUserInfo());
             ticket.setActiveCash(m_App.getActiveCashIndex());
             ticket.setDate(new Date());
 
@@ -1830,16 +1831,18 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
               } catch (IOException ex) {
                 log.error(ex.getMessage());
               }
-
+              // Digital Receipt
               if (m_config.getProperty("till.digital-receipt") != null
                   && m_config.getProperty("till.digital-receipt").equals("true")) {
                 log.debug("Send digital receipt");
                 String xml = dlSystem.getResourceAsXML("Printer.Ticket");
                 new Application().sendReceipt(ticket, xml, getActiveWindow());
               }
-              // this is where we trigger the efr integration
-              //
-              //
+              // EFR
+              if (m_config.getProperty("till.efr") != null && m_config.getProperty("till.efr").equals("true")) {
+                log.info("Send to efr");
+                new Application().sendEFR(ticket);
+              }
 
               executeEvent(ticket, ticketext, "ticket.close",
                   new ScriptArg("print", paymentdialog.isPrintSelected()));

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

@@ -55,27 +55,27 @@ public final class TicketInfo implements SerializableRead, Externalizable {
 
   private static final DateFormat m_dateformat = new SimpleDateFormat("hh:mm");
 
-  private String host;
-  private String id;
-  private int ticketType;
-  private int ticketId;
-  private int pickupId;
-  private java.util.Date date;
+  private String m_sHost;
+  private String m_sId;
+  private int tickettype;
+  private int m_iTicketId;
+  private int m_iPickupId;
+  private java.util.Date m_dDate;
   private Properties attributes;
-  private UserInfo userInfo;
+  private UserInfo m_User;
   private Double multiply;
-  private CustomerInfoExt cutomerInfoExt;
-  private String activeCash;
-  private List<TicketLineInfo> ticketLines;
+  private CustomerInfoExt m_Customer;
+  private String m_sActiveCash;
+  private List<TicketLineInfo> m_aLines;
   private List<PaymentInfo> payments;
   private List<TicketTaxInfo> taxes;
   private final String m_sResponse;
   private String loyaltyCardNumber;
   private Boolean oldTicket;
   private boolean tip;
-  private PaymentInfoTicket ticketPaymentInfo;
-  private boolean isProcessed;
-  private final String locked;
+  private PaymentInfoTicket m_paymentInfo;
+  private boolean m_isProcessed;
+  private final String m_locked;
   private Double nsum;
   private int ticketstatus;
 
@@ -91,15 +91,15 @@ public final class TicketInfo implements SerializableRead, Externalizable {
 
   /** Creates new TicketModel */
   public TicketInfo() {
-    id = UUID.randomUUID().toString();
-    ticketType = RECEIPT_NORMAL;
-    ticketId = 0; // incrementamos
-    date = new Date();
+    m_sId = UUID.randomUUID().toString();
+    tickettype = RECEIPT_NORMAL;
+    m_iTicketId = 0; // incrementamos
+    m_dDate = new Date();
     attributes = new Properties();
-    userInfo = null;
-    cutomerInfoExt = null;
-    activeCash = null;
-    ticketLines = new ArrayList<>();
+    m_User = null;
+    m_Customer = null;
+    m_sActiveCash = null;
+    m_aLines = new ArrayList<>();
     payments = new ArrayList<>();
     taxes = null;
     m_sResponse = null;
@@ -109,35 +109,36 @@ public final class TicketInfo implements SerializableRead, Externalizable {
         System.getProperty("user.home")), AppLocal.APP_ID + ".properties"));
     config.load();
     tip = Boolean.valueOf(config.getProperty("machine.showTip"));
-    isProcessed = false;
-    locked = null;
+    m_isProcessed = false;
+    m_locked = null;
     ticketstatus = 0;
+    m_sHost = String.valueOf(config.getProperty("machine.hostname"));
   }
 
   @Override
   public void writeExternal(ObjectOutput out) throws IOException {
-    out.writeObject(id);
-    out.writeInt(ticketType);
-    out.writeInt(ticketId);
-    out.writeObject(cutomerInfoExt);
-    out.writeObject(date);
+    out.writeObject(m_sId);
+    out.writeInt(tickettype);
+    out.writeInt(m_iTicketId);
+    out.writeObject(m_Customer);
+    out.writeObject(m_dDate);
     out.writeObject(attributes);
-    out.writeObject(ticketLines);
+    out.writeObject(m_aLines);
 
     out.writeInt(ticketstatus);
   }
 
   @Override
   public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
-    id = (String) in.readObject();
-    ticketType = in.readInt();
-    ticketId = in.readInt();
-    cutomerInfoExt = (CustomerInfoExt) in.readObject();
-    date = (Date) in.readObject();
+    m_sId = (String) in.readObject();
+    tickettype = in.readInt();
+    m_iTicketId = in.readInt();
+    m_Customer = (CustomerInfoExt) in.readObject();
+    m_dDate = (Date) in.readObject();
     attributes = (Properties) in.readObject();
-    ticketLines = (List<TicketLineInfo>) in.readObject();
-    userInfo = null;
-    activeCash = null;
+    m_aLines = (List<TicketLineInfo>) in.readObject();
+    m_User = null;
+    m_sActiveCash = null;
     payments = new ArrayList<>(); // JG June 2102 diamond inference
     taxes = null;
 
@@ -151,11 +152,11 @@ public final class TicketInfo implements SerializableRead, Externalizable {
    */
   @Override
   public void readValues(DataRead dr) throws BasicException {
-    id = dr.getString(1);
-    ticketType = dr.getInt(2);
-    ticketId = dr.getInt(3);
-    date = dr.getTimestamp(4);
-    activeCash = dr.getString(5);
+    m_sId = dr.getString(1);
+    tickettype = dr.getInt(2);
+    m_iTicketId = dr.getInt(3);
+    m_dDate = dr.getTimestamp(4);
+    m_sActiveCash = dr.getString(5);
     try {
       byte[] img = dr.getBytes(6);
       if (img != null) {
@@ -163,9 +164,9 @@ public final class TicketInfo implements SerializableRead, Externalizable {
       }
     } catch (IOException e) {
     }
-    userInfo = new UserInfo(dr.getString(7), dr.getString(8));
-    cutomerInfoExt = new CustomerInfoExt(dr.getString(9));
-    ticketLines = new ArrayList<>();
+    m_User = new UserInfo(dr.getString(7), dr.getString(8));
+    m_Customer = new CustomerInfoExt(dr.getString(9));
+    m_aLines = new ArrayList<>();
     payments = new ArrayList<>();
     taxes = null;
 
@@ -177,52 +178,52 @@ public final class TicketInfo implements SerializableRead, Externalizable {
    * @return
    */
   public TicketInfo copyTicket() {
-    TicketInfo ticketInfo = new TicketInfo();
+    TicketInfo t = new TicketInfo();
 
-    ticketInfo.ticketType = ticketType;
-    ticketInfo.ticketId = ticketId;
-    ticketInfo.date = date;
-    ticketInfo.activeCash = activeCash;
-    ticketInfo.attributes = (Properties) attributes.clone();
-    ticketInfo.userInfo = userInfo;
-    ticketInfo.cutomerInfoExt = cutomerInfoExt;
+    t.tickettype = tickettype;
+    t.m_iTicketId = m_iTicketId;
+    t.m_dDate = m_dDate;
+    t.m_sActiveCash = m_sActiveCash;
+    t.attributes = (Properties) attributes.clone();
+    t.m_User = m_User;
+    t.m_Customer = m_Customer;
 
-    ticketInfo.ticketLines = new ArrayList<>(); // JG June 2102 diamond inference
-    ticketLines.forEach((line) -> {
-      ticketInfo.ticketLines.add(line.copyTicketLine());
+    t.m_aLines = new ArrayList<>(); // JG June 2102 diamond inference
+    m_aLines.forEach((l) -> {
+      t.m_aLines.add(l.copyTicketLine());
     });
-    ticketInfo.refreshLines();
+    t.refreshLines();
 
-    ticketInfo.payments = new LinkedList<>(); // JG June 2102 diamond inference
+    t.payments = new LinkedList<>(); // JG June 2102 diamond inference
     payments.forEach((p) -> {
-      ticketInfo.payments.add(p.copyPayment());
+      t.payments.add(p.copyPayment());
     });
-    ticketInfo.oldTicket = oldTicket;
+    t.oldTicket = oldTicket;
     // taxes are not copied, must be calculated again.
 
-    ticketInfo.ticketstatus = ticketstatus;
+    t.ticketstatus = ticketstatus;
 
-    return ticketInfo;
+    return t;
   }
 
   public String getId() {
-    return id;
+    return m_sId;
   }
 
   public int getTicketType() {
-    return ticketType;
+    return tickettype;
   }
 
   public void setTicketType(int tickettype) {
-    this.ticketType = tickettype;
+    this.tickettype = tickettype;
   }
 
   public int getTicketId() {
-    return ticketId;
+    return m_iTicketId;
   }
 
   public void setTicketId(int iTicketId) {
-    ticketId = iTicketId;
+    m_iTicketId = iTicketId;
   }
 
   public int getTicketStatus() {
@@ -230,19 +231,19 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   }
 
   public void setTicketStatus(int ticketstatus) {
-    if (ticketId > 0) {
-      this.ticketstatus = ticketId;
+    if (m_iTicketId > 0) {
+      this.ticketstatus = m_iTicketId;
     } else {
       this.ticketstatus = ticketstatus;
     }
   }
 
   public void setPickupId(int iTicketId) {
-    pickupId = iTicketId;
+    m_iPickupId = iTicketId;
   }
 
   public int getPickupId() {
-    return pickupId;
+    return m_iPickupId;
   }
 
   public String getName(Object info) {
@@ -254,23 +255,23 @@ public final class TicketInfo implements SerializableRead, Externalizable {
       name.add(nameprop);
     }
 
-    if (userInfo != null) {
-      name.add(userInfo.getName());
+    if (m_User != null) {
+      name.add(m_User.getName());
     }
 
     if (info == null) {
-      if (ticketId == 0) {
-        name.add("(" + m_dateformat.format(date) + " "
-            + Long.toString(date.getTime() % 1000) + ")");
+      if (m_iTicketId == 0) {
+        name.add("(" + m_dateformat.format(m_dDate) + " "
+            + Long.toString(m_dDate.getTime() % 1000) + ")");
       } else {
-        name.add(Integer.toString(ticketId));
+        name.add(Integer.toString(m_iTicketId));
       }
     } else {
       name.add(info.toString());
     }
 
-    if (cutomerInfoExt != null) {
-      name.add(cutomerInfoExt.getName());
+    if (m_Customer != null) {
+      name.add(m_Customer.getName());
     }
 
     return org.apache.commons.lang.StringUtils.join(name, " - ");
@@ -281,11 +282,11 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   }
 
   public java.util.Date getDate() {
-    return date;
+    return m_dDate;
   }
 
   public void setDate(java.util.Date dDate) {
-    date = dDate;
+    m_dDate = dDate;
   }
 
   public String getHost() {
@@ -297,27 +298,27 @@ public final class TicketInfo implements SerializableRead, Externalizable {
     return machineHostname;
   }
 
-  public UserInfo getUserInfo() {
-    return userInfo;
+  public UserInfo getUser() {
+    return m_User;
   }
 
-  public void setUserInfo(UserInfo value) {
-    userInfo = value;
+  public void setUser(UserInfo value) {
+    m_User = value;
   }
 
   public CustomerInfoExt getCustomer() {
-    return cutomerInfoExt;
+    return m_Customer;
   }
 
   public void setCustomer(CustomerInfoExt value) {
-    cutomerInfoExt = value;
+    m_Customer = value;
   }
 
   public String getCustomerId() {
-    if (cutomerInfoExt == null) {
+    if (m_Customer == null) {
       return null;
     } else {
-      return cutomerInfoExt.getId();
+      return m_Customer.getId();
     }
   }
 
@@ -334,11 +335,11 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   }
 
   public void setActiveCash(String value) {
-    activeCash = value;
+    m_sActiveCash = value;
   }
 
   public String getActiveCash() {
-    return activeCash;
+    return m_sActiveCash;
   }
 
   public String getProperty(String key) {
@@ -358,45 +359,45 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   }
 
   public TicketLineInfo getLine(int index) {
-    return ticketLines.get(index);
+    return m_aLines.get(index);
   }
 
   public void addLine(TicketLineInfo oLine) {
-    oLine.setTicket(id, ticketLines.size());
-    ticketLines.add(oLine);
+    oLine.setTicket(m_sId, m_aLines.size());
+    m_aLines.add(oLine);
   }
 
   public void insertLine(int index, TicketLineInfo oLine) {
-    ticketLines.add(index, oLine);
+    m_aLines.add(index, oLine);
     refreshLines();
   }
 
   public void setLine(int index, TicketLineInfo oLine) {
-    oLine.setTicket(id, index);
-    ticketLines.set(index, oLine);
+    oLine.setTicket(m_sId, index);
+    m_aLines.set(index, oLine);
   }
 
   public void removeLine(int index) {
-    ticketLines.remove(index);
+    m_aLines.remove(index);
     refreshLines();
 
   }
 
   public void refreshLines() {
-    for (int i = 0; i < ticketLines.size(); i++) {
-      getLine(i).setTicket(id, i);
+    for (int i = 0; i < m_aLines.size(); i++) {
+      getLine(i).setTicket(m_sId, i);
     }
   }
 
   public int getLinesCount() {
-    return ticketLines.size();
+    return m_aLines.size();
   }
 
   public double getArticlesCount() {
     double dArticles = 0.0;
     TicketLineInfo oLine;
 
-    for (Iterator<TicketLineInfo> i = ticketLines.iterator(); i.hasNext();) {
+    for (Iterator<TicketLineInfo> i = m_aLines.iterator(); i.hasNext();) {
       oLine = i.next();
       dArticles += oLine.getMultiply();
     }
@@ -406,8 +407,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
 
   public double getSubTotal() {
     double sum = 0.0;
-    sum = ticketLines.stream().map((line) -> line.getSubValue()).reduce(sum,
-        (accumulator, _item) -> accumulator + _item);
+    sum = m_aLines.stream().map((line) -> line.getSubValue()).reduce(sum, (accumulator, _item) -> accumulator + _item);
     return sum;
   }
 
@@ -420,7 +420,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
         nsum = sum;
       }
     } else {
-      sum = ticketLines.stream().map((line) -> line.getTax()).reduce(sum, (accumulator, _item) -> accumulator + _item);
+      sum = m_aLines.stream().map((line) -> line.getTax()).reduce(sum, (accumulator, _item) -> accumulator + _item);
     }
     return sum;
   }
@@ -447,11 +447,11 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   }
 
   public List<TicketLineInfo> getLines() {
-    return ticketLines;
+    return m_aLines;
   }
 
   public void setLines(List<TicketLineInfo> l) {
-    ticketLines = l;
+    m_aLines = l;
   }
 
   public List<PaymentInfo> getPayments() {
@@ -491,7 +491,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   }
 
   public void setIsProcessed(boolean isP) {
-    isProcessed = isP;
+    m_isProcessed = isP;
   }
 
   public TicketTaxInfo getTaxLine(TaxInfo tax) {
@@ -510,7 +510,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
     Map<String, TicketTaxInfo> m = new HashMap<>();
 
     TicketLineInfo oLine;
-    for (Iterator<TicketLineInfo> i = ticketLines.iterator(); i.hasNext();) {
+    for (Iterator<TicketLineInfo> i = m_aLines.iterator(); i.hasNext();) {
       oLine = i.next();
 
       TicketTaxInfo t = m.get(oLine.getTaxInfo().getId());
@@ -536,8 +536,8 @@ public final class TicketInfo implements SerializableRead, Externalizable {
 
     m_config = null;
 
-    if (ticketId > 0) {
-      String tmpTicketId = Integer.toString(ticketId);
+    if (m_iTicketId > 0) {
+      String tmpTicketId = Integer.toString(m_iTicketId);
       if (receiptSize == null || (Integer.parseInt(receiptSize) <= tmpTicketId.length())) {
         if (receiptPrefix != null) {
           tmpTicketId = receiptPrefix + tmpTicketId;
@@ -557,16 +557,16 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   }
 
   public String printDate() {
-    return Formats.TIMESTAMP.formatValue(date);
+    return Formats.TIMESTAMP.formatValue(m_dDate);
   }
 
   public String printUser() {
-    return userInfo == null ? "" : userInfo.getName();
+    return m_User == null ? "" : m_User.getName();
 
   }
 
   public String printHost() {
-    return host;
+    return m_sHost;
   }
 
   // Added JDL 28.05.13 for loyalty card functions
@@ -595,11 +595,11 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   }
 
   public String printCustomer() {
-    return cutomerInfoExt == null ? "" : cutomerInfoExt.getName();
+    return m_Customer == null ? "" : m_Customer.getName();
   }
 
   public String printPhone1() {
-    return cutomerInfoExt == null ? "" : cutomerInfoExt.getPhone1();
+    return m_Customer == null ? "" : m_Customer.getPhone1();
   }
 
   public String printArticlesCount() {

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

@@ -37,509 +37,455 @@ import java.util.Properties;
  */
 public class TicketLineInfo implements SerializableWrite, SerializableRead, Serializable {
 
-  private static final long serialVersionUID = 6608012948284450199L;
-  private String m_sTicket;
-  private int m_iLine;
-  private double multiply;
+    private static final long serialVersionUID = 6608012948284450199L;
+    private String m_sTicket;
+    private int m_iLine;
+    private double multiply;
 
-  @Override
-  public String toString() {
-    return new Gson().toJson(this);
-  }
-
-  private double price;
-  private TaxInfo tax;
-  private Properties attributes;
-  private String productid;
-  private String attsetinstid;
-  private Boolean updated = false;
-
-  private double newprice = 0.0;
-
-  /**
-   * Creates new TicketLineInfo
-   * 
-   * @param productid
-   * @param dMultiply
-   * @param dPrice
-   * @param tax
-   * @param props
-   */
-  public TicketLineInfo(String productid, double dMultiply, double dPrice, TaxInfo tax, Properties props) {
-    init(productid, null, dMultiply, dPrice, tax, props);
-  }
-
-  /**
-   *
-   * @param productid
-   * @param dMultiply
-   * @param dPrice
-   * @param tax
-   */
-  public TicketLineInfo(String productid, double dMultiply, double dPrice, TaxInfo tax) {
-    init(productid, null, dMultiply, dPrice, tax, new Properties());
-  }
-
-  /**
-   * Example: Call from script.TotalDiscount event
-   * 
-   * @param productid
-   * @param productname
-   * @param producttaxcategory
-   * @param productprinter
-   * @param dMultiply
-   * @param dPrice
-   * @param tax
-   */
-  public TicketLineInfo(String productid, String productname, String producttaxcategory, String productprinter,
-      double dMultiply, double dPrice, TaxInfo tax) {
-    Properties props = new Properties();
-    props.setProperty("product.name", productname);
-    props.setProperty("product.taxcategoryid", producttaxcategory);
-    props.setProperty("product.printer", productprinter); // added to props as may introduce printer redirect
-
-    init(productid, null, dMultiply, dPrice, tax, props);
-  }
-
-  /**
-   * Example: Call from script.LineDiscount event
-   * 
-   * @param productname
-   * @param producttaxcategory
-   * @param productprinter     //added to props as may introduce printer redirect
-   * @param dMultiply
-   * @param dPrice
-   * @param tax
-   */
-  public TicketLineInfo(String productname, String producttaxcategory, String productprinter, double dMultiply,
-      double dPrice, TaxInfo tax) {
-
-    Properties props = new Properties();
-    props.setProperty("product.name", productname);
-    props.setProperty("product.taxcategoryid", producttaxcategory);
-    props.setProperty("product.printer", productprinter);
-
-    init(null, null, dMultiply, dPrice, tax, props);
-  }
-
-  /**
-   *
-   */
-  public TicketLineInfo() {
-    init(null, null, 0.0, 0.0, null, new Properties());
-  }
-
-  /**
-   *
-   * @param product
-   * @param dMultiply
-   * @param dPrice
-   * @param tax
-   * @param attributes
-   */
-  public TicketLineInfo(ProductInfoExt product, double dMultiply, double dPrice, TaxInfo tax, Properties attributes) {
-
-    String pid;
-
-    if (product == null) {
-      pid = null;
-      tax = null;
-    } else {
-      pid = product.getID();
-      attributes.setProperty("product.name", product.getName());
-      attributes.setProperty("product.reference", product.getReference());
-      attributes.setProperty("product.code", product.getCode());
-
-      if (product.getMemoDate() == null) {
-        attributes.setProperty("product.memodate", "1900-01-01 00:00:01");
-      } else {
-        attributes.setProperty("product.memodate", product.getMemoDate());
-      }
-
-      attributes.setProperty("product.com", product.isCom() ? "true" : "false");
-      attributes.setProperty("product.constant", product.isConstant() ? "true" : "false");
-
-      if (product.getPrinter() != null) {
-        attributes.setProperty("product.printer", product.getPrinter());
-      } else {
-        attributes.setProperty("product.printer", "1");
-      }
-
-      attributes.setProperty("product.service", product.isService() ? "true" : "false");
-      attributes.setProperty("product.vprice", product.isVprice() ? "true" : "false");
-      attributes.setProperty("product.verpatrib", product.isVerpatrib() ? "true" : "false");
-
-      if (product.getTextTip() != null) {
-        attributes.setProperty("product.texttip", product.getTextTip());
-      }
-
-      attributes.setProperty("product.warranty", product.getWarranty() ? "true" : "false");
-
-      if (product.getAttributeSetID() != null) {
-        attributes.setProperty("product.attsetid", product.getAttributeSetID());
-      }
-
-      attributes.setProperty("product.taxcategoryid", product.getTaxCategoryID());
-
-      if (product.getCategoryID() != null) {
-        attributes.setProperty("product.categoryid", product.getCategoryID());
-      }
-
-      if ("true".equals(attributes.getProperty("ticket.updated"))) {
-        attributes.setProperty("ticket.updated", "false");
-      } else {
-        attributes.setProperty("ticket.updated", "true");
-      }
+    @Override
+    public String toString() {
+        return new Gson().toJson(this);
     }
 
-    init(pid, null, dMultiply, dPrice, tax, attributes);
-  }
-
-  /**
-   *
-   * @param oProduct
-   * @param dPrice
-   * @param tax
-   * @param attributes
-   */
-  public TicketLineInfo(ProductInfoExt oProduct, double dPrice, TaxInfo tax, Properties attributes) {
-    this(oProduct, 1.0, dPrice, tax, attributes);
-  }
-
-  /**
-   *
-   * @param line
-   */
-  public TicketLineInfo(TicketLineInfo line) {
-    init(line.productid, line.attsetinstid, line.multiply, line.price,
-        line.tax, (Properties) line.attributes.clone());
-  }
-
-  private void init(String productid, String attsetinstid, double dMultiply, double dPrice, TaxInfo tax,
-      Properties attributes) {
-
-    this.productid = productid;
-    this.attsetinstid = attsetinstid;
-    multiply = dMultiply;
-    price = dPrice;
-    this.tax = tax;
-    this.attributes = attributes;
-
-    m_sTicket = null;
-    m_iLine = -1;
-  }
-
-  void setTicket(String ticket, int line) {
-    m_sTicket = ticket;
-    m_iLine = line;
-  }
-
-  /**
-   *
-   * @param dp
-   * @throws BasicException
-   */
-  @Override
-  public void writeValues(DataWrite dp) throws BasicException {
-    dp.setString(1, m_sTicket);
-    dp.setInt(2, m_iLine);
-    dp.setString(3, productid);
-    dp.setString(4, attsetinstid);
-    dp.setDouble(5, multiply);
-    dp.setDouble(6, price);
-    dp.setString(7, tax.getId());
-
-    try {
-      ByteArrayOutputStream o = new ByteArrayOutputStream();
-      attributes.storeToXML(o, AppLocal.APP_NAME, "UTF-8");
-      dp.setBytes(8, o.toByteArray());
-    } catch (IOException e) {
-      dp.setBytes(8, null);
+    private double price;
+    private TaxInfo tax;
+    private Properties attributes;
+    private String productid;
+    private String attsetinstid;
+    private Boolean updated = false;
+    
+    private double newprice = 0.0;
+    
+    /** Creates new TicketLineInfo
+     * @param productid
+     * @param dMultiply
+     * @param dPrice
+     * @param tax
+     * @param props */
+    public TicketLineInfo(String productid, double dMultiply, double dPrice, TaxInfo tax, Properties props) {
+        init(productid, null, dMultiply, dPrice, tax, props);
     }
-  }
 
-  /**
-   *
-   * @param dr
-   * @throws BasicException
-   */
-  @Override
-  public void readValues(DataRead dr) throws BasicException {
-    m_sTicket = dr.getString(1);
-    m_iLine = dr.getInt(2);
-    productid = dr.getString(3);
-    attsetinstid = dr.getString(4);
-    multiply = dr.getDouble(5);
-    price = dr.getDouble(6);
-    tax = new TaxInfo(
-        dr.getString(7),
-        dr.getString(8),
-        dr.getString(9),
-        dr.getString(10),
-        dr.getString(11),
-        dr.getDouble(12),
-        dr.getBoolean(13),
-        dr.getInt(14));
-    attributes = new Properties();
-
-    try {
-      byte[] img = dr.getBytes(15);
-      if (img != null) {
-        attributes.loadFromXML(new ByteArrayInputStream(img));
-      }
-    } catch (IOException e) {
+    /**
+     *
+     * @param productid
+     * @param dMultiply
+     * @param dPrice
+     * @param tax
+     */
+    public TicketLineInfo(String productid, double dMultiply, double dPrice, TaxInfo tax) {
+        init(productid, null, dMultiply, dPrice, tax, new Properties());
     }
-  }
 
-  /**
-   *
-   * @return
-   */
-  public TicketLineInfo copyTicketLine() {
-    TicketLineInfo l = new TicketLineInfo();
-    l.productid = productid;
-    l.attsetinstid = attsetinstid;
-    l.multiply = multiply;
-    l.price = price;
-    l.tax = tax;
-    l.attributes = (Properties) attributes.clone();
-
-    return l;
-  }
-
-  /**
-   *
-   * @return
-   */
-  public int getTicketLine() {
-    return m_iLine;
-  }
-
-  // These are the Lookups
-  public String getProductID() {
-    return productid;
-  }
-
-  public String getProductCategoryID() {
-    return (attributes.getProperty("product.categoryid"));
-  }
-
-  public String getProductAttSetId() {
-    return attributes.getProperty("product.attsetid");
-  }
-
-  public String getProductAttSetInstId() {
-    return attsetinstid;
-  }
-
-  public String getProductAttSetInstDesc() {
-    return attributes.getProperty("product.attsetdesc", "");
-  }
-
-  public String getProductTaxCategoryID() {
-    return (attributes.getProperty("product.taxcategoryid"));
-  }
-
-  public String getTicketUpdated() {
-    return (attributes.getProperty("ticket.updated"));
-  }
-
-  public TaxInfo getTaxInfo() {
-    return tax;
-  }
-
-  public void setTaxInfo(TaxInfo oTaxInfo) {
-    tax = oTaxInfo;
-  }
-
-  // These appear on Printed TicketLine
-  public String getProductName() {
-    return attributes.getProperty("product.name");
-  }
-
-  public String getProductMemoDate() {
-    return attributes.getProperty("product.memodate");
-  }
-
-  public double getPrice() {
-    return price;
-  }
-
-  public double getMultiply() {
-    return multiply;
-  }
-
-  public double getTaxRate() {
-    return tax == null ? 0.0 : tax.getRate();
-  }
-
-  public double getNewPrice() {
-    newprice = price * (1.0 + getTaxRate());
-    return price;
-  }
-
-  public String getProductPrinter() {
-    return attributes.getProperty("product.printer");
-  }
-
-  // These are the Summaries
-  public double getPriceTax() {
-    return price * (1.0 + getTaxRate());
-  }
-
-  public Properties getProperties() {
-    return attributes;
-  }
-
-  public String getProperty(String key) {
-    return attributes.getProperty(key);
-  }
-
-  public String getProperty(String key, String defaultvalue) {
-    return attributes.getProperty(key, defaultvalue);
-  }
-
-  // These are Ticket Totals
-  public double getTax() {
-    return price * multiply * getTaxRate();
-  }
-
-  public double getValue() {
-    return price * multiply * (1.0 + getTaxRate());
-  }
-
-  public double getSubValue() {
-    return price * multiply;
-  }
-
-  // SETTERS
-  public void setPrice(double dValue) {
-    price = dValue;
-  }
-
-  public void setPriceTax(double dValue) {
-    price = dValue / (1.0 + getTaxRate());
-  }
-
-  public void setMultiply(double dValue) {
-    multiply = dValue;
-  }
-
-  public void setProperty(String key, String value) {
-    attributes.setProperty(key, value);
-  }
-
-  public void setProductTaxCategoryID(String taxID) {
-    attributes.setProperty("product.taxcategoryid", taxID);
-  }
-
-  public void setProductAttSetInstId(String value) {
-    attsetinstid = value;
-  }
-
-  public void setProductAttSetInstDesc(String value) {
-    if (value == null) {
-      attributes.remove(value);
-    } else {
-      attributes.setProperty("product.attsetdesc", value);
+    /**
+     * Example: Call from script.TotalDiscount event
+     * @param productid
+     * @param productname
+     * @param producttaxcategory
+     * @param productprinter
+     * @param dMultiply
+     * @param dPrice
+     * @param tax
+     */
+    public TicketLineInfo(String productid, String productname, String producttaxcategory, String productprinter, double dMultiply, double dPrice, TaxInfo tax) {
+        Properties props = new Properties();
+        props.setProperty("product.name", productname);
+        props.setProperty("product.taxcategoryid", producttaxcategory);
+        props.setProperty("product.printer", productprinter);   //added to props as may introduce printer redirect
+        
+        init(productid, null, dMultiply, dPrice, tax, props);
     }
-  }
 
-  public void setTicketUpdated(String key, String value) {
-    attributes.setProperty("ticket.updated", value);
-  }
+    /**
+     * Example: Call from script.LineDiscount event
+     * @param productname
+     * @param producttaxcategory
+     * @param productprinter    //added to props as may introduce printer redirect
+     * @param dMultiply
+     * @param dPrice
+     * @param tax
+     */
+    public TicketLineInfo(String productname, String producttaxcategory, String productprinter, double dMultiply, double dPrice, TaxInfo tax) {
 
-  public void setProductPrinter(String value) {
-    if (value == null) {
-      attributes.remove(value);
-    } else {
-      attributes.setProperty("product.printer", value);
+        Properties props = new Properties();
+        props.setProperty("product.name", productname);
+        props.setProperty("product.taxcategoryid", producttaxcategory);
+        props.setProperty("product.printer", productprinter);
+        
+        init(null, null, dMultiply, dPrice, tax, props);
     }
-  }
 
-  /**
-   *
-   * @return
-   */
-  // Print to actual ${ticketline
-  public String printReference() {
-    return StringUtils.encodeXML(attributes.getProperty("product.reference"));
-  }
+    /**
+     *
+     */
+    public TicketLineInfo() {
+        init(null, null, 0.0, 0.0, null, new Properties());
+    }
 
-  public String printCode() {
-    return StringUtils.encodeXML(attributes.getProperty("product.code"));
-  }
+    /**
+     *
+     * @param product
+     * @param dMultiply
+     * @param dPrice
+     * @param tax
+     * @param attributes
+     */
+    public TicketLineInfo(ProductInfoExt product, double dMultiply, double dPrice, TaxInfo tax, Properties attributes) {
 
-  public String printName() {
-    return StringUtils.encodeXML(attributes.getProperty("product.name"));
-  }
+        String pid;
 
-  public String printProductMemoDate() {
-    return StringUtils.encodeXML(attributes.getProperty("product.memodate"));
-  }
+        if (product == null) {
+            pid = null;
+            tax = null;
+        } else {
+            pid = product.getID();
+            attributes.setProperty("product.name", product.getName());
+            attributes.setProperty("product.reference", product.getReference());
+            attributes.setProperty("product.code", product.getCode());
 
-  public String printPrice() {
-    return Formats.CURRENCY.formatValue(getPrice());
-  }
+            if (product.getMemoDate() == null) {
+                attributes.setProperty("product.memodate", "1900-01-01 00:00:01");                
+            } else {
+                attributes.setProperty("product.memodate", product.getMemoDate());                
+            }
+         
+            attributes.setProperty("product.com", product.isCom() ? "true" : "false");
+            attributes.setProperty("product.constant", product.isConstant() ? "true" : "false");
 
-  public String printPriceTax() {
-    return Formats.CURRENCY.formatValue(getPriceTax());
-  }
+            if (product.getPrinter() != null) {
+                attributes.setProperty("product.printer", product.getPrinter());
+            } else {
+                attributes.setProperty("product.printer", "1");
+            }    
+            
+            attributes.setProperty("product.service", product.isService() ? "true" : "false");
+            attributes.setProperty("product.vprice", product.isVprice() ? "true" : "false");
+            attributes.setProperty("product.verpatrib", product.isVerpatrib() ? "true" : "false");
 
-  public String printMultiply() {
-    return Formats.DOUBLE.formatValue(multiply);
-  }
+            if (product.getTextTip() != null) {
+                attributes.setProperty("product.texttip", product.getTextTip());
+            }
+ 
+            attributes.setProperty("product.warranty", product.getWarranty()? "true" : "false");        
+       
+            if (product.getAttributeSetID() != null) {
+                attributes.setProperty("product.attsetid", product.getAttributeSetID());
+            }
+            
+            attributes.setProperty("product.taxcategoryid", product.getTaxCategoryID());
+        
+            if (product.getCategoryID() != null) {
+                attributes.setProperty("product.categoryid", product.getCategoryID());
+            }
 
-  public String printValue() {
-    return Formats.CURRENCY.formatValue(getValue());
-  }
+            if ("true".equals(attributes.getProperty("ticket.updated"))) {
+                attributes.setProperty("ticket.updated", "false");                
+            } else {
+                attributes.setProperty("ticket.updated", "true");                
+            }
+        }
 
-  public String printTaxRate() {
-    return Formats.PERCENT.formatValue(getTaxRate());
-  }
+        init(pid, null, dMultiply, dPrice, tax, attributes);
+    }
 
-  public String printSubValue() {
-    return Formats.CURRENCY.formatValue(getSubValue());
-  }
+    /**
+     *
+     * @param oProduct
+     * @param dPrice
+     * @param tax
+     * @param attributes
+     */
+    public TicketLineInfo(ProductInfoExt oProduct, double dPrice, TaxInfo tax, Properties attributes) {
+        this(oProduct, 1.0, dPrice, tax, attributes);
+    }
 
-  public String printTax() {
-    return Formats.CURRENCY.formatValue(getTax());
-  }
+    /**
+     *
+     * @param line
+     */
+    public TicketLineInfo(TicketLineInfo line) {
+        init(line.productid, line.attsetinstid, line.multiply, line.price, 
+            line.tax, (Properties) line.attributes.clone());
+    }
 
-  public String printTextTip() {
-    return attributes.getProperty("product.texttip");
-  }
+    private void init(String productid, String attsetinstid, double dMultiply, double dPrice, TaxInfo tax, Properties attributes) {
 
-  public String printPrinter() {
-    return StringUtils.encodeXML(attributes.getProperty("product.printer"));
-  }
+        this.productid = productid;
+        this.attsetinstid = attsetinstid;
+        multiply = dMultiply;
+        price = dPrice;
+        this.tax = tax;  
+        this.attributes = attributes;
+    
+        m_sTicket = null;
+        m_iLine = -1;
+    }
 
-  public boolean isProductCom() {
-    return "true".equals(attributes.getProperty("product.com"));
-  }
+    void setTicket(String ticket, int line) {
+        m_sTicket = ticket;
+        m_iLine = line;
+    }
 
-  public boolean isProductService() {
-    return "true".equals(attributes.getProperty("product.service"));
-  }
+    /**
+     *
+     * @param dp
+     * @throws BasicException
+     */
+    @Override
+    public void writeValues(DataWrite dp) throws BasicException {
+        dp.setString(1, m_sTicket);
+        dp.setInt(2, m_iLine);
+        dp.setString(3, productid);
+        dp.setString(4, attsetinstid);
+        dp.setDouble(5, multiply);
+        dp.setDouble(6, price);
+        dp.setString(7, tax.getId());
 
-  public boolean isProductVprice() {
-    return "true".equals(attributes.getProperty("product.vprice"));
-  }
+        try {
+            ByteArrayOutputStream o = new ByteArrayOutputStream();
+            attributes.storeToXML(o, AppLocal.APP_NAME, "UTF-8");
+            dp.setBytes(8, o.toByteArray());
+        } catch (IOException e) {
+            dp.setBytes(8, null);
+        }
+    }
 
-  public boolean isProductVerpatrib() {
-    return "true".equals(attributes.getProperty("product.verpatrib"));
-  }
+    /**
+     *
+     * @param dr
+     * @throws BasicException
+     */
+    @Override
+    public void readValues(DataRead dr) throws BasicException {
+        m_sTicket = dr.getString(1);
+        m_iLine = dr.getInt(2);
+        productid = dr.getString(3);
+        attsetinstid = dr.getString(4);
+        multiply = dr.getDouble(5);
+        price = dr.getDouble(6);
+        tax = new TaxInfo(
+            dr.getString(7), 
+            dr.getString(8), 
+            dr.getString(9), 
+            dr.getString(10), 
+            dr.getString(11), 
+            dr.getDouble(12), 
+            dr.getBoolean(13), 
+            dr.getInt(14));
+        attributes = new Properties();
 
-  public boolean isProductWarranty() {
-    return "true".equals(attributes.getProperty("product.warranty"));
-  }
+        try {
+            byte[] img = dr.getBytes(15);
+            if (img != null) {
+                attributes.loadFromXML(new ByteArrayInputStream(img));
+            }
+        } catch (IOException e) {
+        }
+    }
 
-  public boolean getUpdated() {
-    return "true".equals(attributes.getProperty("ticket.updated"));
-  }
+    /**
+     *
+     * @return
+     */
+    public TicketLineInfo copyTicketLine() {
+        TicketLineInfo l = new TicketLineInfo();
+        l.productid = productid;
+        l.attsetinstid = attsetinstid;
+        l.multiply = multiply;
+        l.price = price;
+        l.tax = tax; 
+        l.attributes = (Properties) attributes.clone();
 
-  public void setUpdated(Boolean value) {
-    updated = value;
-  }
+        return l;
+    }
 
-}
+    /**
+     *
+     * @return
+     */
+    public int getTicketLine() {
+        return m_iLine;
+    }
+// These are the Lookups   
+    public String getProductID() {
+        return productid;
+    }
+    public String getProductCategoryID() {
+        return (attributes.getProperty("product.categoryid"));
+    }
+    public String getProductAttSetId() {
+        return attributes.getProperty("product.attsetid");
+    }
+    public String getProductAttSetInstId() {
+        return attsetinstid;
+    }    
+    public String getProductAttSetInstDesc() {
+        return attributes.getProperty("product.attsetdesc", "");
+    }
+    public String getProductTaxCategoryID() {
+        return (attributes.getProperty("product.taxcategoryid"));
+    }
+    public String getTicketUpdated() {
+        return (attributes.getProperty("ticket.updated"));
+    }
+    public TaxInfo getTaxInfo() {
+        return tax;
+    }    
+    public void setTaxInfo(TaxInfo oTaxInfo) {
+        tax = oTaxInfo;
+    }     
+        
+// These appear on Printed TicketLine
+    public String getProductName() {
+        return attributes.getProperty("product.name");
+    }
+    public String getProductMemoDate() {
+        return attributes.getProperty("product.memodate");
+    }
+    public double getPrice() {
+        return price;
+    }
+    public double getMultiply() {
+        return multiply;
+    }
+    public double getTaxRate() {
+        return tax == null ? 0.0 : tax.getRate();
+    }
+    public double getNewPrice() {
+        newprice = price * (1.0 + getTaxRate());
+        return price;
+    }
+    public String getProductPrinter() {
+        return attributes.getProperty("product.printer");
+    }    
+
+// These are the Summaries    
+    public double getPriceTax() {
+        return price * (1.0 + getTaxRate());
+    }
+
+    public Properties getProperties() {
+        return attributes;
+    }
+    public String getProperty(String key) {
+        return attributes.getProperty(key);
+    }
+    public String getProperty(String key, String defaultvalue) {
+        return attributes.getProperty(key, defaultvalue);
+    }
+
+// These are Ticket Totals    
+    public double getTax() {
+        return price * multiply * getTaxRate();
+    }
+    public double getValue() {
+        return price * multiply * (1.0 + getTaxRate());
+    }
+    public double getSubValue() {
+        return price * multiply;
+    }    
+
+// SETTERS
+    public void setPrice(double dValue) {
+        price = dValue;
+    }
+    public void setPriceTax(double dValue) {
+        price = dValue / (1.0 + getTaxRate());               
+    }
+    public void setMultiply(double dValue) {
+        multiply = dValue;
+    }
+    public void setProperty(String key, String value) {
+        attributes.setProperty(key, value);
+    }    
+    public void setProductTaxCategoryID(String taxID){
+        attributes.setProperty("product.taxcategoryid",taxID);
+    }
+    public void setProductAttSetInstId(String value) {
+        attsetinstid = value;
+    }
+    public void setProductAttSetInstDesc(String value) {
+        if (value == null) {
+            attributes.remove(value);
+        } else {
+            attributes.setProperty("product.attsetdesc", value);
+        }
+    }
+    public void setTicketUpdated(String key, String value){
+        attributes.setProperty("ticket.updated",value);
+    }
+    public void setProductPrinter(String value) {
+        if (value == null) {
+            attributes.remove(value);
+        } else {
+            attributes.setProperty("product.printer", value);
+        }
+    }    
+    
+    /**
+     *
+     * @return
+     */
+    // Print to actual ${ticketline
+    public String printReference() {
+        return StringUtils.encodeXML(attributes.getProperty("product.reference"));
+    }
+    public String printCode() {
+        return StringUtils.encodeXML(attributes.getProperty("product.code"));
+    }
+    public String printName() {
+        return StringUtils.encodeXML(attributes.getProperty("product.name"));
+    }
+    public String printProductMemoDate() {
+        return StringUtils.encodeXML(attributes.getProperty("product.memodate"));
+    }         
+    public String printPrice() {
+        return Formats.CURRENCY.formatValue(getPrice());
+    }
+    public String printPriceTax() {
+        return Formats.CURRENCY.formatValue(getPriceTax());
+    }
+    public String printMultiply() {
+        return Formats.DOUBLE.formatValue(multiply);
+    }
+    public String printValue() {
+        return Formats.CURRENCY.formatValue(getValue());
+    }
+    public String printTaxRate() {
+        return Formats.PERCENT.formatValue(getTaxRate());
+    }
+    public String printSubValue() {
+        return Formats.CURRENCY.formatValue(getSubValue());
+    }
+    public String printTax() {
+        return Formats.CURRENCY.formatValue(getTax());
+    }
+    public String printTextTip() {
+	return attributes.getProperty("product.texttip");
+    }
+    public String printPrinter() {
+        return StringUtils.encodeXML(attributes.getProperty("product.printer"));
+    }      
+    public boolean isProductCom() {
+       return "true".equals(attributes.getProperty("product.com"));
+    }
+    public boolean isProductService() {
+	return "true".equals(attributes.getProperty("product.service"));
+    }
+    public boolean isProductVprice() {
+	return "true".equals(attributes.getProperty("product.vprice"));
+    }
+    public boolean isProductVerpatrib() {
+	return "true".equals(attributes.getProperty("product.verpatrib"));
+    }
+    public boolean isProductWarranty() {
+	return "true".equals(attributes.getProperty("product.warranty"));
+    }    
+    public boolean getUpdated() {
+        return "true".equals(attributes.getProperty("ticket.updated"));
+    }
+    public void setUpdated(Boolean value) {
+        updated = value;
+    }
+   
+}

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 String m_sId;
-    private String m_sName;
+  private static final long serialVersionUID = 7537578737839L;
+  private String m_sId;
+  private String m_sName;
+  private String taxId;
 
-    /** Creates a new instance of UserInfoBasic
-     * @param id
-     * @param name */
-    public UserInfo(String id, String name) {
-        m_sId = id;
-        m_sName = name;
-    }
+  /**
+   * Creates a new instance of UserInfoBasic
+   * 
+   * @param id
+   * @param name
+   */
+  public UserInfo(String id, String name) {
+    m_sId = id;
+    m_sName = name;
+  }
 
-    /**
-     *
-     * @return
-     */
-    public String getId() {
-        return m_sId;
-    }
+  public UserInfo(String id, String name, String taxId) {
+    m_sId = id;
+    m_sName = name;
+    this.taxId = taxId;
+  }
 
-    /**
-     *
-     * @return
-     */
-    public String getName() {
-        return m_sName;
-    }
+  /**
+   *
+   * @return
+   */
+  public String getId() {
+    return m_sId;
+  }
+
+  /**
+   *
+   * @return
+   */
+  public String getName() {
+    return m_sName;
+  }
+
+  public String getTaxID() {
+    return taxId;
+  }
 }

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 @@
-UPDATE applications SET version = $APP_VERSION{} WHERE id = $APP_ID{};
+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,
@@ -1000,4 +1001,4 @@ INSERT INTO ticketsnum_refund VALUES(1);
 INSERT INTO ticketsnum_payment VALUES(1);
 
 -- ADD APPLICATION VERSION
-INSERT INTO applications(id, name, version) VALUES($APP_ID{}, $APP_NAME{}, $APP_VERSION{});
+INSERT INTO applications(id, name, version) VALUES($APP_ID{}, $APP_NAME{}, $APP_VERSION{});

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,
@@ -975,4 +976,4 @@ INSERT INTO ticketsnum_refund VALUES(1);
 INSERT INTO ticketsnum_payment VALUES(1);
 
 -- ADD APPLICATION VERSION
-INSERT INTO applications(id, name, version) VALUES($APP_ID{}, $APP_NAME{}, $APP_VERSION{});
+INSERT INTO applications(id, name, version) VALUES($APP_ID{}, $APP_NAME{}, $APP_VERSION{});

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

@@ -1,62 +1,3 @@
--- CLEAR THE DECKS
-DELETE FROM sharedtickets;
-
--- 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';
+ALTER TABLE people ADD COLUMN IF NOT EXISTS taxId VARCHAR(255) AFTER apppassword;
+UPDATE applications SET version = $APP_VERSION{} WHERE id = $APP_ID{};
 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

@@ -1187,4 +1187,5 @@ label.csvclear=Diario de importaci\u00f3n
 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 4.5 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.find=Buscar
 label.create=Crear
-label.cancel=Cancelar
+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

@@ -468,4 +468,6 @@ transpayment.ticket=Ticket
 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
+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