Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 hugh
|
94d587705c | ||
|
hugh
|
aa6c87ab90 |
+2
-3
@@ -7,8 +7,7 @@ nbactions.xml
|
|||||||
*.log
|
*.log
|
||||||
docker.sock
|
docker.sock
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
|
||||||
.classpath
|
.classpath
|
||||||
.project
|
|
||||||
.factorypath
|
.factorypath
|
||||||
.settings
|
.settings/
|
||||||
|
.project
|
||||||
|
|||||||
@@ -1,729 +0,0 @@
|
|||||||
# 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.
|
|
||||||
@@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
<groupId>com.unicenta</groupId>
|
<groupId>com.unicenta</groupId>
|
||||||
<artifactId>unicentaopos</artifactId>
|
<artifactId>unicentaopos</artifactId>
|
||||||
<version>5.5.0-SNAPSHOT</version>
|
<version>5.4.0</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
<properties>
|
<properties>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
@@ -361,7 +361,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.unicenta</groupId>
|
<groupId>com.unicenta</groupId>
|
||||||
<artifactId>unicenta-plugins</artifactId>
|
<artifactId>unicenta-plugins</artifactId>
|
||||||
<version>1.4.0-SNAPSHOT</version>
|
<version>1.3.1</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.gluonhq</groupId>
|
<groupId>com.gluonhq</groupId>
|
||||||
|
|||||||
@@ -34,192 +34,191 @@ import java.util.regex.Pattern;
|
|||||||
@Slf4j
|
@Slf4j
|
||||||
public class StaticSentence extends JDBCSentence {
|
public class StaticSentence extends JDBCSentence {
|
||||||
|
|
||||||
private ISQLBuilderStatic iSQLBuilder;
|
|
||||||
|
|
||||||
/**
|
private ISQLBuilderStatic iSQLBuilder;
|
||||||
*
|
|
||||||
*/
|
|
||||||
protected SerializerWrite m_SerWrite = null;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
protected SerializerRead m_SerRead = null;
|
protected SerializerWrite m_SerWrite = null;
|
||||||
|
|
||||||
// Estado
|
/**
|
||||||
private Statement statement;
|
*
|
||||||
|
*/
|
||||||
|
protected SerializerRead m_SerRead = null;
|
||||||
|
|
||||||
/**
|
// Estado
|
||||||
* Creates a new instance of StaticSentence
|
private Statement statement;
|
||||||
*
|
|
||||||
* @param s
|
|
||||||
* @param sentence
|
|
||||||
* @param serread
|
|
||||||
* @param serwrite
|
|
||||||
*/
|
|
||||||
public StaticSentence(Session s, ISQLBuilderStatic sentence, SerializerWrite serwrite, SerializerRead serread) {
|
|
||||||
super(s);
|
|
||||||
iSQLBuilder = sentence;
|
|
||||||
m_SerWrite = serwrite;
|
|
||||||
m_SerRead = serread;
|
|
||||||
statement = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a new instance of StaticSentence
|
* Creates a new instance of StaticSentence
|
||||||
*
|
*
|
||||||
* @param s
|
* @param s
|
||||||
* @param sentence
|
* @param sentence
|
||||||
*/
|
* @param serread
|
||||||
public StaticSentence(Session s, ISQLBuilderStatic sentence) {
|
* @param serwrite
|
||||||
this(s, sentence, null, null);
|
*/
|
||||||
}
|
public StaticSentence(Session s, ISQLBuilderStatic sentence, SerializerWrite serwrite, SerializerRead serread) {
|
||||||
|
super(s);
|
||||||
/**
|
iSQLBuilder = sentence;
|
||||||
* Creates a new instance of StaticSentence
|
m_SerWrite = serwrite;
|
||||||
*
|
m_SerRead = serread;
|
||||||
* @param s
|
|
||||||
* @param sentence
|
|
||||||
* @param serwrite
|
|
||||||
*/
|
|
||||||
public StaticSentence(Session s, ISQLBuilderStatic sentence, SerializerWrite serwrite) {
|
|
||||||
this(s, sentence, serwrite, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a new instance of StaticSentence
|
|
||||||
*
|
|
||||||
* @param s
|
|
||||||
* @param sentence
|
|
||||||
* @param serread
|
|
||||||
* @param serwrite
|
|
||||||
*/
|
|
||||||
public StaticSentence(Session s, String sentence, SerializerWrite serwrite, SerializerRead serread) {
|
|
||||||
this(s, new NormalBuilder(sentence), serwrite, serread);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a new instance of StaticSentence
|
|
||||||
*
|
|
||||||
* @param s
|
|
||||||
* @param sentence
|
|
||||||
* @param serwrite
|
|
||||||
*/
|
|
||||||
public StaticSentence(Session s, String sentence, SerializerWrite serwrite) {
|
|
||||||
this(s, new NormalBuilder(sentence), serwrite, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a new instance of StaticSentence
|
|
||||||
*
|
|
||||||
* @param s
|
|
||||||
* @param sentence
|
|
||||||
*/
|
|
||||||
public StaticSentence(Session s, String sentence) {
|
|
||||||
this(s, new NormalBuilder(sentence), null, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
public String fixSqliteDate(String sql) {
|
|
||||||
|
|
||||||
try {
|
|
||||||
if (session.getURL().contains("sqlite") && sql.contains("{ts '")) {
|
|
||||||
StringBuilder sqliteSQL = new StringBuilder();
|
|
||||||
|
|
||||||
Pattern date = Pattern.compile("(?<=ts ).*(?=})");
|
|
||||||
Matcher matchPattern = date.matcher(sql);
|
|
||||||
|
|
||||||
if (matchPattern.find()) {
|
|
||||||
sqliteSQL.append(sql.replaceAll("\\{.*}", matchPattern.group(0)));
|
|
||||||
}
|
|
||||||
|
|
||||||
return sqliteSQL.toString();
|
|
||||||
}
|
|
||||||
|
|
||||||
} catch (Exception e) {
|
|
||||||
log.error("Error fixing sql for sqlite {}", e.getMessage());
|
|
||||||
return sql;
|
|
||||||
}
|
|
||||||
return sql;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param params
|
|
||||||
* @return
|
|
||||||
* @throws BasicException
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public DataResultSet openExec(Object params) throws BasicException {
|
|
||||||
// true -> un resultset
|
|
||||||
// false -> un updatecount (si -1 entonces se acabo)
|
|
||||||
|
|
||||||
closeExec();
|
|
||||||
|
|
||||||
try {
|
|
||||||
// follow this to find the create category bug when importing a product csv
|
|
||||||
// https://unicenta.atlassian.net/browse/UOCL-317
|
|
||||||
String sql = iSQLBuilder.getSQL(m_SerWrite, params);
|
|
||||||
String sentence = fixSqliteDate(sql);
|
|
||||||
// String sentence = iSQLBuilder.getSQL(m_SerWrite, params);
|
|
||||||
|
|
||||||
statement = session.getConnection().createStatement();
|
|
||||||
|
|
||||||
log.debug("Executing static SQL: {}", sentence);
|
|
||||||
|
|
||||||
if (statement.execute(sentence)) {
|
|
||||||
return new JDBCDataResultSet(statement.getResultSet(), m_SerRead);
|
|
||||||
} else {
|
|
||||||
int iUC = statement.getUpdateCount();
|
|
||||||
if (iUC < 0) {
|
|
||||||
return null;
|
|
||||||
} else {
|
|
||||||
return new SentenceUpdateResultSet(iUC);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (SQLException eSQL) {
|
|
||||||
throw new BasicException(eSQL);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @throws BasicException
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public void closeExec() throws BasicException {
|
|
||||||
|
|
||||||
if (statement != null) {
|
|
||||||
try {
|
|
||||||
statement.close();
|
|
||||||
} catch (SQLException eSQL) {
|
|
||||||
throw new BasicException(eSQL);
|
|
||||||
} finally {
|
|
||||||
statement = null;
|
statement = null;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return
|
* Creates a new instance of StaticSentence
|
||||||
* @throws BasicException
|
*
|
||||||
*/
|
* @param s
|
||||||
@Override
|
* @param sentence
|
||||||
public DataResultSet moreResults() throws BasicException {
|
*/
|
||||||
|
public StaticSentence(Session s, ISQLBuilderStatic sentence) {
|
||||||
|
this(s, sentence, null, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates a new instance of StaticSentence
|
||||||
|
*
|
||||||
|
* @param s
|
||||||
|
* @param sentence
|
||||||
|
* @param serwrite
|
||||||
|
*/
|
||||||
|
public StaticSentence(Session s, ISQLBuilderStatic sentence, SerializerWrite serwrite) {
|
||||||
|
this(s, sentence, serwrite, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates a new instance of StaticSentence
|
||||||
|
*
|
||||||
|
* @param s
|
||||||
|
* @param sentence
|
||||||
|
* @param serread
|
||||||
|
* @param serwrite
|
||||||
|
*/
|
||||||
|
public StaticSentence(Session s, String sentence, SerializerWrite serwrite, SerializerRead serread) {
|
||||||
|
this(s, new NormalBuilder(sentence), serwrite, serread);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates a new instance of StaticSentence
|
||||||
|
*
|
||||||
|
* @param s
|
||||||
|
* @param sentence
|
||||||
|
* @param serwrite
|
||||||
|
*/
|
||||||
|
public StaticSentence(Session s, String sentence, SerializerWrite serwrite) {
|
||||||
|
this(s, new NormalBuilder(sentence), serwrite, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates a new instance of StaticSentence
|
||||||
|
*
|
||||||
|
* @param s
|
||||||
|
* @param sentence
|
||||||
|
*/
|
||||||
|
public StaticSentence(Session s, String sentence) {
|
||||||
|
this(s, new NormalBuilder(sentence), null, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
public String fixSqliteDate(String sql) {
|
||||||
|
|
||||||
|
try {
|
||||||
|
if (session.getURL().contains("sqlite") && sql.contains("{ts '")) {
|
||||||
|
StringBuilder sqliteSQL = new StringBuilder();
|
||||||
|
|
||||||
|
Pattern date = Pattern.compile("(?<=ts ).*(?=})");
|
||||||
|
Matcher matchPattern = date.matcher(sql);
|
||||||
|
|
||||||
|
if (matchPattern.find()) {
|
||||||
|
sqliteSQL.append(sql.replaceAll("\\{.*}", matchPattern.group(0)));
|
||||||
|
}
|
||||||
|
|
||||||
|
return sqliteSQL.toString();
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
|
||||||
if (statement.getMoreResults()) {
|
|
||||||
// tenemos resultset
|
|
||||||
return new JDBCDataResultSet(statement.getResultSet(), m_SerRead);
|
|
||||||
} else {
|
|
||||||
// tenemos updatecount o si devuelve -1 ya no hay mas
|
|
||||||
int iUC = statement.getUpdateCount();
|
|
||||||
if (iUC < 0) {
|
|
||||||
return null;
|
|
||||||
} else {
|
|
||||||
return new SentenceUpdateResultSet(iUC);
|
|
||||||
}
|
}
|
||||||
}
|
catch (Exception e) {
|
||||||
} catch (SQLException eSQL) {
|
log.error("Error fixing sql for sqlite {}", e.getMessage());
|
||||||
throw new BasicException(eSQL);
|
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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -50,12 +50,10 @@ public class DataLogicAdmin extends BeanFactoryDataSingle {
|
|||||||
|
|
||||||
m_tpeople = new TableDefinition(s,
|
m_tpeople = new TableDefinition(s,
|
||||||
"people"
|
"people"
|
||||||
, new String[] {"ID", "NAME", "APPPASSWORD", "ROLE", "VISIBLE", "CARD", "IMAGE", "TAXID"}
|
, new String[] {"ID", "NAME", "APPPASSWORD", "ROLE", "VISIBLE", "CARD", "IMAGE"}
|
||||||
, new String[] {"ID", AppLocal.getIntString("label.peoplename"), AppLocal.getIntString("label.Password"),
|
, 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")}
|
||||||
AppLocal.getIntString("label.role"), AppLocal.getIntString("label.peoplevisible"),
|
, new Datas[] {Datas.STRING, Datas.STRING, Datas.STRING, Datas.STRING, Datas.BOOLEAN, Datas.STRING, Datas.IMAGE}
|
||||||
AppLocal.getIntString("label.card"), AppLocal.getIntString("label.peopleimage"), "tax ID"}
|
, new Formats[] {Formats.STRING, Formats.STRING, Formats.STRING, Formats.STRING, Formats.BOOLEAN, Formats.STRING, Formats.NULL}
|
||||||
, 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}
|
, new int[] {0}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@@ -52,18 +52,16 @@
|
|||||||
<Group type="102" alignment="0" attributes="0">
|
<Group type="102" alignment="0" attributes="0">
|
||||||
<Group type="103" groupAlignment="0" attributes="0">
|
<Group type="103" groupAlignment="0" attributes="0">
|
||||||
<Component id="jLabel1" min="-2" max="-2" attributes="0"/>
|
<Component id="jLabel1" min="-2" max="-2" attributes="0"/>
|
||||||
<Component id="passwordLabel" alignment="0" min="-2" max="-2" attributes="0"/>
|
<Component id="jLabel6" alignment="0" min="-2" max="-2" attributes="0"/>
|
||||||
<Component id="taxIdLabel" alignment="0" min="-2" max="-2" attributes="0"/>
|
|
||||||
</Group>
|
</Group>
|
||||||
<EmptySpace type="unrelated" max="-2" attributes="0"/>
|
<EmptySpace type="unrelated" max="-2" attributes="0"/>
|
||||||
<Group type="103" groupAlignment="0" 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="jButton1" min="-2" max="-2" attributes="0"/>
|
||||||
<Component id="m_jName" min="-2" pref="180" max="-2" attributes="0"/>
|
<Component id="m_jName" min="-2" pref="180" max="-2" attributes="0"/>
|
||||||
</Group>
|
</Group>
|
||||||
</Group>
|
</Group>
|
||||||
</Group>
|
</Group>
|
||||||
<EmptySpace pref="50" max="32767" attributes="0"/>
|
<EmptySpace max="-2" attributes="0"/>
|
||||||
</Group>
|
</Group>
|
||||||
</Group>
|
</Group>
|
||||||
</DimensionLayout>
|
</DimensionLayout>
|
||||||
@@ -77,15 +75,10 @@
|
|||||||
</Group>
|
</Group>
|
||||||
<EmptySpace type="unrelated" max="-2" attributes="0"/>
|
<EmptySpace type="unrelated" max="-2" attributes="0"/>
|
||||||
<Group type="103" groupAlignment="2" attributes="0">
|
<Group type="103" groupAlignment="2" attributes="0">
|
||||||
<Component id="passwordLabel" alignment="2" min="-2" max="-2" attributes="0"/>
|
<Component id="jLabel6" alignment="2" min="-2" max="-2" attributes="0"/>
|
||||||
<Component id="jButton1" alignment="2" min="-2" max="-2" attributes="0"/>
|
<Component id="jButton1" alignment="2" min="-2" max="-2" attributes="0"/>
|
||||||
</Group>
|
</Group>
|
||||||
<EmptySpace max="-2" attributes="0"/>
|
<EmptySpace type="unrelated" 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">
|
<Group type="103" groupAlignment="2" attributes="0">
|
||||||
<Component id="jLblCardID" alignment="2" min="-2" max="-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="m_jcard" alignment="2" min="-2" max="-2" attributes="0"/>
|
||||||
@@ -106,7 +99,7 @@
|
|||||||
<Component id="m_jImage" min="-2" max="-2" attributes="0"/>
|
<Component id="m_jImage" min="-2" max="-2" attributes="0"/>
|
||||||
<Component id="jLabel4" min="-2" max="-2" attributes="0"/>
|
<Component id="jLabel4" min="-2" max="-2" attributes="0"/>
|
||||||
</Group>
|
</Group>
|
||||||
<EmptySpace pref="110" max="32767" attributes="0"/>
|
<EmptySpace max="32767" attributes="0"/>
|
||||||
</Group>
|
</Group>
|
||||||
</Group>
|
</Group>
|
||||||
</DimensionLayout>
|
</DimensionLayout>
|
||||||
@@ -253,11 +246,8 @@
|
|||||||
</Property>
|
</Property>
|
||||||
</Properties>
|
</Properties>
|
||||||
</Component>
|
</Component>
|
||||||
<Component class="javax.swing.JComboBox" name="webCBSecurity">
|
<Component class="com.alee.laf.combobox.WebComboBox" name="webCBSecurity">
|
||||||
<Properties>
|
<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">
|
<Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
|
||||||
<StringArray count="3">
|
<StringArray count="3">
|
||||||
<StringItem index="0" value="Generate new key"/>
|
<StringItem index="0" value="Generate new key"/>
|
||||||
@@ -271,6 +261,9 @@
|
|||||||
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
|
<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("tooltip.peoplesecurity")"/>
|
<ResourceString bundle="pos_messages.properties" key="tooltip.peoplesecurity" replaceFormat="AppLocal.getIntString("tooltip.peoplesecurity")"/>
|
||||||
</Property>
|
</Property>
|
||||||
|
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
||||||
|
<Font name="Arial" size="14" style="0"/>
|
||||||
|
</Property>
|
||||||
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
|
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
|
||||||
<Dimension value="[140, 45]"/>
|
<Dimension value="[140, 45]"/>
|
||||||
</Property>
|
</Property>
|
||||||
@@ -279,7 +272,7 @@
|
|||||||
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="webCBSecurityActionPerformed"/>
|
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="webCBSecurityActionPerformed"/>
|
||||||
</Events>
|
</Events>
|
||||||
</Component>
|
</Component>
|
||||||
<Component class="javax.swing.JLabel" name="passwordLabel">
|
<Component class="javax.swing.JLabel" name="jLabel6">
|
||||||
<Properties>
|
<Properties>
|
||||||
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
||||||
<Font name="Arial" size="14" style="0"/>
|
<Font name="Arial" size="14" style="0"/>
|
||||||
@@ -292,23 +285,5 @@
|
|||||||
</Property>
|
</Property>
|
||||||
</Properties>
|
</Properties>
|
||||||
</Component>
|
</Component>
|
||||||
<Component class="javax.swing.JTextField" name="taxIdTextField">
|
|
||||||
<Properties>
|
|
||||||
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
|
||||||
<Font name="Arial" size="14" style="0"/>
|
|
||||||
</Property>
|
|
||||||
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
|
|
||||||
<Dimension value="[0, 30]"/>
|
|
||||||
</Property>
|
|
||||||
</Properties>
|
|
||||||
</Component>
|
|
||||||
<Component class="javax.swing.JLabel" name="taxIdLabel">
|
|
||||||
<Properties>
|
|
||||||
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
|
|
||||||
<Font name="Arial" size="14" style="0"/>
|
|
||||||
</Property>
|
|
||||||
<Property name="text" type="java.lang.String" value="Tax ID"/>
|
|
||||||
</Properties>
|
|
||||||
</Component>
|
|
||||||
</SubComponents>
|
</SubComponents>
|
||||||
</Form>
|
</Form>
|
||||||
|
|||||||
@@ -42,479 +42,426 @@ import javax.swing.*;
|
|||||||
*/
|
*/
|
||||||
public class PeopleView extends JPanel implements EditorRecord {
|
public class PeopleView extends JPanel implements EditorRecord {
|
||||||
|
|
||||||
private Object m_oId;
|
private Object m_oId;
|
||||||
private String m_sPassword;
|
private String m_sPassword;
|
||||||
|
|
||||||
private final DirtyManager m_Dirty;
|
private final DirtyManager m_Dirty;
|
||||||
|
|
||||||
private final SentenceList m_sentrole;
|
private final SentenceList m_sentrole;
|
||||||
private ComboBoxValModel m_RoleModel;
|
private ComboBoxValModel m_RoleModel;
|
||||||
|
|
||||||
private final ComboBoxValModel m_ReasonModel;
|
private final ComboBoxValModel m_ReasonModel;
|
||||||
|
|
||||||
/**
|
/** Creates new form PeopleEditor
|
||||||
* Creates new form PeopleEditor
|
* @param dlAdmin
|
||||||
*
|
* @param dirty */
|
||||||
* @param dlAdmin
|
public PeopleView(DataLogicAdmin dlAdmin, DirtyManager dirty) {
|
||||||
* @param dirty
|
|
||||||
*/
|
|
||||||
public PeopleView(DataLogicAdmin dlAdmin, DirtyManager dirty) {
|
|
||||||
|
|
||||||
initComponents();
|
initComponents();
|
||||||
|
|
||||||
// El modelo de roles
|
// El modelo de roles
|
||||||
m_sentrole = dlAdmin.getRolesList();
|
m_sentrole = dlAdmin.getRolesList();
|
||||||
m_RoleModel = new ComboBoxValModel();
|
m_RoleModel = new ComboBoxValModel();
|
||||||
|
|
||||||
m_Dirty = dirty;
|
m_Dirty = dirty;
|
||||||
m_jName.getDocument().addDocumentListener(dirty);
|
m_jName.getDocument().addDocumentListener(dirty);
|
||||||
m_jRole.addActionListener(dirty);
|
m_jRole.addActionListener(dirty);
|
||||||
m_jVisible.addActionListener(dirty);
|
m_jVisible.addActionListener(dirty);
|
||||||
m_jImage.addPropertyChangeListener("image", dirty);
|
m_jImage.addPropertyChangeListener("image", dirty);
|
||||||
m_jcard.getDocument().addDocumentListener(dirty);
|
m_jcard.getDocument().addDocumentListener(dirty);
|
||||||
|
|
||||||
m_ReasonModel = new ComboBoxValModel();
|
m_ReasonModel = new ComboBoxValModel();
|
||||||
m_ReasonModel.add(AppLocal.getIntString("cboption.generate"));
|
m_ReasonModel.add(AppLocal.getIntString("cboption.generate"));
|
||||||
m_ReasonModel.add(AppLocal.getIntString("cboption.clear"));
|
m_ReasonModel.add(AppLocal.getIntString("cboption.clear"));
|
||||||
m_ReasonModel.add(AppLocal.getIntString("cboption.iButton"));
|
m_ReasonModel.add(AppLocal.getIntString("cboption.iButton"));
|
||||||
|
|
||||||
webCBSecurity.setModel(m_ReasonModel);
|
webCBSecurity.setModel(m_ReasonModel);
|
||||||
|
|
||||||
taxIdTextField.getDocument().addDocumentListener(dirty);
|
writeValueEOF();
|
||||||
writeValueEOF();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public void writeValueEOF() {
|
|
||||||
m_oId = null;
|
|
||||||
m_jName.setText(null);
|
|
||||||
m_sPassword = null;
|
|
||||||
m_RoleModel.setSelectedKey(null);
|
|
||||||
m_jVisible.setSelected(false);
|
|
||||||
m_jcard.setText(null);
|
|
||||||
m_jImage.setImage(null);
|
|
||||||
taxIdTextField.setText(null);
|
|
||||||
m_jName.setEnabled(false);
|
|
||||||
m_jRole.setEnabled(false);
|
|
||||||
m_jVisible.setEnabled(false);
|
|
||||||
m_jcard.setEnabled(false);
|
|
||||||
m_jImage.setEnabled(false);
|
|
||||||
jButton1.setEnabled(false);
|
|
||||||
webCBSecurity.setEnabled(false);
|
|
||||||
taxIdTextField.setEnabled(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public void writeValueInsert() {
|
|
||||||
m_oId = null;
|
|
||||||
m_jName.setText(null);
|
|
||||||
m_sPassword = null;
|
|
||||||
m_RoleModel.setSelectedKey(null);
|
|
||||||
m_jVisible.setSelected(true);
|
|
||||||
m_jcard.setText(null);
|
|
||||||
m_jImage.setImage(null);
|
|
||||||
taxIdTextField.setText(null);
|
|
||||||
m_jName.setEnabled(true);
|
|
||||||
m_jRole.setEnabled(true);
|
|
||||||
m_jVisible.setEnabled(true);
|
|
||||||
m_jcard.setEnabled(true);
|
|
||||||
m_jImage.setEnabled(true);
|
|
||||||
jButton1.setEnabled(true);
|
|
||||||
webCBSecurity.setEnabled(true);
|
|
||||||
taxIdTextField.setEnabled(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* @param value
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public void writeValueDelete(Object value) {
|
|
||||||
Object[] people = (Object[]) value;
|
|
||||||
m_oId = people[0];
|
|
||||||
m_jName.setText(Formats.STRING.formatValue(people[1]));
|
|
||||||
m_sPassword = Formats.STRING.formatValue(people[2]);
|
|
||||||
m_RoleModel.setSelectedKey(people[3]);
|
|
||||||
m_jVisible.setSelected(((Boolean) people[4]).booleanValue());
|
|
||||||
m_jcard.setText(Formats.STRING.formatValue(people[5]));
|
|
||||||
m_jImage.setImage((BufferedImage) people[6]);
|
|
||||||
taxIdTextField.setText(Formats.STRING.formatValue(people[7]));
|
|
||||||
|
|
||||||
m_jName.setEnabled(false);
|
|
||||||
m_jRole.setEnabled(false);
|
|
||||||
m_jVisible.setEnabled(false);
|
|
||||||
m_jcard.setEnabled(false);
|
|
||||||
m_jImage.setEnabled(false);
|
|
||||||
jButton1.setEnabled(false);
|
|
||||||
webCBSecurity.setEnabled(false);
|
|
||||||
taxIdTextField.setEnabled(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* @param value
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public void writeValueEdit(Object value) {
|
|
||||||
Object[] people = (Object[]) value;
|
|
||||||
m_oId = people[0];
|
|
||||||
m_jName.setText(Formats.STRING.formatValue(people[1]));
|
|
||||||
m_sPassword = Formats.STRING.formatValue(people[2]);
|
|
||||||
m_RoleModel.setSelectedKey(people[3]);
|
|
||||||
m_jVisible.setSelected(((Boolean) people[4]).booleanValue());
|
|
||||||
m_jcard.setText(Formats.STRING.formatValue(people[5]));
|
|
||||||
m_jImage.setImage((BufferedImage) people[6]);
|
|
||||||
taxIdTextField.setText(Formats.STRING.formatValue(people[7]));
|
|
||||||
if (m_jcard.getText().length() == 16) {
|
|
||||||
jLblCardID.setText(AppLocal.getIntString("label.ibutton"));
|
|
||||||
} else {
|
|
||||||
jLblCardID.setText(AppLocal.getIntString("label.card"));
|
|
||||||
}
|
}
|
||||||
// System.out.println(m_jcard.getText().length());
|
|
||||||
|
|
||||||
m_jName.setEnabled(true);
|
/**
|
||||||
m_jRole.setEnabled(true);
|
*
|
||||||
m_jVisible.setEnabled(true);
|
*/
|
||||||
m_jcard.setEnabled(true);
|
@Override
|
||||||
m_jImage.setEnabled(true);
|
public void writeValueEOF() {
|
||||||
jButton1.setEnabled(true);
|
m_oId = null;
|
||||||
webCBSecurity.setEnabled(true);
|
m_jName.setText(null);
|
||||||
taxIdTextField.setEnabled(true);
|
m_sPassword = null;
|
||||||
}
|
m_RoleModel.setSelectedKey(null);
|
||||||
|
m_jVisible.setSelected(false);
|
||||||
|
m_jcard.setText(null);
|
||||||
|
m_jImage.setImage(null);
|
||||||
|
m_jName.setEnabled(false);
|
||||||
|
m_jRole.setEnabled(false);
|
||||||
|
m_jVisible.setEnabled(false);
|
||||||
|
m_jcard.setEnabled(false);
|
||||||
|
m_jImage.setEnabled(false);
|
||||||
|
jButton1.setEnabled(false);
|
||||||
|
webCBSecurity.setEnabled(false);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @return
|
*/
|
||||||
* @throws BasicException
|
@Override
|
||||||
*/
|
public void writeValueInsert() {
|
||||||
@Override
|
m_oId = null;
|
||||||
public Object createValue() throws BasicException {
|
m_jName.setText(null);
|
||||||
Object[] people = new Object[8];
|
m_sPassword = null;
|
||||||
people[0] = m_oId == null ? UUID.randomUUID().toString() : m_oId;
|
m_RoleModel.setSelectedKey(null);
|
||||||
people[1] = Formats.STRING.parseValue(m_jName.getText());
|
m_jVisible.setSelected(true);
|
||||||
people[2] = Formats.STRING.parseValue(m_sPassword);
|
m_jcard.setText(null);
|
||||||
people[3] = m_RoleModel.getSelectedKey();
|
m_jImage.setImage(null);
|
||||||
people[4] = m_jVisible.isSelected();
|
m_jName.setEnabled(true);
|
||||||
people[5] = Formats.STRING.parseValue(m_jcard.getText());
|
m_jRole.setEnabled(true);
|
||||||
people[6] = m_jImage.getImage();
|
m_jVisible.setEnabled(true);
|
||||||
people[7] = Formats.STRING.parseValue(taxIdTextField.getText());
|
m_jcard.setEnabled(true);
|
||||||
return people;
|
m_jImage.setEnabled(true);
|
||||||
}
|
jButton1.setEnabled(true);
|
||||||
|
webCBSecurity.setEnabled(true);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @return
|
* @param value
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Component getComponent() {
|
public void writeValueDelete(Object value) {
|
||||||
return this;
|
Object[] people = (Object[]) value;
|
||||||
}
|
m_oId = people[0];
|
||||||
|
m_jName.setText(Formats.STRING.formatValue(people[1]));
|
||||||
|
m_sPassword = Formats.STRING.formatValue(people[2]);
|
||||||
|
m_RoleModel.setSelectedKey(people[3]);
|
||||||
|
m_jVisible.setSelected(((Boolean) people[4]).booleanValue());
|
||||||
|
m_jcard.setText(Formats.STRING.formatValue(people[5]));
|
||||||
|
m_jImage.setImage((BufferedImage) people[6]);
|
||||||
|
|
||||||
/**
|
m_jName.setEnabled(false);
|
||||||
*
|
m_jRole.setEnabled(false);
|
||||||
* @throws BasicException
|
m_jVisible.setEnabled(false);
|
||||||
*/
|
m_jcard.setEnabled(false);
|
||||||
public void activate() throws BasicException {
|
m_jImage.setEnabled(false);
|
||||||
|
jButton1.setEnabled(false);
|
||||||
|
webCBSecurity.setEnabled(false);
|
||||||
|
}
|
||||||
|
|
||||||
m_RoleModel = new ComboBoxValModel(m_sentrole.list());
|
/**
|
||||||
m_jRole.setModel(m_RoleModel);
|
*
|
||||||
}
|
* @param value
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public void writeValueEdit(Object value) {
|
||||||
|
Object[] people = (Object[]) value;
|
||||||
|
m_oId = people[0];
|
||||||
|
m_jName.setText(Formats.STRING.formatValue(people[1]));
|
||||||
|
m_sPassword = Formats.STRING.formatValue(people[2]);
|
||||||
|
m_RoleModel.setSelectedKey(people[3]);
|
||||||
|
m_jVisible.setSelected(((Boolean) people[4]).booleanValue());
|
||||||
|
m_jcard.setText(Formats.STRING.formatValue(people[5]));
|
||||||
|
m_jImage.setImage((BufferedImage) people[6]);
|
||||||
|
|
||||||
/**
|
if (m_jcard.getText().length() == 16) {
|
||||||
*
|
jLblCardID.setText(AppLocal.getIntString("label.ibutton"));
|
||||||
*/
|
} else {
|
||||||
@Override
|
jLblCardID.setText(AppLocal.getIntString("label.card"));
|
||||||
public void refresh() {
|
}
|
||||||
}
|
System.out.println(m_jcard.getText().length());
|
||||||
|
|
||||||
/**
|
m_jName.setEnabled(true);
|
||||||
* This method is called from within the constructor to
|
m_jRole.setEnabled(true);
|
||||||
* initialize the form.
|
m_jVisible.setEnabled(true);
|
||||||
* WARNING: Do NOT modify this code. The content of this method is
|
m_jcard.setEnabled(true);
|
||||||
* always regenerated by the Form Editor.
|
m_jImage.setEnabled(true);
|
||||||
*/
|
jButton1.setEnabled(true);
|
||||||
// <editor-fold defaultstate="collapsed" desc="Generated
|
webCBSecurity.setEnabled(true);
|
||||||
// <editor-fold defaultstate="collapsed" desc="Generated
|
}
|
||||||
// Code">//GEN-BEGIN:initComponents
|
|
||||||
private void initComponents() {
|
|
||||||
|
|
||||||
jLabel1 = new javax.swing.JLabel();
|
/**
|
||||||
m_jName = new javax.swing.JTextField();
|
*
|
||||||
m_jVisible = new javax.swing.JCheckBox();
|
* @return
|
||||||
jLabel3 = new javax.swing.JLabel();
|
* @throws BasicException
|
||||||
jLabel4 = new javax.swing.JLabel();
|
*/
|
||||||
m_jImage = new com.unicenta.data.gui.JImageEditor();
|
@Override
|
||||||
jButton1 = new javax.swing.JButton();
|
public Object createValue() throws BasicException {
|
||||||
m_jRole = new javax.swing.JComboBox();
|
Object[] people = new Object[7];
|
||||||
jLabel2 = new javax.swing.JLabel();
|
people[0] = m_oId == null ? UUID.randomUUID().toString() : m_oId;
|
||||||
m_jcard = new javax.swing.JTextField();
|
people[1] = Formats.STRING.parseValue(m_jName.getText());
|
||||||
jLblCardID = new javax.swing.JLabel();
|
people[2] = Formats.STRING.parseValue(m_sPassword);
|
||||||
webCBSecurity = new javax.swing.JComboBox();
|
people[3] = m_RoleModel.getSelectedKey();
|
||||||
passwordLabel = new javax.swing.JLabel();
|
people[4] = m_jVisible.isSelected();
|
||||||
taxIdTextField = new javax.swing.JTextField();
|
people[5] = Formats.STRING.parseValue(m_jcard.getText());
|
||||||
taxIdLabel = new javax.swing.JLabel();
|
people[6] = m_jImage.getImage();
|
||||||
|
return people;
|
||||||
|
}
|
||||||
|
|
||||||
setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
|
/**
|
||||||
setPreferredSize(new java.awt.Dimension(500, 500));
|
*
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public Component getComponent() {
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
jLabel1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
/**
|
||||||
jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/info.png"))); // NOI18N
|
*
|
||||||
jLabel1.setText(AppLocal.getIntString("label.peoplenamem")); // NOI18N
|
* @throws BasicException
|
||||||
jLabel1.setPreferredSize(new java.awt.Dimension(110, 30));
|
*/
|
||||||
jLabel1.addMouseListener(new java.awt.event.MouseAdapter() {
|
public void activate() throws BasicException {
|
||||||
public void mouseClicked(java.awt.event.MouseEvent evt) {
|
|
||||||
jLabel1MouseClicked(evt);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
m_jName.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
m_RoleModel = new ComboBoxValModel(m_sentrole.list());
|
||||||
m_jName.setPreferredSize(new java.awt.Dimension(0, 30));
|
m_jRole.setModel(m_RoleModel);
|
||||||
|
}
|
||||||
|
|
||||||
m_jVisible.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
|
|
||||||
m_jVisible.setPreferredSize(new java.awt.Dimension(0, 30));
|
|
||||||
|
|
||||||
jLabel3.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
/**
|
||||||
jLabel3.setText(AppLocal.getIntString("label.peoplevisible")); // NOI18N
|
*
|
||||||
jLabel3.setPreferredSize(new java.awt.Dimension(110, 30));
|
*/
|
||||||
|
@Override
|
||||||
|
public void refresh() {
|
||||||
|
}
|
||||||
|
|
||||||
jLabel4.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
/** This method is called from within the constructor to
|
||||||
jLabel4.setText(AppLocal.getIntString("label.peopleimage")); // NOI18N
|
* initialize the form.
|
||||||
jLabel4.setPreferredSize(new java.awt.Dimension(110, 30));
|
* WARNING: Do NOT modify this code. The content of this method is
|
||||||
|
* always regenerated by the Form Editor.
|
||||||
|
*/
|
||||||
|
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
|
||||||
|
private void initComponents() {
|
||||||
|
|
||||||
m_jImage.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
|
jLabel1 = new javax.swing.JLabel();
|
||||||
m_jImage.setPreferredSize(new java.awt.Dimension(300, 250));
|
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();
|
||||||
|
jLabel2 = new javax.swing.JLabel();
|
||||||
|
m_jcard = new javax.swing.JTextField();
|
||||||
|
jLblCardID = new javax.swing.JLabel();
|
||||||
|
webCBSecurity = new com.alee.laf.combobox.WebComboBox();
|
||||||
|
jLabel6 = new javax.swing.JLabel();
|
||||||
|
|
||||||
jButton1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
|
||||||
jButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/password.png"))); // NOI18N
|
setPreferredSize(new java.awt.Dimension(500, 500));
|
||||||
jButton1.setText(AppLocal.getIntString("button.peoplepassword")); // NOI18N
|
|
||||||
jButton1.setToolTipText("");
|
|
||||||
jButton1.setPreferredSize(new java.awt.Dimension(80, 45));
|
|
||||||
jButton1.addActionListener(new java.awt.event.ActionListener() {
|
|
||||||
public void actionPerformed(java.awt.event.ActionEvent evt) {
|
|
||||||
jButton1ActionPerformed(evt);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
m_jRole.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
jLabel1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||||
m_jRole.setPreferredSize(new java.awt.Dimension(0, 30));
|
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) {
|
||||||
|
jLabel1MouseClicked(evt);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
jLabel2.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
m_jName.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||||
jLabel2.setText(AppLocal.getIntString("label.rolem")); // NOI18N
|
m_jName.setPreferredSize(new java.awt.Dimension(0, 30));
|
||||||
jLabel2.setPreferredSize(new java.awt.Dimension(110, 30));
|
|
||||||
|
|
||||||
m_jcard.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
m_jVisible.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
|
||||||
m_jcard.setPreferredSize(new java.awt.Dimension(0, 30));
|
m_jVisible.setPreferredSize(new java.awt.Dimension(0, 30));
|
||||||
|
|
||||||
jLblCardID.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
jLabel3.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||||
jLblCardID.setText(AppLocal.getIntString("label.card")); // NOI18N
|
jLabel3.setText(AppLocal.getIntString("label.peoplevisible")); // NOI18N
|
||||||
jLblCardID.setPreferredSize(new java.awt.Dimension(110, 30));
|
jLabel3.setPreferredSize(new java.awt.Dimension(110, 30));
|
||||||
|
|
||||||
webCBSecurity.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
jLabel4.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||||
webCBSecurity.setModel(new javax.swing.DefaultComboBoxModel(
|
jLabel4.setText(AppLocal.getIntString("label.peopleimage")); // NOI18N
|
||||||
new String[] { "Generate new key", "Delete exisitng key", "Use iButton ID" }));
|
jLabel4.setPreferredSize(new java.awt.Dimension(110, 30));
|
||||||
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
|
m_jImage.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
|
||||||
passwordLabel.setText(AppLocal.getIntString("label.Password")); // NOI18N
|
m_jImage.setPreferredSize(new java.awt.Dimension(300, 250));
|
||||||
passwordLabel.setPreferredSize(new java.awt.Dimension(110, 30));
|
|
||||||
|
|
||||||
taxIdTextField.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
jButton1.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||||
taxIdTextField.setPreferredSize(new java.awt.Dimension(0, 30));
|
jButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/password.png"))); // NOI18N
|
||||||
|
jButton1.setText(AppLocal.getIntString("button.peoplepassword")); // NOI18N
|
||||||
|
jButton1.setToolTipText("");
|
||||||
|
jButton1.setPreferredSize(new java.awt.Dimension(80, 45));
|
||||||
|
jButton1.addActionListener(new java.awt.event.ActionListener() {
|
||||||
|
public void actionPerformed(java.awt.event.ActionEvent evt) {
|
||||||
|
jButton1ActionPerformed(evt);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
taxIdLabel.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
m_jRole.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||||
taxIdLabel.setText("Tax ID");
|
m_jRole.setPreferredSize(new java.awt.Dimension(0, 30));
|
||||||
|
|
||||||
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
|
jLabel2.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||||
this.setLayout(layout);
|
jLabel2.setText(AppLocal.getIntString("label.rolem")); // NOI18N
|
||||||
layout.setHorizontalGroup(
|
jLabel2.setPreferredSize(new java.awt.Dimension(110, 30));
|
||||||
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
|
||||||
|
m_jcard.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||||
|
m_jcard.setPreferredSize(new java.awt.Dimension(0, 30));
|
||||||
|
|
||||||
|
jLblCardID.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||||
|
jLblCardID.setText(AppLocal.getIntString("label.card")); // NOI18N
|
||||||
|
jLblCardID.setPreferredSize(new java.awt.Dimension(110, 30));
|
||||||
|
|
||||||
|
webCBSecurity.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Generate new key", "Delete exisitng key", "Use iButton ID" }));
|
||||||
|
webCBSecurity.setSelectedIndex(0);
|
||||||
|
webCBSecurity.setToolTipText(AppLocal.getIntString("tooltip.peoplesecurity")); // NOI18N
|
||||||
|
webCBSecurity.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||||
|
webCBSecurity.setPreferredSize(new java.awt.Dimension(140, 45));
|
||||||
|
webCBSecurity.addActionListener(new java.awt.event.ActionListener() {
|
||||||
|
public void actionPerformed(java.awt.event.ActionEvent evt) {
|
||||||
|
webCBSecurityActionPerformed(evt);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
jLabel6.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
|
||||||
|
jLabel6.setText(AppLocal.getIntString("label.Password")); // NOI18N
|
||||||
|
jLabel6.setPreferredSize(new java.awt.Dimension(110, 30));
|
||||||
|
|
||||||
|
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
|
||||||
|
this.setLayout(layout);
|
||||||
|
layout.setHorizontalGroup(
|
||||||
|
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||||
.addGroup(layout.createSequentialGroup()
|
.addGroup(layout.createSequentialGroup()
|
||||||
.addContainerGap()
|
.addContainerGap()
|
||||||
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||||
.addGroup(layout.createSequentialGroup()
|
.addGroup(layout.createSequentialGroup()
|
||||||
.addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE,
|
.addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
|
||||||
.addGap(18, 18, 18)
|
.addGap(18, 18, 18)
|
||||||
.addComponent(m_jVisible, javax.swing.GroupLayout.PREFERRED_SIZE, 207,
|
.addComponent(m_jVisible, javax.swing.GroupLayout.PREFERRED_SIZE, 207, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||||
javax.swing.GroupLayout.PREFERRED_SIZE))
|
|
||||||
.addGroup(layout.createSequentialGroup()
|
.addGroup(layout.createSequentialGroup()
|
||||||
.addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE,
|
.addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
|
||||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||||
.addComponent(m_jRole, javax.swing.GroupLayout.PREFERRED_SIZE, 180,
|
.addComponent(m_jRole, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||||
javax.swing.GroupLayout.PREFERRED_SIZE))
|
|
||||||
.addGroup(layout.createSequentialGroup()
|
.addGroup(layout.createSequentialGroup()
|
||||||
.addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE,
|
.addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
|
||||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||||
.addComponent(m_jImage, javax.swing.GroupLayout.PREFERRED_SIZE,
|
.addComponent(m_jImage, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||||
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
|
||||||
.addGroup(layout.createSequentialGroup()
|
.addGroup(layout.createSequentialGroup()
|
||||||
.addComponent(jLblCardID, javax.swing.GroupLayout.PREFERRED_SIZE,
|
.addComponent(jLblCardID, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
|
||||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||||
.addComponent(m_jcard, javax.swing.GroupLayout.PREFERRED_SIZE, 180,
|
.addComponent(m_jcard, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
javax.swing.GroupLayout.PREFERRED_SIZE)
|
|
||||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||||
.addComponent(webCBSecurity, 0, javax.swing.GroupLayout.DEFAULT_SIZE,
|
.addComponent(webCBSecurity, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||||
javax.swing.GroupLayout.PREFERRED_SIZE))
|
|
||||||
.addGroup(layout.createSequentialGroup()
|
.addGroup(layout.createSequentialGroup()
|
||||||
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||||
.addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE,
|
.addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
.addComponent(jLabel6, 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)
|
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||||
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||||
.addComponent(taxIdTextField, javax.swing.GroupLayout.PREFERRED_SIZE, 180,
|
.addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
javax.swing.GroupLayout.PREFERRED_SIZE)
|
.addComponent(m_jName, javax.swing.GroupLayout.PREFERRED_SIZE, 180, javax.swing.GroupLayout.PREFERRED_SIZE))))
|
||||||
.addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE,
|
.addContainerGap())
|
||||||
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
);
|
||||||
.addComponent(m_jName, javax.swing.GroupLayout.PREFERRED_SIZE, 180,
|
layout.setVerticalGroup(
|
||||||
javax.swing.GroupLayout.PREFERRED_SIZE))))
|
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||||
.addContainerGap(50, Short.MAX_VALUE)));
|
|
||||||
layout.setVerticalGroup(
|
|
||||||
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
|
||||||
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
|
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
|
||||||
.addGap(18, 18, 18)
|
.addGap(18, 18, 18)
|
||||||
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||||
.addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
|
.addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
javax.swing.GroupLayout.PREFERRED_SIZE)
|
.addComponent(m_jName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||||
.addComponent(m_jName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
|
|
||||||
javax.swing.GroupLayout.PREFERRED_SIZE))
|
|
||||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||||
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
|
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
|
||||||
.addComponent(passwordLabel, javax.swing.GroupLayout.PREFERRED_SIZE,
|
.addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
.addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||||
.addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE,
|
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||||
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)
|
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
|
||||||
.addComponent(jLblCardID, javax.swing.GroupLayout.PREFERRED_SIZE,
|
.addComponent(jLblCardID, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
.addComponent(m_jcard, 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,
|
.addComponent(webCBSecurity, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_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)
|
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||||
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||||
.addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
|
.addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
javax.swing.GroupLayout.PREFERRED_SIZE)
|
.addComponent(m_jRole, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||||
.addComponent(m_jRole, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
|
|
||||||
javax.swing.GroupLayout.PREFERRED_SIZE))
|
|
||||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
|
||||||
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||||
.addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 25,
|
.addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
javax.swing.GroupLayout.PREFERRED_SIZE)
|
.addComponent(m_jVisible, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||||
.addComponent(m_jVisible, javax.swing.GroupLayout.PREFERRED_SIZE, 25,
|
|
||||||
javax.swing.GroupLayout.PREFERRED_SIZE))
|
|
||||||
.addGap(15, 15, 15)
|
.addGap(15, 15, 15)
|
||||||
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||||
.addComponent(m_jImage, javax.swing.GroupLayout.PREFERRED_SIZE,
|
.addComponent(m_jImage, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
.addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||||
.addComponent(jLabel4, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
|
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
|
||||||
javax.swing.GroupLayout.PREFERRED_SIZE))
|
);
|
||||||
.addContainerGap(110, Short.MAX_VALUE)));
|
}// </editor-fold>//GEN-END:initComponents
|
||||||
}// </editor-fold>//GEN-END:initComponents
|
|
||||||
|
|
||||||
private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_jButton1ActionPerformed
|
private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
|
||||||
|
|
||||||
String sNewPassword = Hashcypher.changePassword(this);
|
String sNewPassword = Hashcypher.changePassword(this);
|
||||||
if (sNewPassword != null) {
|
if (sNewPassword != null) {
|
||||||
m_sPassword = sNewPassword;
|
m_sPassword = sNewPassword;
|
||||||
m_Dirty.setDirty(true);
|
m_Dirty.setDirty(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
}// GEN-LAST:event_jButton1ActionPerformed
|
}//GEN-LAST:event_jButton1ActionPerformed
|
||||||
|
|
||||||
private void webCBSecurityActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_webCBSecurityActionPerformed
|
private void webCBSecurityActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_webCBSecurityActionPerformed
|
||||||
|
|
||||||
if (webCBSecurity.getSelectedIndex() == 0) {
|
|
||||||
if (JOptionPane.showConfirmDialog(this,
|
|
||||||
AppLocal.getIntString("message.cardnew"),
|
|
||||||
AppLocal.getIntString("title.editor"),
|
|
||||||
JOptionPane.YES_NO_OPTION,
|
|
||||||
JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
|
|
||||||
m_jcard.setText("C" + StringUtils.getCardNumber());
|
|
||||||
m_Dirty.setDirty(true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (webCBSecurity.getSelectedIndex() == 1) {
|
if(webCBSecurity.getSelectedIndex() == 0){
|
||||||
if (JOptionPane.showConfirmDialog(this,
|
if (JOptionPane.showConfirmDialog(this,
|
||||||
AppLocal.getIntString("message.cardremove"),
|
AppLocal.getIntString("message.cardnew"),
|
||||||
AppLocal.getIntString("title.editor"),
|
AppLocal.getIntString("title.editor"),
|
||||||
JOptionPane.YES_NO_OPTION,
|
JOptionPane.YES_NO_OPTION,
|
||||||
JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
|
JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION)
|
||||||
m_jcard.setText(null);
|
{
|
||||||
m_Dirty.setDirty(true);
|
m_jcard.setText("C" + StringUtils.getCardNumber());
|
||||||
}
|
m_Dirty.setDirty(true);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (webCBSecurity.getSelectedIndex() == 2) {
|
if(webCBSecurity.getSelectedIndex() == 1){
|
||||||
if (JOptionPane.showConfirmDialog(this,
|
if (JOptionPane.showConfirmDialog(this,
|
||||||
AppLocal.getIntString("message.ibuttonassign"),
|
AppLocal.getIntString("message.cardremove"),
|
||||||
AppLocal.getIntString("title.editor"),
|
AppLocal.getIntString("title.editor"),
|
||||||
JOptionPane.OK_CANCEL_OPTION,
|
JOptionPane.YES_NO_OPTION,
|
||||||
JOptionPane.INFORMATION_MESSAGE) == JOptionPane.OK_OPTION)
|
JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION)
|
||||||
|
{
|
||||||
|
m_jcard.setText(null);
|
||||||
|
m_Dirty.setDirty(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
{
|
if(webCBSecurity.getSelectedIndex() == 2){
|
||||||
m_jcard.setText(uOWWatch.getibuttonid());
|
if (JOptionPane.showConfirmDialog(this,
|
||||||
jLblCardID.setText(AppLocal.getIntString("label.ibutton"));
|
AppLocal.getIntString("message.ibuttonassign"),
|
||||||
m_Dirty.setDirty(true);
|
AppLocal.getIntString("title.editor"),
|
||||||
}
|
JOptionPane.OK_CANCEL_OPTION,
|
||||||
|
JOptionPane.INFORMATION_MESSAGE) == JOptionPane.OK_OPTION)
|
||||||
|
|
||||||
}
|
{
|
||||||
|
m_jcard.setText( uOWWatch.getibuttonid() );
|
||||||
|
jLblCardID.setText(AppLocal.getIntString("label.ibutton"));
|
||||||
|
m_Dirty.setDirty(true);
|
||||||
|
}
|
||||||
|
|
||||||
}// GEN-LAST:event_webCBSecurityActionPerformed
|
}
|
||||||
|
|
||||||
private void jLabel1MouseClicked(java.awt.event.MouseEvent evt) {// GEN-FIRST:event_jLabel1MouseClicked
|
}//GEN-LAST:event_webCBSecurityActionPerformed
|
||||||
if (evt.getClickCount() == 2) {
|
|
||||||
String uuidString = m_oId.toString();
|
|
||||||
StringSelection stringSelection = new StringSelection(uuidString);
|
|
||||||
Clipboard clpbrd = Toolkit.getDefaultToolkit().getSystemClipboard();
|
|
||||||
clpbrd.setContents(stringSelection, null);
|
|
||||||
|
|
||||||
JOptionPane.showMessageDialog(null,
|
private void jLabel1MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jLabel1MouseClicked
|
||||||
AppLocal.getIntString("message.uuidcopy"));
|
if (evt.getClickCount() == 2) {
|
||||||
}
|
String uuidString = m_oId.toString();
|
||||||
}// GEN-LAST:event_jLabel1MouseClicked
|
StringSelection stringSelection = new StringSelection(uuidString);
|
||||||
|
Clipboard clpbrd = Toolkit.getDefaultToolkit().getSystemClipboard();
|
||||||
|
clpbrd.setContents(stringSelection, null);
|
||||||
|
|
||||||
// Variables declaration - do not modify//GEN-BEGIN:variables
|
JOptionPane.showMessageDialog(null,
|
||||||
private javax.swing.JButton jButton1;
|
AppLocal.getIntString("message.uuidcopy"));
|
||||||
private javax.swing.JLabel jLabel1;
|
}
|
||||||
private javax.swing.JLabel jLabel2;
|
}//GEN-LAST:event_jLabel1MouseClicked
|
||||||
private javax.swing.JLabel jLabel3;
|
|
||||||
private javax.swing.JLabel jLabel4;
|
|
||||||
private javax.swing.JLabel jLblCardID;
|
// Variables declaration - do not modify//GEN-BEGIN:variables
|
||||||
private com.unicenta.data.gui.JImageEditor m_jImage;
|
private javax.swing.JButton jButton1;
|
||||||
private javax.swing.JTextField m_jName;
|
private javax.swing.JLabel jLabel1;
|
||||||
private javax.swing.JComboBox m_jRole;
|
private javax.swing.JLabel jLabel2;
|
||||||
private javax.swing.JCheckBox m_jVisible;
|
private javax.swing.JLabel jLabel3;
|
||||||
private javax.swing.JTextField m_jcard;
|
private javax.swing.JLabel jLabel4;
|
||||||
private javax.swing.JLabel passwordLabel;
|
private javax.swing.JLabel jLabel6;
|
||||||
private javax.swing.JLabel taxIdLabel;
|
private javax.swing.JLabel jLblCardID;
|
||||||
private javax.swing.JTextField taxIdTextField;
|
private com.unicenta.data.gui.JImageEditor m_jImage;
|
||||||
private javax.swing.JComboBox webCBSecurity;
|
private javax.swing.JTextField m_jName;
|
||||||
// End of variables declaration//GEN-END:variables
|
private javax.swing.JComboBox m_jRole;
|
||||||
|
private javax.swing.JCheckBox m_jVisible;
|
||||||
|
private javax.swing.JTextField m_jcard;
|
||||||
|
private com.alee.laf.combobox.WebComboBox webCBSecurity;
|
||||||
|
// End of variables declaration//GEN-END:variables
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -55,7 +55,6 @@ public class AppUser {
|
|||||||
private final Icon m_Icon;
|
private final Icon m_Icon;
|
||||||
|
|
||||||
private Set<String> m_apermissions;
|
private Set<String> m_apermissions;
|
||||||
private String taxId;
|
|
||||||
|
|
||||||
static {
|
static {
|
||||||
initOldClasses();
|
initOldClasses();
|
||||||
@@ -71,7 +70,7 @@ public class AppUser {
|
|||||||
* @param icon
|
* @param icon
|
||||||
* @param role
|
* @param role
|
||||||
*/
|
*/
|
||||||
public AppUser(String id, String name, String password, String card, String role, Icon icon, String taxId) {
|
public AppUser(String id, String name, String password, String card, String role, Icon icon) {
|
||||||
m_sId = id;
|
m_sId = id;
|
||||||
m_sName = name;
|
m_sName = name;
|
||||||
m_sPassword = password;
|
m_sPassword = password;
|
||||||
@@ -79,7 +78,6 @@ public class AppUser {
|
|||||||
m_sRole = role;
|
m_sRole = role;
|
||||||
m_Icon = icon;
|
m_Icon = icon;
|
||||||
m_apermissions = null;
|
m_apermissions = null;
|
||||||
this.taxId = taxId;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -201,14 +199,14 @@ public class AppUser {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public UserInfo getUserInfo() {
|
public UserInfo getUserInfo() {
|
||||||
return new UserInfo(m_sId, m_sName, this.taxId);
|
return new UserInfo(m_sId, m_sName);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String mapNewClass(String classname) {
|
private static String mapNewClass(String classname) {
|
||||||
String newclass = m_oldclasses.get(classname);
|
String newclass = m_oldclasses.get(classname);
|
||||||
return newclass == null
|
return newclass == null
|
||||||
? classname
|
? classname
|
||||||
: newclass;
|
: newclass;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void initOldClasses() {
|
private static void initOldClasses() {
|
||||||
@@ -224,8 +222,7 @@ public class AppUser {
|
|||||||
|
|
||||||
m_oldclasses.put("Menu.StockManagement", "com.unicenta.pos.forms.MenuStockManagement");
|
m_oldclasses.put("Menu.StockManagement", "com.unicenta.pos.forms.MenuStockManagement");
|
||||||
m_oldclasses.put("net.adrianromero.tpv.inventory.ProductsPanel", "com.unicenta.pos.inventory.ProductsPanel");
|
m_oldclasses.put("net.adrianromero.tpv.inventory.ProductsPanel", "com.unicenta.pos.inventory.ProductsPanel");
|
||||||
m_oldclasses.put("net.adrianromero.tpv.inventory.ProductsWarehousePanel",
|
m_oldclasses.put("net.adrianromero.tpv.inventory.ProductsWarehousePanel", "com.unicenta.pos.inventory.ProductsWarehousePanel");
|
||||||
"com.unicenta.pos.inventory.ProductsWarehousePanel");
|
|
||||||
m_oldclasses.put("net.adrianromero.tpv.inventory.CategoriesPanel", "com.unicenta.pos.inventory.CategoriesPanel");
|
m_oldclasses.put("net.adrianromero.tpv.inventory.CategoriesPanel", "com.unicenta.pos.inventory.CategoriesPanel");
|
||||||
m_oldclasses.put("net.adrianromero.tpv.panels.JPanelTax", "com.unicenta.pos.inventory.TaxPanel");
|
m_oldclasses.put("net.adrianromero.tpv.panels.JPanelTax", "com.unicenta.pos.inventory.TaxPanel");
|
||||||
m_oldclasses.put("net.adrianromero.tpv.inventory.StockDiaryPanel", "com.unicenta.pos.inventory.StockDiaryPanel");
|
m_oldclasses.put("net.adrianromero.tpv.inventory.StockDiaryPanel", "com.unicenta.pos.inventory.StockDiaryPanel");
|
||||||
@@ -303,4 +300,5 @@ public class AppUser {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -121,8 +121,7 @@ public class DataLogicSystem extends BeanFactoryDataSingle {
|
|||||||
dr.getString(3),
|
dr.getString(3),
|
||||||
dr.getString(4),
|
dr.getString(4),
|
||||||
dr.getString(5),
|
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 ************************************************************
|
// START OF PRODUCT ************************************************************
|
||||||
productIdRead =(DataRead dr) -> (
|
productIdRead =(DataRead dr) -> (
|
||||||
@@ -209,12 +208,12 @@ public class DataLogicSystem extends BeanFactoryDataSingle {
|
|||||||
// END OF CUSTOMER ******************************************************************
|
// END OF CUSTOMER ******************************************************************
|
||||||
|
|
||||||
m_peoplevisible = new StaticSentence(s
|
m_peoplevisible = new StaticSentence(s
|
||||||
, "SELECT ID, NAME, APPPASSWORD, CARD, ROLE, IMAGE, TAXID FROM people WHERE VISIBLE = " + s.DB.TRUE() + " ORDER BY NAME"
|
, "SELECT ID, NAME, APPPASSWORD, CARD, ROLE, IMAGE FROM people WHERE VISIBLE = " + s.DB.TRUE() + " ORDER BY NAME"
|
||||||
, null
|
, null
|
||||||
, peopleread);
|
, peopleread);
|
||||||
|
|
||||||
m_peoplebycard = new PreparedSentence(s
|
m_peoplebycard = new PreparedSentence(s
|
||||||
, "SELECT ID, NAME, APPPASSWORD, CARD, ROLE, IMAGE, TAXID FROM people WHERE CARD = ? AND VISIBLE = " + s.DB.TRUE()
|
, "SELECT ID, NAME, APPPASSWORD, CARD, ROLE, IMAGE FROM people WHERE CARD = ? AND VISIBLE = " + s.DB.TRUE()
|
||||||
, SerializerWriteString.INSTANCE
|
, SerializerWriteString.INSTANCE
|
||||||
, peopleread);
|
, peopleread);
|
||||||
|
|
||||||
|
|||||||
@@ -23,121 +23,111 @@ import com.unicenta.format.Formats;
|
|||||||
|
|
||||||
public class PaymentInfoCash extends PaymentInfo {
|
public class PaymentInfoCash extends PaymentInfo {
|
||||||
|
|
||||||
private double prePayAmount = 0.0;
|
private double prePayAmount = 0.0;
|
||||||
private double m_dPaid;
|
private double m_dPaid;
|
||||||
private double m_dTotal;
|
private double m_dTotal;
|
||||||
private double m_dTendered;
|
private double m_dTendered;
|
||||||
private String m_dCardName = null;
|
private String m_dCardName =null;
|
||||||
private String m_sName = "cash";
|
// private double m_dTip;
|
||||||
// private double m_dTip;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a new instance of PaymentInfoCash
|
* Creates a new instance of PaymentInfoCash
|
||||||
*
|
* @param dTotal
|
||||||
* @param dTotal
|
* @param dPaid
|
||||||
* @param dPaid
|
* @param dTendered
|
||||||
* @param dTendered
|
*/
|
||||||
*/
|
public PaymentInfoCash(double dTotal, double dPaid, double dTendered) {
|
||||||
public PaymentInfoCash(double dTotal, double dPaid, double dTendered) {
|
m_dTotal = dTotal;
|
||||||
m_dTotal = dTotal;
|
m_dPaid = dPaid;
|
||||||
m_dPaid = dPaid;
|
m_dTendered = dTendered;
|
||||||
m_dTendered = dTendered;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 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);
|
|
||||||
}
|
|
||||||
|
|
||||||
@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;
|
|
||||||
}
|
|
||||||
|
|
||||||
public double getPrePaid() {
|
/**
|
||||||
return prePayAmount;
|
* 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;
|
||||||
|
}
|
||||||
|
|
||||||
public String printTendered() {
|
/** Creates a new instance of PaymentInfoCash
|
||||||
return Formats.CURRENCY.formatValue(m_dTendered);
|
* @param dTotal
|
||||||
}
|
* @param dPaid */
|
||||||
|
public PaymentInfoCash(double dTotal, double dPaid) {
|
||||||
|
m_dTotal = dTotal;
|
||||||
|
m_dPaid = dPaid;
|
||||||
|
}
|
||||||
|
|
||||||
public String printPaid() {
|
@Override
|
||||||
return Formats.CURRENCY.formatValue(m_dPaid);
|
public PaymentInfo copyPayment() {
|
||||||
}
|
return new PaymentInfoCash(m_dTotal, m_dPaid, m_dTendered, prePayAmount);
|
||||||
|
// return new PaymentInfoCash(m_dTotal, m_dPaid, prePayAmount);
|
||||||
|
}
|
||||||
|
|
||||||
public String printChange() {
|
@Override
|
||||||
return Formats.CURRENCY.formatValue(m_dPaid - m_dTotal);
|
public String getTransactionID() {
|
||||||
}
|
return "no ID";
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getVoucher() {
|
public String getName() {
|
||||||
return null;
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
public double getPrePaid() {
|
||||||
|
return prePayAmount;
|
||||||
|
}
|
||||||
|
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,82 +27,72 @@ import com.unicenta.format.Formats;
|
|||||||
*/
|
*/
|
||||||
public class PaymentInfoCash_original extends PaymentInfo {
|
public class PaymentInfoCash_original extends PaymentInfo {
|
||||||
|
|
||||||
private final double m_dPaid;
|
private final double m_dPaid;
|
||||||
private final double m_dTotal;
|
private final double m_dTotal;
|
||||||
private double m_dTendered;
|
private double m_dTendered;
|
||||||
private final String m_dCardName = null;
|
private final String m_dCardName =null;
|
||||||
private String m_sName = "cash";
|
// private double m_dTip;
|
||||||
// private double m_dTip;
|
|
||||||
|
|
||||||
/**
|
/** Creates a new instance of PaymentInfoCash
|
||||||
* Creates a new instance of PaymentInfoCash
|
* @param dTotal
|
||||||
*
|
* @param dPaid */
|
||||||
* @param dTotal
|
public PaymentInfoCash_original(double dTotal, double dPaid) {
|
||||||
* @param dPaid
|
m_dTotal = dTotal;
|
||||||
*/
|
m_dPaid = dPaid;
|
||||||
public PaymentInfoCash_original(double dTotal, double dPaid) {
|
}
|
||||||
m_dTotal = dTotal;
|
|
||||||
m_dPaid = dPaid;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public PaymentInfo copyPayment() {
|
public PaymentInfo copyPayment(){
|
||||||
return new PaymentInfoCash_original(m_dTotal, m_dPaid);
|
return new PaymentInfoCash_original(m_dTotal, m_dPaid);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getTransactionID() {
|
public String getTransactionID(){
|
||||||
return "no ID";
|
return "no ID";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getName() {
|
public String getName() {
|
||||||
return "cash";
|
return "cash";
|
||||||
}
|
}
|
||||||
|
@Override
|
||||||
|
public double getTotal() {
|
||||||
|
return m_dTotal;
|
||||||
|
}
|
||||||
|
/** public double getTip() {
|
||||||
|
return m_dTip;
|
||||||
|
}
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public double getPaid() {
|
||||||
|
return m_dPaid;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public double getTotal() {
|
public double getTendered() {
|
||||||
return m_dTotal;
|
return m_dTendered;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
@Override
|
||||||
* public double getTip() {
|
public double getChange(){
|
||||||
* return m_dTip;
|
return m_dPaid - m_dTotal;
|
||||||
* }
|
}
|
||||||
*
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
@Override
|
|
||||||
public double getPaid() {
|
|
||||||
return m_dPaid;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public double getTendered() {
|
public String getCardName() {
|
||||||
return m_dTendered;
|
return m_dCardName;
|
||||||
}
|
}
|
||||||
|
public String printPaid() {
|
||||||
|
return Formats.CURRENCY.formatValue(m_dPaid);
|
||||||
|
}
|
||||||
|
public String printChange() {
|
||||||
|
return Formats.CURRENCY.formatValue(m_dPaid - m_dTotal);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public double getChange() {
|
public String getVoucher() {
|
||||||
return m_dPaid - m_dTotal;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@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;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,292 +21,290 @@ package com.unicenta.pos.payment;
|
|||||||
|
|
||||||
public class PaymentInfoMagcard extends PaymentInfo {
|
public class PaymentInfoMagcard extends PaymentInfo {
|
||||||
|
|
||||||
private String m_sName = "creditcard";
|
protected double m_dTotal;
|
||||||
protected double m_dTotal;
|
protected double m_dTip;
|
||||||
protected double m_dTip;
|
protected String m_sHolderName;
|
||||||
protected String m_sHolderName;
|
protected String m_sCardNumber;
|
||||||
protected String m_sCardNumber;
|
protected String m_sExpirationDate;
|
||||||
protected String m_sExpirationDate;
|
protected String track1;
|
||||||
protected String track1;
|
protected String track2;
|
||||||
protected String track2;
|
protected String track3;
|
||||||
protected String track3;
|
protected String m_sTransactionID;
|
||||||
protected String m_sTransactionID;
|
protected String m_sAuthorization;
|
||||||
protected String m_sAuthorization;
|
protected String m_sErrorMessage;
|
||||||
protected String m_sErrorMessage;
|
protected String m_sReturnMessage;
|
||||||
protected String m_sReturnMessage;
|
//JG Jan 2018
|
||||||
// JG Jan 2018
|
protected String encryptedTrack;
|
||||||
protected String encryptedTrack;
|
protected String encryptionKey;
|
||||||
protected String encryptionKey;
|
protected String m_dCardName =null;
|
||||||
protected String m_dCardName = null;
|
|
||||||
|
|
||||||
protected Boolean chipAndPin = Boolean.FALSE;
|
protected Boolean chipAndPin = Boolean.FALSE;
|
||||||
protected String verification;
|
protected String verification;
|
||||||
protected String lastFourDigits;
|
protected String lastFourDigits;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a new instance of PaymentInfoMagcard
|
* Creates a new instance of PaymentInfoMagcard
|
||||||
*
|
* @param sHolderName
|
||||||
* @param sHolderName
|
* @param sCardNumber
|
||||||
* @param sCardNumber
|
* @param sExpirationDate
|
||||||
* @param sExpirationDate
|
* @param track1
|
||||||
* @param track1
|
* @param track2
|
||||||
* @param track2
|
* @param track3
|
||||||
* @param track3
|
* @param encryptedCard
|
||||||
* @param encryptedCard
|
* @param encryptKey
|
||||||
* @param encryptKey
|
* @param sTransactionID
|
||||||
* @param sTransactionID
|
* @param dTotal
|
||||||
* @param dTotal
|
*/
|
||||||
*/
|
public PaymentInfoMagcard(String sHolderName, String sCardNumber,
|
||||||
public PaymentInfoMagcard(String sHolderName, String sCardNumber,
|
String sExpirationDate, String track1, String track2, String track3, String encryptedCard, String encryptKey,
|
||||||
String sExpirationDate, String track1, String track2, String track3, String encryptedCard, String encryptKey,
|
String sTransactionID, double dTotal) {
|
||||||
String sTransactionID, double dTotal) {
|
m_sHolderName = sHolderName;
|
||||||
m_sHolderName = sHolderName;
|
m_sCardNumber = sCardNumber;
|
||||||
m_sCardNumber = sCardNumber;
|
m_sExpirationDate = sExpirationDate;
|
||||||
m_sExpirationDate = sExpirationDate;
|
this.track1 = track1;
|
||||||
this.track1 = track1;
|
this.track2 = track2;
|
||||||
this.track2 = track2;
|
this.track3 = track3;
|
||||||
this.track3 = track3;
|
encryptedTrack = encryptedCard;
|
||||||
encryptedTrack = encryptedCard;
|
encryptionKey = encryptKey;
|
||||||
encryptionKey = encryptKey;
|
m_sTransactionID = sTransactionID;
|
||||||
m_sTransactionID = sTransactionID;
|
m_dTotal = dTotal;
|
||||||
m_dTotal = dTotal;
|
|
||||||
|
|
||||||
m_sAuthorization = null;
|
|
||||||
m_sErrorMessage = null;
|
|
||||||
m_sReturnMessage = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
m_sAuthorization = null;
|
||||||
* Creates a new instance of PaymentInfoMagcard
|
m_sErrorMessage = null;
|
||||||
*
|
m_sReturnMessage = null;
|
||||||
* @param sHolderName
|
|
||||||
* @param sCardNumber
|
|
||||||
* @param sExpirationDate
|
|
||||||
* @param sTransactionID
|
|
||||||
* @param dTotal
|
|
||||||
*/
|
|
||||||
public PaymentInfoMagcard(String sHolderName, String sCardNumber,
|
|
||||||
String sExpirationDate, String sTransactionID, double dTotal) {
|
|
||||||
this(sHolderName, sCardNumber, sExpirationDate,
|
|
||||||
null, null, null, null, null, sTransactionID, dTotal);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public PaymentInfo copyPayment() {
|
|
||||||
PaymentInfoMagcard p = new PaymentInfoMagcard(m_sHolderName,
|
|
||||||
m_sCardNumber, m_sExpirationDate, track1, track2,
|
|
||||||
track3, encryptedTrack, encryptionKey, m_sTransactionID, m_dTotal);
|
|
||||||
p.m_sAuthorization = m_sAuthorization;
|
|
||||||
p.m_sErrorMessage = m_sErrorMessage;
|
|
||||||
return p;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getName() {
|
|
||||||
// return "magcard";
|
|
||||||
return "ccard";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public double getTotal() {
|
|
||||||
return m_dTotal;
|
|
||||||
}
|
|
||||||
|
|
||||||
public double getTip() {
|
|
||||||
return m_dTip;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isPaymentOK() {
|
|
||||||
return m_sAuthorization != null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getHolderName() {
|
|
||||||
return m_sHolderName;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getCardName() {
|
|
||||||
if (chipAndPin) {
|
|
||||||
return m_dCardName;
|
|
||||||
}
|
}
|
||||||
return getCardType(m_sCardNumber);
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getCardNumber() {
|
/**
|
||||||
return m_sCardNumber;
|
* Creates a new instance of PaymentInfoMagcard
|
||||||
}
|
* @param sHolderName
|
||||||
|
* @param sCardNumber
|
||||||
public String getExpirationDate() {
|
* @param sExpirationDate
|
||||||
return m_sExpirationDate;
|
* @param sTransactionID
|
||||||
}
|
* @param dTotal
|
||||||
|
*/
|
||||||
@Override
|
public PaymentInfoMagcard(String sHolderName, String sCardNumber,
|
||||||
public String getTransactionID() {
|
String sExpirationDate, String sTransactionID, double dTotal) {
|
||||||
return m_sTransactionID;
|
this(sHolderName, sCardNumber, sExpirationDate,
|
||||||
}
|
null, null, null, null, null, sTransactionID, dTotal);
|
||||||
|
|
||||||
/**
|
|
||||||
* Get tracks of magnetic card. Framing characters: - start sentinel (SS) -
|
|
||||||
* end sentinel (ES) - LRC
|
|
||||||
*
|
|
||||||
* @return tracks of the magnetic card
|
|
||||||
*/
|
|
||||||
public String getEncryptedCardData() {
|
|
||||||
return encryptedTrack;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getEncryptionKey() {
|
|
||||||
return encryptionKey;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param sCardNumber
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
public String getCardType(String sCardNumber) {
|
|
||||||
String c = "UNKNOWN";
|
|
||||||
|
|
||||||
if (sCardNumber.startsWith("4")) {
|
|
||||||
c = "VISA";
|
|
||||||
} else if (sCardNumber.startsWith("6")) {
|
|
||||||
c = "DISC";
|
|
||||||
} else if (sCardNumber.startsWith("5")) {
|
|
||||||
c = "MAST";
|
|
||||||
} else if (sCardNumber.startsWith("34") || sCardNumber.startsWith("37")) {
|
|
||||||
c = "AMEX";
|
|
||||||
} else if (sCardNumber.startsWith("3528") || sCardNumber.startsWith("3589")) {
|
|
||||||
c = "JCB";
|
|
||||||
} else if (sCardNumber.startsWith("3")) {
|
|
||||||
c = "DINE";
|
|
||||||
}
|
}
|
||||||
m_sCardNumber = c;
|
|
||||||
return c;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getTrack1(boolean framingChar) {
|
@Override
|
||||||
return (framingChar)
|
public PaymentInfo copyPayment() {
|
||||||
? track1
|
PaymentInfoMagcard p = new PaymentInfoMagcard(m_sHolderName,
|
||||||
: track1.substring(1, track1.length() - 2);
|
m_sCardNumber, m_sExpirationDate, track1, track2,
|
||||||
}
|
track3, encryptedTrack, encryptionKey, m_sTransactionID, m_dTotal);
|
||||||
|
p.m_sAuthorization = m_sAuthorization;
|
||||||
public String getTrack2(boolean framingChar) {
|
p.m_sErrorMessage = m_sErrorMessage;
|
||||||
return (framingChar)
|
return p;
|
||||||
? 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 printExpirationDate() {
|
public String getName() {
|
||||||
return m_sExpirationDate;
|
// return "magcard";
|
||||||
}
|
return "ccard";
|
||||||
|
}
|
||||||
|
|
||||||
public String printAuthorization() {
|
@Override
|
||||||
return m_sAuthorization;
|
public double getTotal() {
|
||||||
}
|
return m_dTotal;
|
||||||
|
}
|
||||||
|
|
||||||
public String printTransactionID() {
|
public double getTip() {
|
||||||
return m_sTransactionID;
|
return m_dTip;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean getIsProcessed() {
|
public boolean isPaymentOK() {
|
||||||
throw new UnsupportedOperationException("Not supported yet.");
|
return m_sAuthorization != null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setIsProcessed(boolean value) {
|
public String getHolderName() {
|
||||||
throw new UnsupportedOperationException("Not supported yet.");
|
return m_sHolderName;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public double getPaid() {
|
public String getCardName() {
|
||||||
return (0.0);
|
if (chipAndPin){
|
||||||
}
|
return m_dCardName;
|
||||||
|
}
|
||||||
|
return getCardType(m_sCardNumber);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
public String getCardNumber() {
|
||||||
public double getChange() {
|
return m_sCardNumber;
|
||||||
return 0.00;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
public String getExpirationDate() {
|
||||||
public double getTendered() {
|
return m_sExpirationDate;
|
||||||
return 0.00;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getVoucher() {
|
public String getTransactionID() {
|
||||||
return null;
|
return m_sTransactionID;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setCardName(String m_dCardName) {
|
/**
|
||||||
this.m_dCardName = m_dCardName;
|
* 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 Boolean isChipAndPin() {
|
public String getEncryptionKey() {
|
||||||
return chipAndPin;
|
return encryptionKey;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setChipAndPin(Boolean chipAndPin) {
|
/** @param sCardNumber
|
||||||
this.chipAndPin = chipAndPin;
|
* @return
|
||||||
}
|
*/
|
||||||
|
public String getCardType(String sCardNumber){
|
||||||
|
String c = "UNKNOWN";
|
||||||
|
|
||||||
public String printVerification() {
|
if (sCardNumber.startsWith("4")) {
|
||||||
return verification;
|
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 void setVerification(String verification) {
|
public String getTrack1(boolean framingChar) {
|
||||||
this.verification = verification;
|
return (framingChar)
|
||||||
}
|
? track1
|
||||||
|
: track1.substring(1, track1.length() - 2);
|
||||||
|
}
|
||||||
|
|
||||||
public String getLastFourDigits() {
|
public String getTrack2(boolean framingChar) {
|
||||||
return lastFourDigits;
|
return (framingChar)
|
||||||
}
|
? track2
|
||||||
|
: track2.substring(1, track2.length() - 2);
|
||||||
|
}
|
||||||
|
|
||||||
public String printLastFourDigits() {
|
public String getTrack3(boolean framingChar) {
|
||||||
return lastFourDigits;
|
return (framingChar)
|
||||||
}
|
? track3
|
||||||
|
: track3.substring(1, track3.length() - 2);
|
||||||
|
}
|
||||||
|
|
||||||
public void setLastFourDigits(String lastFourDigits) {
|
public String getAuthorization() {
|
||||||
this.lastFourDigits = lastFourDigits;
|
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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -26,45 +26,31 @@ import java.io.Serializable;
|
|||||||
*/
|
*/
|
||||||
public class UserInfo implements Serializable {
|
public class UserInfo implements Serializable {
|
||||||
|
|
||||||
private static final long serialVersionUID = 7537578737839L;
|
private static final long serialVersionUID = 7537578737839L;
|
||||||
private String m_sId;
|
private String m_sId;
|
||||||
private String m_sName;
|
private String m_sName;
|
||||||
private String taxId;
|
|
||||||
|
|
||||||
/**
|
/** Creates a new instance of UserInfoBasic
|
||||||
* Creates a new instance of UserInfoBasic
|
* @param id
|
||||||
*
|
* @param name */
|
||||||
* @param id
|
public UserInfo(String id, String name) {
|
||||||
* @param name
|
m_sId = id;
|
||||||
*/
|
m_sName = name;
|
||||||
public UserInfo(String id, String name) {
|
}
|
||||||
m_sId = id;
|
|
||||||
m_sName = name;
|
|
||||||
}
|
|
||||||
|
|
||||||
public UserInfo(String id, String name, String taxId) {
|
/**
|
||||||
m_sId = id;
|
*
|
||||||
m_sName = name;
|
* @return
|
||||||
this.taxId = taxId;
|
*/
|
||||||
}
|
public String getId() {
|
||||||
|
return m_sId;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String getId() {
|
public String getName() {
|
||||||
return m_sId;
|
return m_sName;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
public String getName() {
|
|
||||||
return m_sName;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getTaxID() {
|
|
||||||
return taxId;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -24,124 +24,120 @@ import com.unicenta.data.loader.DataRead;
|
|||||||
import com.unicenta.data.loader.IKeyed;
|
import com.unicenta.data.loader.IKeyed;
|
||||||
import com.unicenta.data.loader.SerializerRead;
|
import com.unicenta.data.loader.SerializerRead;
|
||||||
|
|
||||||
|
|
||||||
public class VoucherInfo implements IKeyed {
|
public class VoucherInfo implements IKeyed {
|
||||||
private String id;
|
private String id;
|
||||||
private String voucherNumber;
|
private String voucherNumber;
|
||||||
private String customerName;
|
private String customerName;
|
||||||
private double amount;
|
private double amount;
|
||||||
private String status;
|
private String status;
|
||||||
|
|
||||||
public VoucherInfo() {
|
public VoucherInfo() {
|
||||||
}
|
}
|
||||||
|
|
||||||
public VoucherInfo(
|
public VoucherInfo(
|
||||||
String id,
|
String id,
|
||||||
String voucherNumber,
|
String voucherNumber,
|
||||||
String customerName,
|
String customerName,
|
||||||
double amount,
|
double amount,
|
||||||
String status)
|
String status) {
|
||||||
{
|
this.id = id;
|
||||||
this.id = id;
|
this.voucherNumber = voucherNumber;
|
||||||
this.voucherNumber = voucherNumber;
|
this.customerName = customerName;
|
||||||
this.customerName = customerName;
|
this.amount = amount;
|
||||||
this.amount = amount;
|
this.status = status;
|
||||||
this.status = status;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Object getKey() {
|
||||||
|
return getId();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
/**
|
||||||
public Object getKey() {
|
* @return the id
|
||||||
return getId();
|
*/
|
||||||
}
|
public String getId() {
|
||||||
|
return id;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return the id
|
* @param id the id to set
|
||||||
*/
|
*/
|
||||||
public String getId() {
|
public void setId(String id) {
|
||||||
return id;
|
this.id = id;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param id the id to set
|
* @return the voucherNumber
|
||||||
*/
|
*/
|
||||||
public void setId(String id) {
|
public String getVoucherNumber() {
|
||||||
this.id = id;
|
return voucherNumber;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return the voucherNumber
|
* @param voucherNumber the voucherNumber to set
|
||||||
*/
|
*/
|
||||||
public String getVoucherNumber() {
|
public void setVoucherNumber(String voucherNumber) {
|
||||||
return voucherNumber;
|
this.voucherNumber = voucherNumber;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param voucherNumber the voucherNumber to set
|
* @return the customerName
|
||||||
*/
|
*/
|
||||||
public void setVoucherNumber(String voucherNumber) {
|
public String getCustomerName() {
|
||||||
this.voucherNumber = voucherNumber;
|
return customerName;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return the customerName
|
* @param customerName the customerName to set
|
||||||
*/
|
*/
|
||||||
public String getCustomerName() {
|
public void setCustomerName(String customerName) {
|
||||||
return customerName;
|
this.customerName = customerName;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param customerName the customerName to set
|
* @return the amount
|
||||||
*/
|
*/
|
||||||
public void setCustomerName(String customerName) {
|
public double getAmount() {
|
||||||
this.customerName = customerName;
|
return amount;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return the amount
|
* @param amount the amount to set
|
||||||
*/
|
*/
|
||||||
public double getAmount() {
|
public void setAmount(double amount) {
|
||||||
return amount;
|
this.amount = amount;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
@Override
|
||||||
* @param amount the amount to set
|
public String toString() {
|
||||||
*/
|
return voucherNumber;
|
||||||
public void setAmount(double amount) {
|
}
|
||||||
this.amount = amount;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return the status
|
||||||
|
*/
|
||||||
|
public String getStatus() {
|
||||||
|
return status;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
/**
|
||||||
public String toString() {
|
* @param status the status to set
|
||||||
return voucherNumber;
|
*/
|
||||||
}
|
public void setStatus(String status) {
|
||||||
|
this.status = status;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
public static SerializerRead getSerializerRead() {
|
||||||
* @return the status
|
return new SerializerRead() {
|
||||||
*/
|
@Override
|
||||||
public String getStatus() {
|
public Object readValues(DataRead dr) throws BasicException {
|
||||||
return status;
|
return new VoucherInfo(
|
||||||
}
|
dr.getString(1),
|
||||||
|
dr.getString(2),
|
||||||
/**
|
dr.getString(3),
|
||||||
* @param status the status to set
|
dr.getDouble(4),
|
||||||
*/
|
dr.getString(5));
|
||||||
public void setStatus(String status) {
|
}
|
||||||
this.status = status;
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
public static SerializerRead getSerializerRead() {
|
|
||||||
return new SerializerRead()
|
|
||||||
{
|
|
||||||
@Override
|
|
||||||
public Object readValues(DataRead dr) throws BasicException {
|
|
||||||
return new VoucherInfo(
|
|
||||||
dr.getString(1),
|
|
||||||
dr.getString(2),
|
|
||||||
dr.getString(3),
|
|
||||||
dr.getDouble(4),
|
|
||||||
dr.getString(5));
|
|
||||||
}};
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -205,7 +205,6 @@ CREATE TABLE people (
|
|||||||
id varchar(255) NOT NULL,
|
id varchar(255) NOT NULL,
|
||||||
name varchar(255) NOT NULL,
|
name varchar(255) NOT NULL,
|
||||||
apppassword varchar(255) default NULL,
|
apppassword varchar(255) default NULL,
|
||||||
taxId varchar(255) default NULL,
|
|
||||||
card varchar(255) default NULL,
|
card varchar(255) default NULL,
|
||||||
role varchar(255) NOT NULL,
|
role varchar(255) NOT NULL,
|
||||||
visible smallint NOT NULL,
|
visible smallint NOT NULL,
|
||||||
|
|||||||
@@ -1,3 +1 @@
|
|||||||
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{};
|
UPDATE applications SET version = $APP_VERSION{} WHERE id = $APP_ID{};
|
||||||
@@ -271,7 +271,6 @@ CREATE TABLE `people` (
|
|||||||
`id` varchar(255) NOT NULL,
|
`id` varchar(255) NOT NULL,
|
||||||
`name` varchar(255) NOT NULL,
|
`name` varchar(255) NOT NULL,
|
||||||
`apppassword` varchar(255) default NULL,
|
`apppassword` varchar(255) default NULL,
|
||||||
`taxId` varchar(255) default NULL,
|
|
||||||
`card` varchar(255) default NULL,
|
`card` varchar(255) default NULL,
|
||||||
`role` varchar(255) NOT NULL,
|
`role` varchar(255) NOT NULL,
|
||||||
`visible` bit(1) NOT NULL,
|
`visible` bit(1) NOT NULL,
|
||||||
|
|||||||
@@ -1,3 +1,2 @@
|
|||||||
ALTER TABLE people ADD COLUMN IF NOT EXISTS taxId VARCHAR(255) AFTER apppassword;
|
|
||||||
UPDATE applications SET version = $APP_VERSION{} WHERE id = $APP_ID{};
|
UPDATE applications SET version = $APP_VERSION{} WHERE id = $APP_ID{};
|
||||||
COMMIT;
|
COMMIT;
|
||||||
|
|||||||
@@ -246,7 +246,6 @@ CREATE TABLE `people` (
|
|||||||
`id` varchar(255) NOT NULL,
|
`id` varchar(255) NOT NULL,
|
||||||
`name` varchar(255) NOT NULL,
|
`name` varchar(255) NOT NULL,
|
||||||
`apppassword` varchar(255) default NULL,
|
`apppassword` varchar(255) default NULL,
|
||||||
`taxId` varchar(255) default NULL,
|
|
||||||
`card` varchar(255) default NULL,
|
`card` varchar(255) default NULL,
|
||||||
`role` varchar(255) NOT NULL,
|
`role` varchar(255) NOT NULL,
|
||||||
`visible` bit(1) NOT NULL,
|
`visible` bit(1) NOT NULL,
|
||||||
|
|||||||
@@ -1,3 +1,62 @@
|
|||||||
ALTER TABLE people ADD COLUMN IF NOT EXISTS taxId VARCHAR(255) AFTER apppassword;
|
-- CLEAR THE DECKS
|
||||||
UPDATE applications SET version = $APP_VERSION{} WHERE id = $APP_ID{};
|
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';
|
||||||
|
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;
|
COMMIT;
|
||||||
@@ -1207,4 +1207,3 @@ 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.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
|
tooltip.config.db.reset1=<html><center>Clear the settings of the optional DB 2 Database Server\t
|
||||||
label.pickupcurrent=Current Pickup Number
|
label.pickupcurrent=Current Pickup Number
|
||||||
label.peopletaxid=Tax ID
|
|
||||||
|
|||||||
@@ -662,4 +662,3 @@ transpayment.slip=Slip
|
|||||||
transpayment.voucherin=Note Input
|
transpayment.voucherin=Note Input
|
||||||
transpayment.voucherout=Note Output
|
transpayment.voucherout=Note Output
|
||||||
Visor.Title=uniCenta oPOS
|
Visor.Title=uniCenta oPOS
|
||||||
label.peopletaxid=Tax ID
|
|
||||||
|
|||||||
@@ -542,4 +542,3 @@ 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
|
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
|
label.currentstock=\u0645\u062a\u0627\u062d
|
||||||
Menu.CSVStockQty=<html>Products<br><b>Scanner Import
|
Menu.CSVStockQty=<html>Products<br><b>Scanner Import
|
||||||
label.peopletaxid=Tax ID
|
|
||||||
|
|||||||
@@ -1008,4 +1008,3 @@ transpayment.ccardrefund=Kort tilbagef\u00f8rsel
|
|||||||
transpayment.ticket=Salgskvittering
|
transpayment.ticket=Salgskvittering
|
||||||
transpayment.voucher=Gavekort
|
transpayment.voucher=Gavekort
|
||||||
Visor.Title=uniCenta oPOS
|
Visor.Title=uniCenta oPOS
|
||||||
label.peopletaxid=Tax ID
|
|
||||||
|
|||||||
@@ -902,4 +902,3 @@ transpayment.voucher=Gutschein
|
|||||||
transpayment.voucherin=Gutschein Eingabe
|
transpayment.voucherin=Gutschein Eingabe
|
||||||
transpayment.voucherout=Gutschein Ausgabe
|
transpayment.voucherout=Gutschein Ausgabe
|
||||||
Visor.Title=uniCenta oPOS
|
Visor.Title=uniCenta oPOS
|
||||||
label.peopletaxid=Tax ID
|
|
||||||
|
|||||||
@@ -548,4 +548,3 @@ transpayment.ticket=\u0391\u03c0\u03cc\u03b4\u03b5\u03b9\u03be\u03b7
|
|||||||
transpayment.voucherin=\u039a\u03bf\u03c5\u03c0\u03cc\u03bd\u03b9
|
transpayment.voucherin=\u039a\u03bf\u03c5\u03c0\u03cc\u03bd\u03b9
|
||||||
transpayment.voucherout=\u039a\u03bf\u03c5\u03c0\u03cc\u03bd\u03b9
|
transpayment.voucherout=\u039a\u03bf\u03c5\u03c0\u03cc\u03bd\u03b9
|
||||||
Visor.Title=uniCenta oPOS
|
Visor.Title=uniCenta oPOS
|
||||||
label.peopletaxid=Tax ID
|
|
||||||
|
|||||||
@@ -1116,4 +1116,3 @@ label.override=Use Override?
|
|||||||
title.override.enterpin=Enter PIN Number
|
title.override.enterpin=Enter PIN Number
|
||||||
message.override.badpin=<html><center><h4>PIN Number Incorrect
|
message.override.badpin=<html><center><h4>PIN Number Incorrect
|
||||||
Menu.CustomersExport=Customer Export
|
Menu.CustomersExport=Customer Export
|
||||||
label.peopletaxid=Tax ID
|
|
||||||
|
|||||||
@@ -1188,4 +1188,3 @@ message.eolupdate=<html><center><h3>uniCenta oPOS Versi\u00f3n {0} detectada!</h
|
|||||||
label.find=Buscar
|
label.find=Buscar
|
||||||
label.create=Crear
|
label.create=Crear
|
||||||
label.cancel=Cancelar
|
label.cancel=Cancelar
|
||||||
label.peopletaxid=ID de impuesto
|
|
||||||
|
|||||||
@@ -484,4 +484,3 @@ transpayment.ccardrefund=Devoluci\u00f3n con tarjeta
|
|||||||
transpayment.voucherin=Vales cobrados
|
transpayment.voucherin=Vales cobrados
|
||||||
transpayment.voucherout=Vales emitidos
|
transpayment.voucherout=Vales emitidos
|
||||||
Visor.Title=uniCenta oPOS
|
Visor.Title=uniCenta oPOS
|
||||||
label.peopletaxid=Tax ID
|
|
||||||
|
|||||||
@@ -469,5 +469,3 @@ transpayment.voucherin=Vales cobrados
|
|||||||
transpayment.voucherout=Vales emitidos
|
transpayment.voucherout=Vales emitidos
|
||||||
Visor.Title=uniCenta oPOS
|
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
|
|
||||||
|
|
||||||
|
|||||||
@@ -502,4 +502,3 @@ transpayment.ccardrefund=Kaardimakse tagastus
|
|||||||
transpayment.voucherin=Kupongimakse
|
transpayment.voucherin=Kupongimakse
|
||||||
transpayment.voucherout=Kupong v\u00e4lja
|
transpayment.voucherout=Kupong v\u00e4lja
|
||||||
Visor.Title=uniCenta oPOS
|
Visor.Title=uniCenta oPOS
|
||||||
label.peopletaxid=Tax ID
|
|
||||||
|
|||||||
@@ -1083,4 +1083,3 @@ label.add=Ajouter
|
|||||||
label.cancel=Annuler
|
label.cancel=Annuler
|
||||||
label.create=Cr\u00e9er
|
label.create=Cr\u00e9er
|
||||||
label.find=Trouver
|
label.find=Trouver
|
||||||
label.peopletaxid=Tax ID
|
|
||||||
|
|||||||
@@ -482,4 +482,3 @@ transpayment.ccardrefund=Povrat kartice
|
|||||||
transpayment.voucherin=Bilje\u0161ka - ulaz
|
transpayment.voucherin=Bilje\u0161ka - ulaz
|
||||||
transpayment.voucherout=Bilje\u0161ka - izlaz
|
transpayment.voucherout=Bilje\u0161ka - izlaz
|
||||||
Visor.Title=uniCenta oPOS
|
Visor.Title=uniCenta oPOS
|
||||||
label.peopletaxid=Tax ID
|
|
||||||
|
|||||||
@@ -753,4 +753,3 @@ transpayment.ticket=Fattura
|
|||||||
transpayment.voucherin=Nota Ingresso
|
transpayment.voucherin=Nota Ingresso
|
||||||
transpayment.voucherout=Nota Uscita
|
transpayment.voucherout=Nota Uscita
|
||||||
Visor.Title=uniCenta oPOS
|
Visor.Title=uniCenta oPOS
|
||||||
label.peopletaxid=Tax ID
|
|
||||||
|
|||||||
@@ -1175,4 +1175,3 @@ button.setTransfer=SET
|
|||||||
message.transfersamedatabase=<html><center><h4>Not able to transfer database into itself
|
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
|
label.configURL=Click this link to see how to create a Database Schema
|
||||||
tooltip.pickupbarcode=Find Pickup ID
|
tooltip.pickupbarcode=Find Pickup ID
|
||||||
label.peopletaxid=Tax ID
|
|
||||||
|
|||||||
@@ -462,4 +462,3 @@ transpayment.ticket=Recibo
|
|||||||
transpayment.voucherin=Entrada de nota
|
transpayment.voucherin=Entrada de nota
|
||||||
transpayment.voucherout=Sa\u00edda de nota
|
transpayment.voucherout=Sa\u00edda de nota
|
||||||
Visor.Title=uniCenta oPOS
|
Visor.Title=uniCenta oPOS
|
||||||
label.peopletaxid=Tax ID
|
|
||||||
|
|||||||
@@ -404,4 +404,3 @@ transpayment.ticket=Cupom
|
|||||||
transpayment.voucherin=Nota entrada
|
transpayment.voucherin=Nota entrada
|
||||||
transpayment.voucherout=Nota sa\u00edda
|
transpayment.voucherout=Nota sa\u00edda
|
||||||
Visor.Title=uniCenta POS
|
Visor.Title=uniCenta POS
|
||||||
label.peopletaxid=Tax ID
|
|
||||||
|
|||||||
Reference in New Issue
Block a user