UOCL-315: adding payment types
This commit is contained in:
@@ -0,0 +1,729 @@
|
|||||||
|
# Unicenta oPOS - C4 Architecture Diagram
|
||||||
|
|
||||||
|
## Overview
|
||||||
|
|
||||||
|
Unicenta oPOS (v5.4.0) is an enterprise-level Point of Sale system built with Java. It provides comprehensive sales, inventory, customer, and reporting management capabilities with support for multiple operating systems (Windows, Linux, macOS).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Level 1: System Context Diagram
|
||||||
|
|
||||||
|
```mermaid
|
||||||
|
graph TB
|
||||||
|
user["👤 POS Operators/Staff"]
|
||||||
|
|
||||||
|
system["📱 Unicenta oPOS System<br/>Java Desktop Application<br/>v5.4.0"]
|
||||||
|
|
||||||
|
devices["🖨️ Peripheral Devices<br/>Printer • Scale<br/>Barcode Scanner<br/>Card Reader"]
|
||||||
|
|
||||||
|
db["💾 Database<br/>MySQL • Derby<br/>SQLite • PostgreSQL"]
|
||||||
|
|
||||||
|
fs["📂 File System<br/>Reports • Templates<br/>Locales • Config"]
|
||||||
|
|
||||||
|
user -->|interacts| system
|
||||||
|
system -->|controls| devices
|
||||||
|
system -->|reads/writes| db
|
||||||
|
system -->|reads/writes| fs
|
||||||
|
devices -.->|feedback| system
|
||||||
|
|
||||||
|
style system fill:#4A90E2,stroke:#2E5C8A,color:#fff,stroke-width:3px
|
||||||
|
style user fill:#50C878,stroke:#2D7A4A,color:#fff
|
||||||
|
style devices fill:#FF6B6B,stroke:#A53D3D,color:#fff
|
||||||
|
style db fill:#FFB84D,stroke:#8B6914,color:#fff
|
||||||
|
style fs fill:#9B59B6,stroke:#5B2C6F,color:#fff
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Level 2: Container Architecture
|
||||||
|
|
||||||
|
```mermaid
|
||||||
|
graph TB
|
||||||
|
subgraph app["🏗️ UNICENTA oPOS APPLICATION"]
|
||||||
|
subgraph ui["PRESENTATION LAYER<br/>(Swing/JavaFX)"]
|
||||||
|
ui1["StartPOS Entry Point"]
|
||||||
|
ui2["Sales Screens<br/>Simple • Restaurant<br/>Shared Modes"]
|
||||||
|
ui3["Admin Panels<br/>User Mgmt • Settings"]
|
||||||
|
ui4["Forms & Dialogs<br/>Customers • Suppliers<br/>Inventory"]
|
||||||
|
ui5["Reporting Dashboards<br/>JFreeChart"]
|
||||||
|
end
|
||||||
|
|
||||||
|
subgraph service["SERVICE LAYER<br/>(Business Logic)"]
|
||||||
|
svc1["Sales Service"]
|
||||||
|
svc2["Inventory Service"]
|
||||||
|
svc3["Customer Service"]
|
||||||
|
svc4["Payment Service"]
|
||||||
|
svc5["Reporting Service"]
|
||||||
|
svc6["Config/Admin Service"]
|
||||||
|
end
|
||||||
|
|
||||||
|
subgraph dao["DATA ACCESS LAYER<br/>(DAOs)"]
|
||||||
|
dao1["ProductDAO"]
|
||||||
|
dao2["TicketDAO"]
|
||||||
|
dao3["CustomerDAO"]
|
||||||
|
dao4["EmployeeDAO"]
|
||||||
|
dao5["CompanyDAO"]
|
||||||
|
dao6["SupplierDAO"]
|
||||||
|
end
|
||||||
|
|
||||||
|
subgraph peripheral["PERIPHERAL INTEGRATION<br/>(Drivers & APIs)"]
|
||||||
|
per1["Printer Drivers<br/>ESC-POS • JavaPOS"]
|
||||||
|
per2["Scale Reader<br/>Serial Comm"]
|
||||||
|
per3["Barcode Scanner<br/>ZXing"]
|
||||||
|
per4["Card Reader<br/>USB/Serial"]
|
||||||
|
end
|
||||||
|
|
||||||
|
subgraph utils["UTILITIES & SUPPORT"]
|
||||||
|
util1["Logging<br/>Logback"]
|
||||||
|
util2["Formatting<br/>Date • Currency"]
|
||||||
|
util3["Localization<br/>i18n"]
|
||||||
|
util4["Reporting<br/>JasperReports"]
|
||||||
|
util5["Scripting<br/>BeanShell"]
|
||||||
|
util6["Plugins"]
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
subgraph external["📦 EXTERNAL SYSTEMS"]
|
||||||
|
extdb["💾 Database<br/>MySQL/Derby/SQLite<br/>PostgreSQL"]
|
||||||
|
extfs["📂 File System<br/>Configs • Templates<br/>Locales • Reports"]
|
||||||
|
devices["🖨️ Physical Devices<br/>Printers • Scales<br/>Scanners • Card Readers"]
|
||||||
|
end
|
||||||
|
|
||||||
|
ui -->|calls| service
|
||||||
|
service -->|uses| dao
|
||||||
|
service -->|uses| peripheral
|
||||||
|
service -->|uses| utils
|
||||||
|
ui -->|uses| utils
|
||||||
|
|
||||||
|
dao -->|reads/writes| extdb
|
||||||
|
peripheral -->|controls| devices
|
||||||
|
service -->|reads/writes| extfs
|
||||||
|
ui -->|reads/writes| extfs
|
||||||
|
|
||||||
|
style app fill:#E8F4F8,stroke:#2E5C8A,stroke-width:2px
|
||||||
|
style ui fill:#4A90E2,stroke:#2E5C8A,color:#fff
|
||||||
|
style service fill:#50C878,stroke:#2D7A4A,color:#fff
|
||||||
|
style dao fill:#FF9F43,stroke:#B8690F,color:#fff
|
||||||
|
style peripheral fill:#FF6B6B,stroke:#A53D3D,color:#fff
|
||||||
|
style utils fill:#9B59B6,stroke:#5B2C6F,color:#fff
|
||||||
|
style external fill:#F0F0F0,stroke:#666
|
||||||
|
style extdb fill:#FFB84D,stroke:#8B6914,color:#fff
|
||||||
|
style extfs fill:#9B59B6,stroke:#5B2C6F,color:#fff
|
||||||
|
style devices fill:#FF6B6B,stroke:#A53D3D,color:#fff
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Level 3: Component Architecture
|
||||||
|
|
||||||
|
### Sales Module
|
||||||
|
|
||||||
|
```mermaid
|
||||||
|
graph LR
|
||||||
|
subgraph sales["com.unicenta.pos.sales"]
|
||||||
|
simple["simple/<br/>Simple POS Mode"]
|
||||||
|
restaurant["restaurant/<br/>Table/Order Mode"]
|
||||||
|
shared["shared/<br/>Shared Ticket Logic"]
|
||||||
|
end
|
||||||
|
|
||||||
|
simple -.-> shared
|
||||||
|
restaurant -.-> shared
|
||||||
|
|
||||||
|
style sales fill:#4A90E2,stroke:#2E5C8A,color:#fff
|
||||||
|
style simple fill:#5BA3D0,stroke:#2E5C8A,color:#fff
|
||||||
|
style restaurant fill:#5BA3D0,stroke:#2E5C8A,color:#fff
|
||||||
|
style shared fill:#6BB3E0,stroke:#2E5C8A,color:#fff
|
||||||
|
```
|
||||||
|
|
||||||
|
### Inventory & Catalog Modules
|
||||||
|
|
||||||
|
```mermaid
|
||||||
|
graph TB
|
||||||
|
subgraph inventory["com.unicenta.pos.inventory"]
|
||||||
|
inv_prod["Product Management"]
|
||||||
|
inv_stock["Stock Tracking"]
|
||||||
|
inv_cat["Category Management"]
|
||||||
|
end
|
||||||
|
|
||||||
|
subgraph catalog["com.unicenta.pos.catalog"]
|
||||||
|
cat_prod["Product Categorization"]
|
||||||
|
cat_search["Product Search/Filter"]
|
||||||
|
cat_display["Display Management"]
|
||||||
|
end
|
||||||
|
|
||||||
|
inv_prod ---|shared data| cat_prod
|
||||||
|
inv_cat ---|manages| cat_display
|
||||||
|
|
||||||
|
style inventory fill:#50C878,stroke:#2D7A4A,color:#fff
|
||||||
|
style catalog fill:#50C878,stroke:#2D7A4A,color:#fff
|
||||||
|
style inv_prod fill:#68D989,stroke:#2D7A4A,color:#fff
|
||||||
|
style inv_stock fill:#68D989,stroke:#2D7A4A,color:#fff
|
||||||
|
style inv_cat fill:#68D989,stroke:#2D7A4A,color:#fff
|
||||||
|
style cat_prod fill:#68D989,stroke:#2D7A4A,color:#fff
|
||||||
|
style cat_search fill:#68D989,stroke:#2D7A4A,color:#fff
|
||||||
|
style cat_display fill:#68D989,stroke:#2D7A4A,color:#fff
|
||||||
|
```
|
||||||
|
|
||||||
|
### Ticket & Payment Processing
|
||||||
|
|
||||||
|
```mermaid
|
||||||
|
graph TB
|
||||||
|
subgraph ticket["com.unicenta.pos.ticket"]
|
||||||
|
ticket_create["Ticket Creation"]
|
||||||
|
ticket_items["Line Items Mgmt"]
|
||||||
|
ticket_lifecycle["Lifecycle Management"]
|
||||||
|
end
|
||||||
|
|
||||||
|
subgraph payment["com.unicenta.pos.payment"]
|
||||||
|
pay_method["Payment Methods"]
|
||||||
|
pay_process["Payment Processing"]
|
||||||
|
pay_card["Card Integration"]
|
||||||
|
end
|
||||||
|
|
||||||
|
ticket_create -->|on completion| pay_method
|
||||||
|
ticket_items -->|on finalize| pay_process
|
||||||
|
pay_process -->|if card| pay_card
|
||||||
|
|
||||||
|
style ticket fill:#FF9F43,stroke:#B8690F,color:#fff
|
||||||
|
style payment fill:#FF9F43,stroke:#B8690F,color:#fff
|
||||||
|
style ticket_create fill:#FDB44B,stroke:#B8690F,color:#fff
|
||||||
|
style ticket_items fill:#FDB44B,stroke:#B8690F,color:#fff
|
||||||
|
style ticket_lifecycle fill:#FDB44B,stroke:#B8690F,color:#fff
|
||||||
|
style pay_method fill:#FDB44B,stroke:#B8690F,color:#fff
|
||||||
|
style pay_process fill:#FDB44B,stroke:#B8690F,color:#fff
|
||||||
|
style pay_card fill:#FDB44B,stroke:#B8690F,color:#fff
|
||||||
|
```
|
||||||
|
|
||||||
|
### Reporting & Administration
|
||||||
|
|
||||||
|
```mermaid
|
||||||
|
graph TB
|
||||||
|
subgraph reports["com.unicenta.pos.reports"]
|
||||||
|
report_gen["Report Generation"]
|
||||||
|
report_chart["Chart Generation<br/>JFreeChart"]
|
||||||
|
report_export["PDF/Excel Export"]
|
||||||
|
end
|
||||||
|
|
||||||
|
subgraph admin["com.unicenta.pos.admin"]
|
||||||
|
admin_user["User Management"]
|
||||||
|
admin_config["System Configuration"]
|
||||||
|
admin_security["Access Control"]
|
||||||
|
end
|
||||||
|
|
||||||
|
report_gen -->|uses| report_chart
|
||||||
|
report_chart -->|renders to| report_export
|
||||||
|
admin_user -->|applies| admin_security
|
||||||
|
|
||||||
|
style reports fill:#9B59B6,stroke:#5B2C6F,color:#fff
|
||||||
|
style admin fill:#9B59B6,stroke:#5B2C6F,color:#fff
|
||||||
|
style report_gen fill:#B76AC2,stroke:#5B2C6F,color:#fff
|
||||||
|
style report_chart fill:#B76AC2,stroke:#5B2C6F,color:#fff
|
||||||
|
style report_export fill:#B76AC2,stroke:#5B2C6F,color:#fff
|
||||||
|
style admin_user fill:#B76AC2,stroke:#5B2C6F,color:#fff
|
||||||
|
style admin_config fill:#B76AC2,stroke:#5B2C6F,color:#fff
|
||||||
|
style admin_security fill:#B76AC2,stroke:#5B2C6F,color:#fff
|
||||||
|
```
|
||||||
|
|
||||||
|
### Printer System
|
||||||
|
|
||||||
|
```mermaid
|
||||||
|
graph LR
|
||||||
|
subgraph printer["com.unicenta.pos.printer"]
|
||||||
|
escpos["escpos/<br/>ESC-POS Driver"]
|
||||||
|
javapos["javapos/<br/>JavaPOS Driver"]
|
||||||
|
screen["screen/<br/>Screen Preview"]
|
||||||
|
end
|
||||||
|
|
||||||
|
reports["JasperReports<br/>JFreeChart"]
|
||||||
|
|
||||||
|
reports -->|routes to| escpos
|
||||||
|
reports -->|routes to| javapos
|
||||||
|
reports -->|routes to| screen
|
||||||
|
|
||||||
|
style printer fill:#FF6B6B,stroke:#A53D3D,color:#fff
|
||||||
|
style escpos fill:#FF8E8E,stroke:#A53D3D,color:#fff
|
||||||
|
style javapos fill:#FF8E8E,stroke:#A53D3D,color:#fff
|
||||||
|
style screen fill:#FF8E8E,stroke:#A53D3D,color:#fff
|
||||||
|
style reports fill:#9B59B6,stroke:#5B2C6F,color:#fff
|
||||||
|
```
|
||||||
|
|
||||||
|
### Communication & Integration
|
||||||
|
|
||||||
|
```mermaid
|
||||||
|
graph TB
|
||||||
|
subgraph comm["com.unicenta.pos.comm"]
|
||||||
|
serial["Serial Communication<br/>RXTX • jSerialComm"]
|
||||||
|
usb["USB Communication<br/>USB4Java"]
|
||||||
|
end
|
||||||
|
|
||||||
|
scale["Scale Reader"]
|
||||||
|
scanner["Barcode Scanner<br/>ZXing"]
|
||||||
|
reader["Card Reader"]
|
||||||
|
|
||||||
|
serial -->|reads| scale
|
||||||
|
serial -->|reads| scanner
|
||||||
|
usb -->|reads| reader
|
||||||
|
|
||||||
|
style comm fill:#FF6B6B,stroke:#A53D3D,color:#fff
|
||||||
|
style serial fill:#FF8E8E,stroke:#A53D3D,color:#fff
|
||||||
|
style usb fill:#FF8E8E,stroke:#A53D3D,color:#fff
|
||||||
|
style scale fill:#D9534F,stroke:#A53D3D,color:#fff
|
||||||
|
style scanner fill:#D9534F,stroke:#A53D3D,color:#fff
|
||||||
|
style reader fill:#D9534F,stroke:#A53D3D,color:#fff
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Level 4: Data Flow Diagrams
|
||||||
|
|
||||||
|
### Sales Transaction Flow
|
||||||
|
|
||||||
|
```mermaid
|
||||||
|
sequenceDiagram
|
||||||
|
actor User as POS Operator
|
||||||
|
participant UI as Sales Screen
|
||||||
|
participant Service as Sales Service
|
||||||
|
participant DAO as TicketDAO
|
||||||
|
participant DB as Database
|
||||||
|
participant Payment as Payment Service
|
||||||
|
participant Printer as Printer Service
|
||||||
|
|
||||||
|
User->>UI: Create/Edit Ticket
|
||||||
|
UI->>Service: Process Ticket
|
||||||
|
Service->>DAO: Save Ticket
|
||||||
|
DAO->>DB: INSERT/UPDATE
|
||||||
|
DB-->>DAO: Confirm
|
||||||
|
DAO-->>Service: Ticket ID
|
||||||
|
User->>UI: Process Payment
|
||||||
|
UI->>Service: Payment Request
|
||||||
|
Service->>Payment: Process Payment
|
||||||
|
Payment-->>Service: Payment Confirmed
|
||||||
|
Service->>Printer: Print Receipt
|
||||||
|
Printer-->>Service: Print Complete
|
||||||
|
Service-->>UI: Transaction Complete
|
||||||
|
UI-->>User: Display Confirmation
|
||||||
|
```
|
||||||
|
|
||||||
|
### Product Lookup Flow
|
||||||
|
|
||||||
|
```mermaid
|
||||||
|
sequenceDiagram
|
||||||
|
actor Device as Barcode Scanner
|
||||||
|
participant UI as Sales Screen
|
||||||
|
participant DAO as ProductDAO
|
||||||
|
participant DB as Database
|
||||||
|
|
||||||
|
Device->>UI: Scan Barcode
|
||||||
|
UI->>DAO: Query Product
|
||||||
|
DAO->>DB: SELECT Product
|
||||||
|
DB-->>DAO: Product Data
|
||||||
|
DAO-->>UI: Product Details
|
||||||
|
UI-->>Device: Display Product Info
|
||||||
|
```
|
||||||
|
|
||||||
|
### Report Generation Flow
|
||||||
|
|
||||||
|
```mermaid
|
||||||
|
sequenceDiagram
|
||||||
|
actor User as Admin/Manager
|
||||||
|
participant UI as Admin Panel
|
||||||
|
participant Service as Reporting Service
|
||||||
|
participant JasperReports as JasperReports Engine
|
||||||
|
participant DB as Database
|
||||||
|
participant FileSystem as File System
|
||||||
|
|
||||||
|
User->>UI: Request Report
|
||||||
|
UI->>Service: Generate Report
|
||||||
|
Service->>DB: Query Data
|
||||||
|
DB-->>Service: Report Data
|
||||||
|
Service->>JasperReports: Render Report
|
||||||
|
JasperReports->>FileSystem: Generate PDF/Excel
|
||||||
|
FileSystem-->>JasperReports: File Path
|
||||||
|
JasperReports-->>Service: Report Ready
|
||||||
|
Service-->>UI: Display/Download
|
||||||
|
UI-->>User: Provide Report
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Level 5: Package Structure
|
||||||
|
|
||||||
|
```mermaid
|
||||||
|
graph TB
|
||||||
|
com["com.unicenta"]
|
||||||
|
|
||||||
|
com -->|core| basic["basic<br/>Exception Handling<br/>Logging"]
|
||||||
|
com -->|ui| beans["beans<br/>Custom UI Components<br/>Dialogs • Date Pickers<br/>Number Pads"]
|
||||||
|
com -->|ui| orderpop["orderpop<br/>Order Popup Module"]
|
||||||
|
com -->|plugins| plugins["plugins<br/>Plugin Architecture<br/>Metrics System"]
|
||||||
|
|
||||||
|
pos["com.unicenta.pos"]
|
||||||
|
com -->|main| pos
|
||||||
|
|
||||||
|
pos -->|sales| sales["sales<br/>Simple • Restaurant<br/>Shared Modes"]
|
||||||
|
pos -->|inventory| inventory["inventory<br/>Products • Stock<br/>Categories"]
|
||||||
|
pos -->|customers| customers["customers<br/>Customer Management<br/>Loyalty Programs"]
|
||||||
|
pos -->|catalog| catalog["catalog<br/>Product Catalog<br/>Display Management"]
|
||||||
|
pos -->|ticket| ticket["ticket<br/>Ticket Lifecycle<br/>Line Items"]
|
||||||
|
pos -->|payment| payment["payment<br/>Payment Methods<br/>Card Integration<br/>Cash Handling"]
|
||||||
|
pos -->|reports| reports["reports<br/>JasperReports<br/>JFreeChart<br/>PDF/Excel Export"]
|
||||||
|
pos -->|admin| admin["admin<br/>User Management<br/>System Configuration<br/>Access Control"]
|
||||||
|
pos -->|printer| printer["printer<br/>ESC-POS • JavaPOS<br/>Screen Preview"]
|
||||||
|
pos -->|comm| comm["comm<br/>Serial • USB<br/>Scale • Scanner<br/>Card Reader"]
|
||||||
|
pos -->|scripting| scripting["scripting<br/>BeanShell<br/>Custom Logic"]
|
||||||
|
pos -->|forms| forms["forms<br/>Main UI<br/>Data Entry Forms"]
|
||||||
|
pos -->|config| config["config<br/>Configuration Mgmt<br/>Settings"]
|
||||||
|
pos -->|instance| instance["instance<br/>Instance Management<br/>Singleton Patterns"]
|
||||||
|
pos -->|mant| mant["mant<br/>Maintenance<br/>Utilities"]
|
||||||
|
|
||||||
|
style com fill:#E8F4F8,stroke:#2E5C8A
|
||||||
|
style pos fill:#4A90E2,stroke:#2E5C8A,color:#fff
|
||||||
|
style basic fill:#5BA3D0,stroke:#2E5C8A,color:#fff
|
||||||
|
style beans fill:#5BA3D0,stroke:#2E5C8A,color:#fff
|
||||||
|
style orderpop fill:#5BA3D0,stroke:#2E5C8A,color:#fff
|
||||||
|
style plugins fill:#5BA3D0,stroke:#2E5C8A,color:#fff
|
||||||
|
style sales fill:#50C878,stroke:#2D7A4A,color:#fff
|
||||||
|
style inventory fill:#50C878,stroke:#2D7A4A,color:#fff
|
||||||
|
style customers fill:#50C878,stroke:#2D7A4A,color:#fff
|
||||||
|
style catalog fill:#50C878,stroke:#2D7A4A,color:#fff
|
||||||
|
style ticket fill:#FF9F43,stroke:#B8690F,color:#fff
|
||||||
|
style payment fill:#FF9F43,stroke:#B8690F,color:#fff
|
||||||
|
style reports fill:#9B59B6,stroke:#5B2C6F,color:#fff
|
||||||
|
style admin fill:#9B59B6,stroke:#5B2C6F,color:#fff
|
||||||
|
style printer fill:#FF6B6B,stroke:#A53D3D,color:#fff
|
||||||
|
style comm fill:#FF6B6B,stroke:#A53D3D,color:#fff
|
||||||
|
style scripting fill:#FFB84D,stroke:#8B6914,color:#fff
|
||||||
|
style forms fill:#4A90E2,stroke:#2E5C8A,color:#fff
|
||||||
|
style config fill:#4A90E2,stroke:#2E5C8A,color:#fff
|
||||||
|
style instance fill:#4A90E2,stroke:#2E5C8A,color:#fff
|
||||||
|
style mant fill:#4A90E2,stroke:#2E5C8A,color:#fff
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Level 6: Database Schema Overview
|
||||||
|
|
||||||
|
```mermaid
|
||||||
|
graph TB
|
||||||
|
subgraph core["CORE ENTITIES"]
|
||||||
|
company["COMPANY<br/>company_id<br/>name<br/>code"]
|
||||||
|
location["LOCATION<br/>location_id<br/>name<br/>address"]
|
||||||
|
products["PRODUCTS<br/>product_id<br/>name<br/>code<br/>price"]
|
||||||
|
categories["CATEGORIES<br/>category_id<br/>name<br/>description"]
|
||||||
|
end
|
||||||
|
|
||||||
|
subgraph transactions["TRANSACTION ENTITIES"]
|
||||||
|
tickets["TICKETS<br/>ticket_id<br/>number<br/>date<br/>customer_id"]
|
||||||
|
lines["TICKETLINES<br/>line_id<br/>ticket_id<br/>product_id<br/>qty"]
|
||||||
|
payments["PAYMENTS<br/>payment_id<br/>ticket_id<br/>method<br/>amount"]
|
||||||
|
end
|
||||||
|
|
||||||
|
subgraph master["MASTER DATA"]
|
||||||
|
customers["CUSTOMERS<br/>customer_id<br/>name<br/>email<br/>phone"]
|
||||||
|
suppliers["SUPPLIERS<br/>supplier_id<br/>name<br/>contact<br/>products"]
|
||||||
|
employees["EMPLOYEES<br/>employee_id<br/>name<br/>role<br/>access_level"]
|
||||||
|
taxes["TAXCATEGORIES<br/>tax_id<br/>name<br/>rate"]
|
||||||
|
end
|
||||||
|
|
||||||
|
subgraph inventory["INVENTORY ENTITIES"]
|
||||||
|
stock["STOCK<br/>stock_id<br/>product_id<br/>location_id<br/>quantity"]
|
||||||
|
movements["STOCKMOVEMENTS<br/>movement_id<br/>product_id<br/>qty<br/>type"]
|
||||||
|
end
|
||||||
|
|
||||||
|
company -->|operates| location
|
||||||
|
location -->|manages| products
|
||||||
|
products -->|in| categories
|
||||||
|
location -->|in| stock
|
||||||
|
products -->|in| stock
|
||||||
|
|
||||||
|
customers -->|creates| tickets
|
||||||
|
employees -->|processes| tickets
|
||||||
|
products -->|in| lines
|
||||||
|
tickets -->|contains| lines
|
||||||
|
tickets -->|has| payments
|
||||||
|
tickets -->|has| taxes
|
||||||
|
|
||||||
|
products -->|from| suppliers
|
||||||
|
stock -->|tracks| movements
|
||||||
|
|
||||||
|
style core fill:#4A90E2,stroke:#2E5C8A,color:#fff
|
||||||
|
style transactions fill:#FF9F43,stroke:#B8690F,color:#fff
|
||||||
|
style master fill:#50C878,stroke:#2D7A4A,color:#fff
|
||||||
|
style inventory fill:#9B59B6,stroke:#5B2C6F,color:#fff
|
||||||
|
style company fill:#5BA3D0,stroke:#2E5C8A,color:#fff
|
||||||
|
style location fill:#5BA3D0,stroke:#2E5C8A,color:#fff
|
||||||
|
style products fill:#5BA3D0,stroke:#2E5C8A,color:#fff
|
||||||
|
style categories fill:#5BA3D0,stroke:#2E5C8A,color:#fff
|
||||||
|
style tickets fill:#FDB44B,stroke:#B8690F,color:#fff
|
||||||
|
style lines fill:#FDB44B,stroke:#B8690F,color:#fff
|
||||||
|
style payments fill:#FDB44B,stroke:#B8690F,color:#fff
|
||||||
|
style customers fill:#68D989,stroke:#2D7A4A,color:#fff
|
||||||
|
style suppliers fill:#68D989,stroke:#2D7A4A,color:#fff
|
||||||
|
style employees fill:#68D989,stroke:#2D7A4A,color:#fff
|
||||||
|
style taxes fill:#68D989,stroke:#2D7A4A,color:#fff
|
||||||
|
style stock fill:#B76AC2,stroke:#5B2C6F,color:#fff
|
||||||
|
style movements fill:#B76AC2,stroke:#5B2C6F,color:#fff
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Technology Stack
|
||||||
|
|
||||||
|
```mermaid
|
||||||
|
graph TB
|
||||||
|
subgraph frontend["FRONTEND"]
|
||||||
|
swing["Swing<br/>Traditional UI"]
|
||||||
|
javafx["JavaFX<br/>Modern UI"]
|
||||||
|
flatlaf["FlatLAF<br/>Modern Look & Feel"]
|
||||||
|
end
|
||||||
|
|
||||||
|
subgraph backend["BACKEND"]
|
||||||
|
java["Java 8+<br/>Core Logic"]
|
||||||
|
lombok["Lombok<br/>Boilerplate Reduction"]
|
||||||
|
beanshell["BeanShell<br/>Dynamic Scripting"]
|
||||||
|
end
|
||||||
|
|
||||||
|
subgraph data["DATA & PERSISTENCE"]
|
||||||
|
jdbc["JDBC<br/>Database Abstraction"]
|
||||||
|
mysql["MySQL<br/>Primary Database"]
|
||||||
|
derby["Derby<br/>Embedded DB"]
|
||||||
|
sqlite["SQLite<br/>Lightweight DB"]
|
||||||
|
postgres["PostgreSQL<br/>Enterprise DB"]
|
||||||
|
end
|
||||||
|
|
||||||
|
subgraph reporting["REPORTING & ANALYTICS"]
|
||||||
|
jasper["JasperReports<br/>Report Generation"]
|
||||||
|
jfreechart["JFreeChart<br/>Charts & Graphs"]
|
||||||
|
poi["Apache POI<br/>Excel Export"]
|
||||||
|
itext["iText<br/>PDF Generation"]
|
||||||
|
end
|
||||||
|
|
||||||
|
subgraph devices["DEVICE INTEGRATION"]
|
||||||
|
rxtx["RXTX/jSerialComm<br/>Serial Communication"]
|
||||||
|
usb4j["USB4Java<br/>USB Communication"]
|
||||||
|
zxing["ZXing<br/>Barcode Processing"]
|
||||||
|
jpos["JavaPOS<br/>POS Device Standard"]
|
||||||
|
end
|
||||||
|
|
||||||
|
subgraph support["SUPPORT LIBRARIES"]
|
||||||
|
logback["Logback<br/>Logging"]
|
||||||
|
gson["GSON<br/>JSON Processing"]
|
||||||
|
xstream["XStream<br/>XML Serialization"]
|
||||||
|
velocity["Apache Velocity<br/>Template Engine"]
|
||||||
|
end
|
||||||
|
|
||||||
|
style frontend fill:#4A90E2,stroke:#2E5C8A,color:#fff
|
||||||
|
style backend fill:#50C878,stroke:#2D7A4A,color:#fff
|
||||||
|
style data fill:#FF9F43,stroke:#B8690F,color:#fff
|
||||||
|
style reporting fill:#9B59B6,stroke:#5B2C6F,color:#fff
|
||||||
|
style devices fill:#FF6B6B,stroke:#A53D3D,color:#fff
|
||||||
|
style support fill:#FFB84D,stroke:#8B6914,color:#fff
|
||||||
|
|
||||||
|
style swing fill:#5BA3D0,stroke:#2E5C8A,color:#fff
|
||||||
|
style javafx fill:#5BA3D0,stroke:#2E5C8A,color:#fff
|
||||||
|
style flatlaf fill:#5BA3D0,stroke:#2E5C8A,color:#fff
|
||||||
|
style java fill:#68D989,stroke:#2D7A4A,color:#fff
|
||||||
|
style lombok fill:#68D989,stroke:#2D7A4A,color:#fff
|
||||||
|
style beanshell fill:#68D989,stroke:#2D7A4A,color:#fff
|
||||||
|
style jdbc fill:#FDB44B,stroke:#B8690F,color:#fff
|
||||||
|
style mysql fill:#FDB44B,stroke:#B8690F,color:#fff
|
||||||
|
style derby fill:#FDB44B,stroke:#B8690F,color:#fff
|
||||||
|
style sqlite fill:#FDB44B,stroke:#B8690F,color:#fff
|
||||||
|
style postgres fill:#FDB44B,stroke:#B8690F,color:#fff
|
||||||
|
style jasper fill:#B76AC2,stroke:#5B2C6F,color:#fff
|
||||||
|
style jfreechart fill:#B76AC2,stroke:#5B2C6F,color:#fff
|
||||||
|
style poi fill:#B76AC2,stroke:#5B2C6F,color:#fff
|
||||||
|
style itext fill:#B76AC2,stroke:#5B2C6F,color:#fff
|
||||||
|
style rxtx fill:#FF8E8E,stroke:#A53D3D,color:#fff
|
||||||
|
style usb4j fill:#FF8E8E,stroke:#A53D3D,color:#fff
|
||||||
|
style zxing fill:#FF8E8E,stroke:#A53D3D,color:#fff
|
||||||
|
style jpos fill:#FF8E8E,stroke:#A53D3D,color:#fff
|
||||||
|
style logback fill:#F5B041,stroke:#8B6914,color:#fff
|
||||||
|
style gson fill:#F5B041,stroke:#8B6914,color:#fff
|
||||||
|
style xstream fill:#F5B041,stroke:#8B6914,color:#fff
|
||||||
|
style velocity fill:#F5B041,stroke:#8B6914,color:#fff
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Key Architectural Patterns
|
||||||
|
|
||||||
|
```mermaid
|
||||||
|
graph TB
|
||||||
|
subgraph patterns["DESIGN PATTERNS"]
|
||||||
|
dao_pat["📋 DAO Pattern<br/>Data Abstraction"]
|
||||||
|
service_pat["🔧 Service Pattern<br/>Business Logic"]
|
||||||
|
singleton_pat["🎯 Singleton Pattern<br/>Resource Management"]
|
||||||
|
factory_pat["🏭 Factory Pattern<br/>Object Creation"]
|
||||||
|
plugin_pat["🔌 Plugin Pattern<br/>Extensibility"]
|
||||||
|
end
|
||||||
|
|
||||||
|
subgraph layers["ARCHITECTURAL LAYERS"]
|
||||||
|
presentation["📱 Presentation<br/>UI Components"]
|
||||||
|
business["💼 Business Logic<br/>Services"]
|
||||||
|
data["💾 Data Access<br/>DAOs & Queries"]
|
||||||
|
external["🔌 External Integration<br/>Devices & Files"]
|
||||||
|
end
|
||||||
|
|
||||||
|
subgraph principles["DESIGN PRINCIPLES"]
|
||||||
|
sep_concern["Separation of Concerns<br/>Distinct responsibilities"]
|
||||||
|
loose_coupling["Loose Coupling<br/>Independent modules"]
|
||||||
|
high_cohesion["High Cohesion<br/>Related functionality"]
|
||||||
|
abstraction["Abstraction<br/>Hide complexity"]
|
||||||
|
end
|
||||||
|
|
||||||
|
presentation -->|calls| business
|
||||||
|
business -->|uses| data
|
||||||
|
business -->|uses| external
|
||||||
|
|
||||||
|
dao_pat -->|implements| data
|
||||||
|
service_pat -->|implements| business
|
||||||
|
singleton_pat -->|ensures| resource_management["Resource<br/>Management"]
|
||||||
|
factory_pat -->|creates| objects["Objects"]
|
||||||
|
plugin_pat -->|enables| extensions["Extensions"]
|
||||||
|
|
||||||
|
style patterns fill:#4A90E2,stroke:#2E5C8A,color:#fff
|
||||||
|
style layers fill:#50C878,stroke:#2D7A4A,color:#fff
|
||||||
|
style principles fill:#9B59B6,stroke:#5B2C6F,color:#fff
|
||||||
|
style dao_pat fill:#5BA3D0,stroke:#2E5C8A,color:#fff
|
||||||
|
style service_pat fill:#5BA3D0,stroke:#2E5C8A,color:#fff
|
||||||
|
style singleton_pat fill:#5BA3D0,stroke:#2E5C8A,color:#fff
|
||||||
|
style factory_pat fill:#5BA3D0,stroke:#2E5C8A,color:#fff
|
||||||
|
style plugin_pat fill:#5BA3D0,stroke:#2E5C8A,color:#fff
|
||||||
|
style presentation fill:#68D989,stroke:#2D7A4A,color:#fff
|
||||||
|
style business fill:#68D989,stroke:#2D7A4A,color:#fff
|
||||||
|
style data fill:#68D989,stroke:#2D7A4A,color:#fff
|
||||||
|
style external fill:#68D989,stroke:#2D7A4A,color:#fff
|
||||||
|
style sep_concern fill:#B76AC2,stroke:#5B2C6F,color:#fff
|
||||||
|
style loose_coupling fill:#B76AC2,stroke:#5B2C6F,color:#fff
|
||||||
|
style high_cohesion fill:#B76AC2,stroke:#5B2C6F,color:#fff
|
||||||
|
style abstraction fill:#B76AC2,stroke:#5B2C6F,color:#fff
|
||||||
|
style resource_management fill:#FFB84D,stroke:#8B6914,color:#fff
|
||||||
|
style objects fill:#FFB84D,stroke:#8B6914,color:#fff
|
||||||
|
style extensions fill:#FFB84D,stroke:#8B6914,color:#fff
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Core Features Architecture
|
||||||
|
|
||||||
|
```mermaid
|
||||||
|
graph TB
|
||||||
|
system["🏪 Unicenta oPOS<br/>Enterprise POS System"]
|
||||||
|
|
||||||
|
system -->|Sales Management| sales_feat["Sales Processing<br/>Multiple modes<br/>Ticket management<br/>Payment handling"]
|
||||||
|
|
||||||
|
system -->|Inventory Management| inventory_feat["Product Management<br/>Stock tracking<br/>Category organization<br/>Quantity monitoring"]
|
||||||
|
|
||||||
|
system -->|Customer Management| customer_feat["Customer Database<br/>Transaction history<br/>Loyalty programs<br/>Communication"]
|
||||||
|
|
||||||
|
system -->|Supplier Management| supplier_feat["Supplier Directory<br/>Purchase orders<br/>Product sourcing<br/>Vendor info"]
|
||||||
|
|
||||||
|
system -->|Employee Management| employee_feat["User Accounts<br/>Access Control<br/>Role Assignment<br/>Activity Logging"]
|
||||||
|
|
||||||
|
system -->|Reporting & Analytics| reporting_feat["Sales Reports<br/>Inventory Reports<br/>Financial Reports<br/>Charts & Graphs"]
|
||||||
|
|
||||||
|
system -->|Device Integration| device_feat["Thermal Printers<br/>Barcode Scanners<br/>Weight Scales<br/>Card Readers"]
|
||||||
|
|
||||||
|
system -->|Multi-platform| platform_feat["Windows Support<br/>Linux Support<br/>macOS Support<br/>Cross-platform UI"]
|
||||||
|
|
||||||
|
style system fill:#4A90E2,stroke:#2E5C8A,color:#fff,stroke-width:3px
|
||||||
|
style sales_feat fill:#50C878,stroke:#2D7A4A,color:#fff
|
||||||
|
style inventory_feat fill:#50C878,stroke:#2D7A4A,color:#fff
|
||||||
|
style customer_feat fill:#50C878,stroke:#2D7A4A,color:#fff
|
||||||
|
style supplier_feat fill:#50C878,stroke:#2D7A4A,color:#fff
|
||||||
|
style employee_feat fill:#9B59B6,stroke:#5B2C6F,color:#fff
|
||||||
|
style reporting_feat fill:#9B59B6,stroke:#5B2C6F,color:#fff
|
||||||
|
style device_feat fill:#FF6B6B,stroke:#A53D3D,color:#fff
|
||||||
|
style platform_feat fill:#FFB84D,stroke:#8B6914,color:#fff
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Deployment Architecture
|
||||||
|
|
||||||
|
```mermaid
|
||||||
|
graph TB
|
||||||
|
subgraph client["CLIENT TIER"]
|
||||||
|
desktop["💻 Desktop Machine<br/>Windows • Linux • macOS<br/>Java Runtime (JRE 8+)"]
|
||||||
|
end
|
||||||
|
|
||||||
|
subgraph app_tier["APPLICATION TIER"]
|
||||||
|
jar["📦 unicentaopos.jar<br/>Version 5.4.0<br/>Java Swing/JavaFX"]
|
||||||
|
end
|
||||||
|
|
||||||
|
subgraph data_tier["DATA TIER"]
|
||||||
|
db_choice["Database Engine<br/>MySQL 5.x<br/>Derby<br/>SQLite<br/>PostgreSQL"]
|
||||||
|
db_instance["Database Instance<br/>Schema: unicentaopos<br/>Tables & Indexes"]
|
||||||
|
end
|
||||||
|
|
||||||
|
subgraph files["FILE STORAGE"]
|
||||||
|
reports_dir["📁 Reports Directory<br/>Generated PDFs<br/>Excel Files"]
|
||||||
|
config_dir["📁 Config Directory<br/>Application Settings<br/>User Preferences"]
|
||||||
|
templates["📁 Templates<br/>Report Templates<br/>Print Layouts"]
|
||||||
|
locales["📁 Localization<br/>Language Files<br/>i18n Resources"]
|
||||||
|
end
|
||||||
|
|
||||||
|
desktop -->|runs| jar
|
||||||
|
jar -->|connects to| db_choice
|
||||||
|
db_choice -->|manages| db_instance
|
||||||
|
jar -->|reads/writes| reports_dir
|
||||||
|
jar -->|reads/writes| config_dir
|
||||||
|
jar -->|reads| templates
|
||||||
|
jar -->|reads| locales
|
||||||
|
|
||||||
|
style client fill:#E8F4F8,stroke:#2E5C8A,stroke-width:2px
|
||||||
|
style app_tier fill:#4A90E2,stroke:#2E5C8A,color:#fff,stroke-width:2px
|
||||||
|
style data_tier fill:#FF9F43,stroke:#B8690F,color:#fff,stroke-width:2px
|
||||||
|
style files fill:#9B59B6,stroke:#5B2C6F,color:#fff,stroke-width:2px
|
||||||
|
style desktop fill:#5BA3D0,stroke:#2E5C8A,color:#fff
|
||||||
|
style jar fill:#5BA3D0,stroke:#2E5C8A,color:#fff
|
||||||
|
style db_choice fill:#FDB44B,stroke:#B8690F,color:#fff
|
||||||
|
style db_instance fill:#FDB44B,stroke:#B8690F,color:#fff
|
||||||
|
style reports_dir fill:#B76AC2,stroke:#5B2C6F,color:#fff
|
||||||
|
style config_dir fill:#B76AC2,stroke:#5B2C6F,color:#fff
|
||||||
|
style templates fill:#B76AC2,stroke:#5B2C6F,color:#fff
|
||||||
|
style locales fill:#B76AC2,stroke:#5B2C6F,color:#fff
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Quick Start
|
||||||
|
|
||||||
|
### Prerequisites
|
||||||
|
|
||||||
|
- Java 8+ (JRE)
|
||||||
|
- MySQL 5.x (or Derby/SQLite/PostgreSQL)
|
||||||
|
- Create database schema: `unicentaopos`
|
||||||
|
|
||||||
|
### Build
|
||||||
|
|
||||||
|
```bash
|
||||||
|
mvn clean package
|
||||||
|
```
|
||||||
|
|
||||||
|
### Run
|
||||||
|
|
||||||
|
```bash
|
||||||
|
java -jar ./target/unicentaopos.jar
|
||||||
|
```
|
||||||
|
|
||||||
|
### Platform Support
|
||||||
|
|
||||||
|
- ✅ Windows
|
||||||
|
- ✅ Linux
|
||||||
|
- ✅ macOS
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Summary
|
||||||
|
|
||||||
|
**Unicenta oPOS** is a layered, modular Java desktop application with clear separation between:
|
||||||
|
|
||||||
|
1. **Presentation Layer** - Swing/JavaFX UI
|
||||||
|
2. **Service Layer** - Business logic & orchestration
|
||||||
|
3. **Data Access Layer** - DAO pattern for database abstraction
|
||||||
|
4. **Peripheral Integration** - Hardware device drivers
|
||||||
|
5. **Support Layer** - Utilities, logging, plugins
|
||||||
|
|
||||||
|
The architecture supports **multi-database backends**, **multiple POS sales modes** (simple, restaurant), **comprehensive reporting**, and **extensive peripheral device integration**, making it a flexible, enterprise-grade point-of-sale system.
|
||||||
@@ -28,10 +28,12 @@ public class PaymentInfoCash extends PaymentInfo {
|
|||||||
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
|
||||||
@@ -44,6 +46,7 @@ public class PaymentInfoCash extends PaymentInfo {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a new instance of PaymentInfoCash
|
* Creates a new instance of PaymentInfoCash
|
||||||
|
*
|
||||||
* @param dTotal
|
* @param dTotal
|
||||||
* @param dPaid
|
* @param dPaid
|
||||||
* @param dTendered
|
* @param dTendered
|
||||||
@@ -54,9 +57,12 @@ public class PaymentInfoCash extends PaymentInfo {
|
|||||||
this.prePayAmount = prePayAmount;
|
this.prePayAmount = prePayAmount;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Creates a new instance of PaymentInfoCash
|
/**
|
||||||
|
* Creates a new instance of PaymentInfoCash
|
||||||
|
*
|
||||||
* @param dTotal
|
* @param dTotal
|
||||||
* @param dPaid */
|
* @param dPaid
|
||||||
|
*/
|
||||||
public PaymentInfoCash(double dTotal, double dPaid) {
|
public PaymentInfoCash(double dTotal, double dPaid) {
|
||||||
m_dTotal = dTotal;
|
m_dTotal = dTotal;
|
||||||
m_dPaid = dPaid;
|
m_dPaid = dPaid;
|
||||||
@@ -77,10 +83,12 @@ public class PaymentInfoCash extends PaymentInfo {
|
|||||||
public String getName() {
|
public String getName() {
|
||||||
return "cash";
|
return "cash";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public double getTotal() {
|
public double getTotal() {
|
||||||
return m_dTotal;
|
return m_dTotal;
|
||||||
}
|
}
|
||||||
|
|
||||||
// public double getTip() {
|
// public double getTip() {
|
||||||
// return m_dTip;
|
// return m_dTip;
|
||||||
// }
|
// }
|
||||||
@@ -118,9 +126,11 @@ public class PaymentInfoCash extends PaymentInfo {
|
|||||||
public String printTendered() {
|
public String printTendered() {
|
||||||
return Formats.CURRENCY.formatValue(m_dTendered);
|
return Formats.CURRENCY.formatValue(m_dTendered);
|
||||||
}
|
}
|
||||||
|
|
||||||
public String printPaid() {
|
public String printPaid() {
|
||||||
return Formats.CURRENCY.formatValue(m_dPaid);
|
return Formats.CURRENCY.formatValue(m_dPaid);
|
||||||
}
|
}
|
||||||
|
|
||||||
public String printChange() {
|
public String printChange() {
|
||||||
return Formats.CURRENCY.formatValue(m_dPaid - m_dTotal);
|
return Formats.CURRENCY.formatValue(m_dPaid - m_dTotal);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,11 +31,15 @@ public class PaymentInfoCash_original extends PaymentInfo {
|
|||||||
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 dTotal
|
||||||
* @param dPaid */
|
* @param dPaid
|
||||||
|
*/
|
||||||
public PaymentInfoCash_original(double dTotal, double dPaid) {
|
public PaymentInfoCash_original(double dTotal, double dPaid) {
|
||||||
m_dTotal = dTotal;
|
m_dTotal = dTotal;
|
||||||
m_dPaid = dPaid;
|
m_dPaid = dPaid;
|
||||||
@@ -55,13 +59,17 @@ public class PaymentInfoCash_original extends PaymentInfo {
|
|||||||
public String getName() {
|
public String getName() {
|
||||||
return "cash";
|
return "cash";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public double getTotal() {
|
public double getTotal() {
|
||||||
return m_dTotal;
|
return m_dTotal;
|
||||||
}
|
}
|
||||||
/** public double getTip() {
|
|
||||||
return m_dTip;
|
/**
|
||||||
}
|
* public double getTip() {
|
||||||
|
* return m_dTip;
|
||||||
|
* }
|
||||||
|
*
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
@@ -83,9 +91,11 @@ public class PaymentInfoCash_original extends PaymentInfo {
|
|||||||
public String getCardName() {
|
public String getCardName() {
|
||||||
return m_dCardName;
|
return m_dCardName;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String printPaid() {
|
public String printPaid() {
|
||||||
return Formats.CURRENCY.formatValue(m_dPaid);
|
return Formats.CURRENCY.formatValue(m_dPaid);
|
||||||
}
|
}
|
||||||
|
|
||||||
public String printChange() {
|
public String printChange() {
|
||||||
return Formats.CURRENCY.formatValue(m_dPaid - m_dTotal);
|
return Formats.CURRENCY.formatValue(m_dPaid - m_dTotal);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ 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;
|
||||||
@@ -44,6 +45,7 @@ public class PaymentInfoMagcard extends PaymentInfo {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a new instance of PaymentInfoMagcard
|
* Creates a new instance of PaymentInfoMagcard
|
||||||
|
*
|
||||||
* @param sHolderName
|
* @param sHolderName
|
||||||
* @param sCardNumber
|
* @param sCardNumber
|
||||||
* @param sExpirationDate
|
* @param sExpirationDate
|
||||||
@@ -69,7 +71,6 @@ public class PaymentInfoMagcard extends PaymentInfo {
|
|||||||
m_sTransactionID = sTransactionID;
|
m_sTransactionID = sTransactionID;
|
||||||
m_dTotal = dTotal;
|
m_dTotal = dTotal;
|
||||||
|
|
||||||
|
|
||||||
m_sAuthorization = null;
|
m_sAuthorization = null;
|
||||||
m_sErrorMessage = null;
|
m_sErrorMessage = null;
|
||||||
m_sReturnMessage = null;
|
m_sReturnMessage = null;
|
||||||
@@ -77,6 +78,7 @@ public class PaymentInfoMagcard extends PaymentInfo {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a new instance of PaymentInfoMagcard
|
* Creates a new instance of PaymentInfoMagcard
|
||||||
|
*
|
||||||
* @param sHolderName
|
* @param sHolderName
|
||||||
* @param sCardNumber
|
* @param sCardNumber
|
||||||
* @param sExpirationDate
|
* @param sExpirationDate
|
||||||
@@ -156,7 +158,8 @@ public class PaymentInfoMagcard extends PaymentInfo {
|
|||||||
return encryptionKey;
|
return encryptionKey;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** @param sCardNumber
|
/**
|
||||||
|
* @param sCardNumber
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String getCardType(String sCardNumber) {
|
public String getCardType(String sCardNumber) {
|
||||||
@@ -251,7 +254,6 @@ public class PaymentInfoMagcard extends PaymentInfo {
|
|||||||
throw new UnsupportedOperationException("Not supported yet.");
|
throw new UnsupportedOperationException("Not supported yet.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public void setIsProcessed(boolean value) {
|
public void setIsProcessed(boolean value) {
|
||||||
throw new UnsupportedOperationException("Not supported yet.");
|
throw new UnsupportedOperationException("Not supported yet.");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ import com.alee.extended.time.WebClock;
|
|||||||
import com.alee.managers.notification.NotificationIcon;
|
import com.alee.managers.notification.NotificationIcon;
|
||||||
import com.alee.managers.notification.NotificationManager;
|
import com.alee.managers.notification.NotificationManager;
|
||||||
import com.alee.managers.notification.WebNotification;
|
import com.alee.managers.notification.WebNotification;
|
||||||
|
import com.google.gson.Gson;
|
||||||
import com.unicenta.basic.BasicException;
|
import com.unicenta.basic.BasicException;
|
||||||
import com.unicenta.beans.JNumberPop;
|
import com.unicenta.beans.JNumberPop;
|
||||||
import com.unicenta.data.gui.ComboBoxValModel;
|
import com.unicenta.data.gui.ComboBoxValModel;
|
||||||
@@ -74,7 +75,6 @@ import java.util.*;
|
|||||||
|
|
||||||
import static java.awt.Window.getWindows;
|
import static java.awt.Window.getWindows;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author JG uniCenta
|
* @author JG uniCenta
|
||||||
*/
|
*/
|
||||||
@@ -155,7 +155,6 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
|||||||
private Integer oCount = 0;
|
private Integer oCount = 0;
|
||||||
private Boolean pinOK;
|
private Boolean pinOK;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates new form JTicketView
|
* Creates new form JTicketView
|
||||||
*/
|
*/
|
||||||
@@ -182,8 +181,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
|||||||
dlCustomers = (DataLogicCustomers) m_App.getBean("com.unicenta.pos.customers.DataLogicCustomers");
|
dlCustomers = (DataLogicCustomers) m_App.getBean("com.unicenta.pos.customers.DataLogicCustomers");
|
||||||
dlReceipts = (DataLogicReceipts) app.getBean("com.unicenta.pos.sales.DataLogicReceipts");
|
dlReceipts = (DataLogicReceipts) app.getBean("com.unicenta.pos.sales.DataLogicReceipts");
|
||||||
|
|
||||||
|
/*
|
||||||
/* uniCenta Feb 2018
|
* uniCenta Feb 2018
|
||||||
* Changed for 4.3
|
* Changed for 4.3
|
||||||
* Set up main toolbar area with two rows to add cater for additional scripts
|
* Set up main toolbar area with two rows to add cater for additional scripts
|
||||||
* else over-crowding and some dynamic buttons off screen/not visible
|
* else over-crowding and some dynamic buttons off screen/not visible
|
||||||
@@ -191,7 +190,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
|||||||
* Resources>Menu.Root
|
* Resources>Menu.Root
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// Set Configuration>General>Tickets toolbar simple : standard : restaurant option
|
// Set Configuration>General>Tickets toolbar simple : standard : restaurant
|
||||||
|
// option
|
||||||
m_ticketsbag = getJTicketsBag();
|
m_ticketsbag = getJTicketsBag();
|
||||||
m_jPanelBag.add(m_ticketsbag.getBagComponent(), BorderLayout.LINE_START);
|
m_jPanelBag.add(m_ticketsbag.getBagComponent(), BorderLayout.LINE_START);
|
||||||
add(m_ticketsbag.getNullComponent(), "null");
|
add(m_ticketsbag.getNullComponent(), "null");
|
||||||
@@ -327,7 +327,6 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -818,10 +817,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
|||||||
|
|
||||||
// if (m_App.getProperties().getProperty("override.check").equals("true")) {
|
// if (m_App.getProperties().getProperty("override.check").equals("true")) {
|
||||||
if (!m_oTicket.getLine(i).getUpdated()) {
|
if (!m_oTicket.getLine(i).getUpdated()) {
|
||||||
JOptionPane.showMessageDialog(this
|
JOptionPane.showMessageDialog(this, AppLocal.getIntString("message.deletelinesent"),
|
||||||
, AppLocal.getIntString("message.deletelinesent")
|
AppLocal.getIntString("label.deleteline"), JOptionPane.WARNING_MESSAGE);
|
||||||
, AppLocal.getIntString("label.deleteline")
|
|
||||||
, JOptionPane.WARNING_MESSAGE);
|
|
||||||
} else {
|
} else {
|
||||||
if (executeEventAndRefresh("ticket.removeline", new ScriptArg("index", i)) == null) {
|
if (executeEventAndRefresh("ticket.removeline", new ScriptArg("index", i)) == null) {
|
||||||
String ticketID = Integer.toString(m_oTicket.getTicketId());
|
String ticketID = Integer.toString(m_oTicket.getTicketId());
|
||||||
@@ -835,8 +832,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
|||||||
m_oTicket.getLine(i).getProductID(),
|
m_oTicket.getLine(i).getProductID(),
|
||||||
m_oTicket.getLine(i).getProductName(),
|
m_oTicket.getLine(i).getProductName(),
|
||||||
m_oTicket.getLine(i).getMultiply()
|
m_oTicket.getLine(i).getMultiply()
|
||||||
}
|
});
|
||||||
);
|
|
||||||
|
|
||||||
if (m_oTicket.getLine(i).isProductCom()) {
|
if (m_oTicket.getLine(i).isProductCom()) {
|
||||||
m_oTicket.removeLine(i);
|
m_oTicket.removeLine(i);
|
||||||
@@ -846,8 +842,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
|||||||
|
|
||||||
if (m_App.getAppUserView().getUser().hasPermission("sales.DeleteLines")) {
|
if (m_App.getAppUserView().getUser().hasPermission("sales.DeleteLines")) {
|
||||||
int input = JOptionPane.showConfirmDialog(this,
|
int input = JOptionPane.showConfirmDialog(this,
|
||||||
AppLocal.getIntString("message.deletelineyes")
|
AppLocal.getIntString("message.deletelineyes"), AppLocal.getIntString("label.deleteline"),
|
||||||
, AppLocal.getIntString("label.deleteline"), JOptionPane.YES_NO_OPTION);
|
JOptionPane.YES_NO_OPTION);
|
||||||
|
|
||||||
if (input == 0) {
|
if (input == 0) {
|
||||||
m_oTicket.removeLine(i);
|
m_oTicket.removeLine(i);
|
||||||
@@ -855,8 +851,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
JOptionPane.showMessageDialog(this,
|
JOptionPane.showMessageDialog(this,
|
||||||
AppLocal.getIntString("message.deletelineno")
|
AppLocal.getIntString("message.deletelineno"), AppLocal.getIntString("label.deleteline"),
|
||||||
, AppLocal.getIntString("label.deleteline"), JOptionPane.WARNING_MESSAGE);
|
JOptionPane.WARNING_MESSAGE);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
m_oTicket.removeLine(i);
|
m_oTicket.removeLine(i);
|
||||||
@@ -911,7 +907,6 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
|||||||
return dValue / (1.0 + dTaxRate);
|
return dValue / (1.0 + dTaxRate);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private double getInputValue() {
|
private double getInputValue() {
|
||||||
try {
|
try {
|
||||||
return Double.parseDouble(m_jPrice.getText());
|
return Double.parseDouble(m_jPrice.getText());
|
||||||
@@ -1073,9 +1068,9 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
|||||||
} else if (sCode.startsWith(";")) {
|
} else if (sCode.startsWith(";")) {
|
||||||
stateToZero();
|
stateToZero();
|
||||||
|
|
||||||
|
|
||||||
// START OF BARCODE PARSING
|
// START OF BARCODE PARSING
|
||||||
/* This block is deliberately verbose and is base for future scanner handling
|
/*
|
||||||
|
* This block is deliberately verbose and is base for future scanner handling
|
||||||
* Some scanners inject a CR+LF... some don't...
|
* Some scanners inject a CR+LF... some don't...
|
||||||
* stateTransition() must allow for this as these add characters to .length()
|
* stateTransition() must allow for this as these add characters to .length()
|
||||||
* First 3 digits are GS1 CountryCode OR Retailer internal use
|
* First 3 digits are GS1 CountryCode OR Retailer internal use
|
||||||
@@ -1169,8 +1164,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
|||||||
}
|
}
|
||||||
|
|
||||||
TaxInfo tax = taxeslogic // get the TaxRate for the product
|
TaxInfo tax = taxeslogic // get the TaxRate for the product
|
||||||
.getTaxInfo(oProduct.getTaxCategoryID()
|
.getTaxInfo(oProduct.getTaxCategoryID(), m_oTicket.getCustomer()); // calculate if ticket has a
|
||||||
, m_oTicket.getCustomer()); // calculate if ticket has a Customer
|
// Customer
|
||||||
|
|
||||||
switch (sVariableTypePrefix) {
|
switch (sVariableTypePrefix) {
|
||||||
// PRICE - Assign var's
|
// PRICE - Assign var's
|
||||||
@@ -1179,32 +1174,28 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
|||||||
/ (1.0 + tax.getRate()); // selling price with tax
|
/ (1.0 + tax.getRate()); // selling price with tax
|
||||||
dUnits = (Double.parseDouble(sVariableNum)
|
dUnits = (Double.parseDouble(sVariableNum)
|
||||||
/ 100) / oProduct.getPriceSellTax(tax); // Units as proportion of selling price
|
/ 100) / oProduct.getPriceSellTax(tax); // Units as proportion of selling price
|
||||||
oProduct.setProperty("product.price"
|
oProduct.setProperty("product.price", Double.toString(oProduct.getPriceSell())); // push to screen
|
||||||
, Double.toString(oProduct.getPriceSell())); // push to screen
|
|
||||||
break;
|
break;
|
||||||
case "20": // as above
|
case "20": // as above
|
||||||
dPriceSell = oProduct.getPriceSellTax(tax)
|
dPriceSell = oProduct.getPriceSellTax(tax)
|
||||||
/ (1.0 + tax.getRate());
|
/ (1.0 + tax.getRate());
|
||||||
dUnits = (Double.parseDouble(sVariableNum)
|
dUnits = (Double.parseDouble(sVariableNum)
|
||||||
/ 100) / oProduct.getPriceSellTax(tax);
|
/ 100) / oProduct.getPriceSellTax(tax);
|
||||||
oProduct.setProperty("product.price"
|
oProduct.setProperty("product.price", Double.toString(oProduct.getPriceSellTax(tax)));
|
||||||
, Double.toString(oProduct.getPriceSellTax(tax)));
|
|
||||||
break;
|
break;
|
||||||
case "21":
|
case "21":
|
||||||
dPriceSell = oProduct.getPriceSellTax(tax)
|
dPriceSell = oProduct.getPriceSellTax(tax)
|
||||||
/ (1.0 + tax.getRate());
|
/ (1.0 + tax.getRate());
|
||||||
dUnits = (Double.parseDouble(sVariableNum)
|
dUnits = (Double.parseDouble(sVariableNum)
|
||||||
/ 10) / oProduct.getPriceSellTax(tax);
|
/ 10) / oProduct.getPriceSellTax(tax);
|
||||||
oProduct.setProperty("product.price"
|
oProduct.setProperty("product.price", Double.toString(oProduct.getPriceSell()));
|
||||||
, Double.toString(oProduct.getPriceSell()));
|
|
||||||
break;
|
break;
|
||||||
case "22":
|
case "22":
|
||||||
dPriceSell = oProduct.getPriceSellTax(tax)
|
dPriceSell = oProduct.getPriceSellTax(tax)
|
||||||
/ (1.0 + tax.getRate());
|
/ (1.0 + tax.getRate());
|
||||||
dUnits = (Double.parseDouble(sVariableNum)
|
dUnits = (Double.parseDouble(sVariableNum)
|
||||||
/ 1) / oProduct.getPriceSellTax(tax);
|
/ 1) / oProduct.getPriceSellTax(tax);
|
||||||
oProduct.setProperty("product.price"
|
oProduct.setProperty("product.price", Double.toString(oProduct.getPriceSell()));
|
||||||
, Double.toString(oProduct.getPriceSell()));
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
// WEIGHT - Assign variable to Unit
|
// WEIGHT - Assign variable to Unit
|
||||||
@@ -1212,28 +1203,22 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
|||||||
weight = Double.parseDouble(sVariableNum)
|
weight = Double.parseDouble(sVariableNum)
|
||||||
/ 1000; // 3 decimals = 01.049 kg
|
/ 1000; // 3 decimals = 01.049 kg
|
||||||
dUnits = weight; // which represents 1gramme Units
|
dUnits = weight; // which represents 1gramme Units
|
||||||
oProduct.setProperty("product.weight"
|
oProduct.setProperty("product.weight", Double.toString(weight));
|
||||||
, Double.toString(weight));
|
oProduct.setProperty("product.price", Double.toString(dPriceSell));
|
||||||
oProduct.setProperty("product.price"
|
|
||||||
, Double.toString(dPriceSell));
|
|
||||||
break;
|
break;
|
||||||
case "24":
|
case "24":
|
||||||
weight = Double.parseDouble(sVariableNum)
|
weight = Double.parseDouble(sVariableNum)
|
||||||
/ 100; // 2 decimals = 010.49 kg
|
/ 100; // 2 decimals = 010.49 kg
|
||||||
dUnits = weight; // which represents 10gramme Units
|
dUnits = weight; // which represents 10gramme Units
|
||||||
oProduct.setProperty("product.weight"
|
oProduct.setProperty("product.weight", Double.toString(weight));
|
||||||
, Double.toString(weight));
|
oProduct.setProperty("product.price", Double.toString(dPriceSell));
|
||||||
oProduct.setProperty("product.price"
|
|
||||||
, Double.toString(dPriceSell));
|
|
||||||
break;
|
break;
|
||||||
case "25":
|
case "25":
|
||||||
weight = Double.parseDouble(sVariableNum)
|
weight = Double.parseDouble(sVariableNum)
|
||||||
/ 10; // 1 decimal = 0104.9 kg
|
/ 10; // 1 decimal = 0104.9 kg
|
||||||
dUnits = weight; // which represents 100gramme Units
|
dUnits = weight; // which represents 100gramme Units
|
||||||
oProduct.setProperty("product.weight"
|
oProduct.setProperty("product.weight", Double.toString(weight));
|
||||||
, Double.toString(weight));
|
oProduct.setProperty("product.price", Double.toString(dPriceSell));
|
||||||
oProduct.setProperty("product.price"
|
|
||||||
, Double.toString(dPriceSell));
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -1241,27 +1226,25 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
|||||||
* Use this section to add more case statements but these are not mandatory
|
* Use this section to add more case statements but these are not mandatory
|
||||||
* If you have your own internal or other barcode schema then...
|
* If you have your own internal or other barcode schema then...
|
||||||
* Example:
|
* Example:
|
||||||
case "28":
|
* case "28":
|
||||||
{
|
* {
|
||||||
// price has tax. Remove it from sPriceSell
|
* // price has tax. Remove it from sPriceSell
|
||||||
TaxInfo tax = taxeslogic.getTaxInfo(oProduct.getTaxCategoryID(), m_oTicket.getCustomer());
|
* TaxInfo tax = taxeslogic.getTaxInfo(oProduct.getTaxCategoryID(),
|
||||||
dPriceSell /= (1.0 + tax.getRate());
|
* m_oTicket.getCustomer());
|
||||||
oProduct.setProperty("product.price", Double.toString(dPriceSell));
|
* dPriceSell /= (1.0 + tax.getRate());
|
||||||
weight = -1.0;
|
* oProduct.setProperty("product.price", Double.toString(dPriceSell));
|
||||||
break;
|
* weight = -1.0;
|
||||||
|
* break;
|
||||||
*/
|
*/
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (m_jaddtax.isSelected()) {
|
if (m_jaddtax.isSelected()) {
|
||||||
addTicketLine(oProduct
|
addTicketLine(oProduct, dUnits // weight
|
||||||
, dUnits //weight
|
|
||||||
, dPriceSell = oProduct.getPriceSellTax(tax));
|
, dPriceSell = oProduct.getPriceSellTax(tax));
|
||||||
} else {
|
} else {
|
||||||
addTicketLine(oProduct
|
addTicketLine(oProduct, dUnits, dPriceSell);
|
||||||
, dUnits
|
|
||||||
, dPriceSell);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (BasicException eData) {
|
} catch (BasicException eData) {
|
||||||
@@ -1270,14 +1253,15 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
|||||||
}
|
}
|
||||||
|
|
||||||
// UPC-A
|
// UPC-A
|
||||||
/* Note: if begins 02 then its a standard
|
/*
|
||||||
// UPC-A max value limitation is 4 digit price
|
* Note: if begins 02 then its a standard
|
||||||
// UPC-A Extended uses State digit to give 5 digit price
|
* // UPC-A max value limitation is 4 digit price
|
||||||
// uniCenta oPOS does not support UPC-A Extended at this time
|
* // UPC-A Extended uses State digit to give 5 digit price
|
||||||
// Identifier Prod State Cost CheckCode
|
* // uniCenta oPOS does not support UPC-A Extended at this time
|
||||||
// I PPPPP S CCCC K
|
* // Identifier Prod State Cost CheckCode
|
||||||
// 1 23456 7 8901 2
|
* // I PPPPP S CCCC K
|
||||||
|
* // 1 23456 7 8901 2
|
||||||
|
*
|
||||||
* 0 = Standard UPC number (must have a zero to do zero-suppressed numbers)
|
* 0 = Standard UPC number (must have a zero to do zero-suppressed numbers)
|
||||||
* 1 = Reserved
|
* 1 = Reserved
|
||||||
* 2 = Random-weight items (fruits, vegetables, meats, etc.)
|
* 2 = Random-weight items (fruits, vegetables, meats, etc.)
|
||||||
@@ -1295,8 +1279,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
|||||||
&& (sCode.length() == 12)) {
|
&& (sCode.length() == 12)) {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
ProductInfoExt oProduct
|
ProductInfoExt oProduct = dlSales.getProductInfoByUShortCode(sCode); // Return only UPC product
|
||||||
= dlSales.getProductInfoByUShortCode(sCode); // Return only UPC product
|
|
||||||
|
|
||||||
if (oProduct == null) {
|
if (oProduct == null) {
|
||||||
Toolkit.getDefaultToolkit().beep();
|
Toolkit.getDefaultToolkit().beep();
|
||||||
@@ -1313,8 +1296,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
|||||||
String sVariableNum = sCode.substring(7, 11); // grab the value from the code only using 4 digit price
|
String sVariableNum = sCode.substring(7, 11); // grab the value from the code only using 4 digit price
|
||||||
|
|
||||||
TaxInfo tax = taxeslogic // get the TaxRate for the product
|
TaxInfo tax = taxeslogic // get the TaxRate for the product
|
||||||
.getTaxInfo(oProduct.getTaxCategoryID()
|
.getTaxInfo(oProduct.getTaxCategoryID(), m_oTicket.getCustomer());
|
||||||
, m_oTicket.getCustomer());
|
|
||||||
|
|
||||||
if (oProduct.getPriceSell() != 0.0) { // we have a weight barcode
|
if (oProduct.getPriceSell() != 0.0) { // we have a weight barcode
|
||||||
weight = Double.parseDouble(sVariableNum) / 100; // 2 decimals (e.g. 10.49 kg)
|
weight = Double.parseDouble(sVariableNum) / 100; // 2 decimals (e.g. 10.49 kg)
|
||||||
@@ -1336,13 +1318,9 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (m_jaddtax.isSelected()) {
|
if (m_jaddtax.isSelected()) {
|
||||||
addTicketLine(oProduct
|
addTicketLine(oProduct, dUnits, dPriceSell);
|
||||||
, dUnits
|
|
||||||
, dPriceSell);
|
|
||||||
} else {
|
} else {
|
||||||
addTicketLine(oProduct
|
addTicketLine(oProduct, dUnits, dPriceSell / (1.0 + tax.getRate()));
|
||||||
, dUnits
|
|
||||||
, dPriceSell / (1.0 + tax.getRate()));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (BasicException eData) {
|
} catch (BasicException eData) {
|
||||||
@@ -1395,7 +1373,6 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
|||||||
m_jPrice.setText(setTempjPrice(m_jPrice.getText() + cTrans));
|
m_jPrice.setText(setTempjPrice(m_jPrice.getText() + cTrans));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
} else if (cTrans == '.'
|
} else if (cTrans == '.'
|
||||||
&& m_iNumberStatus == NUMBER_INPUTZERO && !priceWith00) {
|
&& m_iNumberStatus == NUMBER_INPUTZERO && !priceWith00) {
|
||||||
m_jPrice.setText("0.");
|
m_jPrice.setText("0.");
|
||||||
@@ -1785,7 +1762,6 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private Window getActiveWindow() {
|
private Window getActiveWindow() {
|
||||||
for (Window window : getWindows()) {
|
for (Window window : getWindows()) {
|
||||||
if (window instanceof JRootFrame) {
|
if (window instanceof JRootFrame) {
|
||||||
@@ -1849,17 +1825,20 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
|||||||
m_config.setLastTicket(lastTicketNumber, lastTicketType);
|
m_config.setLastTicket(lastTicketNumber, lastTicketType);
|
||||||
|
|
||||||
} catch (BasicException eData) {
|
} catch (BasicException eData) {
|
||||||
MessageInf msg = new MessageInf(MessageInf.SGN_NOTICE, AppLocal.getIntString("message.nosaveticket"), eData);
|
MessageInf msg = new MessageInf(MessageInf.SGN_NOTICE, AppLocal.getIntString("message.nosaveticket"),
|
||||||
|
eData);
|
||||||
msg.show(this);
|
msg.show(this);
|
||||||
} catch (IOException ex) {
|
} catch (IOException ex) {
|
||||||
log.error(ex.getMessage());
|
log.error(ex.getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (m_config.getProperty("till.digital-receipt") != null && m_config.getProperty("till.digital-receipt").equals("true")){
|
if (m_config.getProperty("till.digital-receipt") != null
|
||||||
|
&& m_config.getProperty("till.digital-receipt").equals("true")) {
|
||||||
log.debug("Send digital receipt");
|
log.debug("Send digital receipt");
|
||||||
String xml = dlSystem.getResourceAsXML("Printer.Ticket");
|
String xml = dlSystem.getResourceAsXML("Printer.Ticket");
|
||||||
new Application().sendReceipt(ticket, xml, getActiveWindow());
|
new Application().sendReceipt(ticket, xml, getActiveWindow());
|
||||||
}
|
}
|
||||||
|
log.info(new Gson().toJson(ticket));
|
||||||
|
|
||||||
executeEvent(ticket, ticketext, "ticket.close",
|
executeEvent(ticket, ticketext, "ticket.close",
|
||||||
new ScriptArg("print", paymentdialog.isPrintSelected()));
|
new ScriptArg("print", paymentdialog.isPrintSelected()));
|
||||||
@@ -1873,7 +1852,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
|||||||
|
|
||||||
if ("restaurant".equals(m_App.getProperties()
|
if ("restaurant".equals(m_App.getProperties()
|
||||||
.getProperty("machine.ticketsbag")) && !ticket.getOldTicket()) {
|
.getProperty("machine.ticketsbag")) && !ticket.getOldTicket()) {
|
||||||
/* Deliberately Explicit to allow for reassignments - future
|
/*
|
||||||
|
* Deliberately Explicit to allow for reassignments - future
|
||||||
* even though we could do a single SQL statment sweep for reset
|
* even though we could do a single SQL statment sweep for reset
|
||||||
*/
|
*/
|
||||||
restDB.clearCustomerNameInTable(ticketext.toString());
|
restDB.clearCustomerNameInTable(ticketext.toString());
|
||||||
@@ -1932,7 +1912,6 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
|||||||
return (tmpPickupId);
|
return (tmpPickupId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private void printTicket(String sresourcename, TicketInfo ticket, Object ticketext) {
|
private void printTicket(String sresourcename, TicketInfo ticket, Object ticketext) {
|
||||||
|
|
||||||
String sresource = dlSystem.getResourceAsXML(sresourcename);
|
String sresource = dlSystem.getResourceAsXML(sresourcename);
|
||||||
@@ -2032,7 +2011,6 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
Map reportparams = new HashMap();
|
Map reportparams = new HashMap();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -2045,7 +2023,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
|||||||
reportfields.put("TICKET", ticket);
|
reportfields.put("TICKET", ticket);
|
||||||
reportfields.put("PLACE", ticketext);
|
reportfields.put("PLACE", ticketext);
|
||||||
|
|
||||||
JasperPrint jp = JasperFillManager.fillReport(jr, reportparams, new JRMapArrayDataSource(new Object[]{reportfields}));
|
JasperPrint jp = JasperFillManager.fillReport(jr, reportparams,
|
||||||
|
new JRMapArrayDataSource(new Object[] { reportfields }));
|
||||||
|
|
||||||
PrintService service = ReportUtils.getPrintService(m_App.getProperties().getProperty("machine.printername"));
|
PrintService service = ReportUtils.getPrintService(m_App.getProperties().getProperty("machine.printername"));
|
||||||
|
|
||||||
@@ -2124,7 +2103,6 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private Object executeEvent(TicketInfo ticket, Object ticketext, String eventkey, ScriptArg... args) {
|
private Object executeEvent(TicketInfo ticket, Object ticketext, String eventkey, ScriptArg... args) {
|
||||||
|
|
||||||
String resource = m_jbtnconfig.getEvent(eventkey);
|
String resource = m_jbtnconfig.getEvent(eventkey);
|
||||||
@@ -2263,7 +2241,6 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
|||||||
"<b>" + AppLocal.getIntString("label.vip") + " : " + "</b>" + vip + "<br>" +
|
"<b>" + AppLocal.getIntString("label.vip") + " : " + "</b>" + vip + "<br>" +
|
||||||
"<b>" + AppLocal.getIntString("label.discount") + " : " + "</b>" + discount + "<br>";
|
"<b>" + AppLocal.getIntString("label.discount") + " : " + "</b>" + discount + "<br>";
|
||||||
|
|
||||||
|
|
||||||
JFrame frame = new JFrame();
|
JFrame frame = new JFrame();
|
||||||
JOptionPane.showMessageDialog(frame,
|
JOptionPane.showMessageDialog(frame,
|
||||||
content,
|
content,
|
||||||
@@ -2367,14 +2344,14 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This method is called from within the constructor to
|
* This method is called from within the constructor to
|
||||||
* initialize the form.
|
* initialize the form.
|
||||||
* WARNING: Do NOT modify this code. The content of this method is
|
* WARNING: Do NOT modify this code. The content of this method is
|
||||||
* always regenerated by the FormEditor.
|
* always regenerated by the FormEditor.
|
||||||
*/
|
*/
|
||||||
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
|
// <editor-fold defaultstate="collapsed" desc="Generated
|
||||||
|
// Code">//GEN-BEGIN:initComponents
|
||||||
private void initComponents() {
|
private void initComponents() {
|
||||||
|
|
||||||
m_jPanContainer = new javax.swing.JPanel();
|
m_jPanContainer = new javax.swing.JPanel();
|
||||||
@@ -2401,7 +2378,8 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
|||||||
jCheckStock = new javax.swing.JButton();
|
jCheckStock = new javax.swing.JButton();
|
||||||
m_jPanelCentral = new javax.swing.JPanel();
|
m_jPanelCentral = new javax.swing.JPanel();
|
||||||
jPanel4 = new javax.swing.JPanel();
|
jPanel4 = new javax.swing.JPanel();
|
||||||
filler2 = new javax.swing.Box.Filler(new java.awt.Dimension(5, 0), new java.awt.Dimension(5, 0), new java.awt.Dimension(5, 32767));
|
filler2 = new javax.swing.Box.Filler(new java.awt.Dimension(5, 0), new java.awt.Dimension(5, 0),
|
||||||
|
new java.awt.Dimension(5, 32767));
|
||||||
m_jTicketId = new javax.swing.JLabel();
|
m_jTicketId = new javax.swing.JLabel();
|
||||||
m_jPanTotals = new javax.swing.JPanel();
|
m_jPanTotals = new javax.swing.JPanel();
|
||||||
m_jLblTotalEuros3 = new javax.swing.JLabel();
|
m_jLblTotalEuros3 = new javax.swing.JLabel();
|
||||||
@@ -2546,26 +2524,32 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
|||||||
m_jButtonsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
m_jButtonsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||||
.addGroup(m_jButtonsLayout.createSequentialGroup()
|
.addGroup(m_jButtonsLayout.createSequentialGroup()
|
||||||
.addContainerGap()
|
.addContainerGap()
|
||||||
.addComponent(jBtnCustomer, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
.addComponent(jBtnCustomer, javax.swing.GroupLayout.PREFERRED_SIZE,
|
||||||
|
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||||
.addComponent(btnSplit, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
.addComponent(btnSplit, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
|
||||||
|
javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||||
.addComponent(j_btnRemotePrt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
.addComponent(j_btnRemotePrt, javax.swing.GroupLayout.PREFERRED_SIZE,
|
||||||
|
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||||
.addComponent(btnReprint1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
.addComponent(btnReprint1, 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(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)));
|
||||||
m_jButtonsLayout.setVerticalGroup(
|
m_jButtonsLayout.setVerticalGroup(
|
||||||
m_jButtonsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
m_jButtonsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||||
.addGroup(m_jButtonsLayout.createSequentialGroup()
|
.addGroup(m_jButtonsLayout.createSequentialGroup()
|
||||||
.addGap(5, 5, 5)
|
.addGap(5, 5, 5)
|
||||||
.addGroup(m_jButtonsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
|
.addGroup(m_jButtonsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
|
||||||
.addComponent(j_btnRemotePrt, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
.addComponent(j_btnRemotePrt, javax.swing.GroupLayout.DEFAULT_SIZE,
|
||||||
.addComponent(btnSplit, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||||
.addComponent(btnReprint1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
.addComponent(btnSplit, javax.swing.GroupLayout.Alignment.TRAILING,
|
||||||
.addComponent(jBtnCustomer, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
|
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||||
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
|
.addComponent(btnReprint1, javax.swing.GroupLayout.Alignment.TRAILING,
|
||||||
);
|
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||||
|
.addComponent(jBtnCustomer, javax.swing.GroupLayout.DEFAULT_SIZE,
|
||||||
|
javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
|
||||||
|
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)));
|
||||||
|
|
||||||
m_jPanelBag.add(m_jButtons);
|
m_jPanelBag.add(m_jButtons);
|
||||||
|
|
||||||
@@ -2808,7 +2792,9 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
|||||||
m_jPrice.setFont(new java.awt.Font("Arial", 1, 16)); // NOI18N
|
m_jPrice.setFont(new java.awt.Font("Arial", 1, 16)); // NOI18N
|
||||||
m_jPrice.setForeground(new java.awt.Color(76, 197, 237));
|
m_jPrice.setForeground(new java.awt.Color(76, 197, 237));
|
||||||
m_jPrice.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
|
m_jPrice.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
|
||||||
m_jPrice.setBorder(javax.swing.BorderFactory.createCompoundBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(76, 197, 237)), javax.swing.BorderFactory.createEmptyBorder(1, 4, 1, 4)));
|
m_jPrice.setBorder(javax.swing.BorderFactory.createCompoundBorder(
|
||||||
|
javax.swing.BorderFactory.createLineBorder(new java.awt.Color(76, 197, 237)),
|
||||||
|
javax.swing.BorderFactory.createEmptyBorder(1, 4, 1, 4)));
|
||||||
m_jPrice.setOpaque(true);
|
m_jPrice.setOpaque(true);
|
||||||
m_jPrice.setPreferredSize(new java.awt.Dimension(100, 25));
|
m_jPrice.setPreferredSize(new java.awt.Dimension(100, 25));
|
||||||
m_jPrice.setRequestFocusEnabled(false);
|
m_jPrice.setRequestFocusEnabled(false);
|
||||||
@@ -2858,36 +2844,46 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
|||||||
.addGroup(jPanel9Layout.createSequentialGroup()
|
.addGroup(jPanel9Layout.createSequentialGroup()
|
||||||
.addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
|
.addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
|
||||||
.addComponent(m_jPor)
|
.addComponent(m_jPor)
|
||||||
.addComponent(m_jKeyFactory, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
|
.addComponent(m_jKeyFactory, javax.swing.GroupLayout.DEFAULT_SIZE,
|
||||||
|
javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
|
||||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 7, Short.MAX_VALUE)
|
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 7, Short.MAX_VALUE)
|
||||||
.addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
.addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||||
.addGroup(jPanel9Layout.createSequentialGroup()
|
.addGroup(jPanel9Layout.createSequentialGroup()
|
||||||
.addComponent(m_jaddtax, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
.addComponent(m_jaddtax, javax.swing.GroupLayout.DEFAULT_SIZE,
|
||||||
|
javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||||
.addGap(7, 7, 7)
|
.addGap(7, 7, 7)
|
||||||
.addComponent(m_jTax, javax.swing.GroupLayout.PREFERRED_SIZE, 128, javax.swing.GroupLayout.PREFERRED_SIZE)
|
.addComponent(m_jTax, javax.swing.GroupLayout.PREFERRED_SIZE, 128,
|
||||||
|
javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED))
|
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED))
|
||||||
.addGroup(jPanel9Layout.createSequentialGroup()
|
.addGroup(jPanel9Layout.createSequentialGroup()
|
||||||
.addComponent(m_jPrice, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
.addComponent(m_jPrice, javax.swing.GroupLayout.DEFAULT_SIZE,
|
||||||
|
javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||||
.addGap(5, 5, 5)))
|
.addGap(5, 5, 5)))
|
||||||
.addComponent(m_jEnter, javax.swing.GroupLayout.PREFERRED_SIZE, 71, javax.swing.GroupLayout.PREFERRED_SIZE)
|
.addComponent(m_jEnter, javax.swing.GroupLayout.PREFERRED_SIZE, 71,
|
||||||
.addContainerGap())
|
javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
);
|
.addContainerGap()));
|
||||||
jPanel9Layout.setVerticalGroup(
|
jPanel9Layout.setVerticalGroup(
|
||||||
jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||||
.addGroup(jPanel9Layout.createSequentialGroup()
|
.addGroup(jPanel9Layout.createSequentialGroup()
|
||||||
.addComponent(m_jEnter, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
.addComponent(m_jEnter, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
|
||||||
|
javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
.addGap(0, 0, Short.MAX_VALUE))
|
.addGap(0, 0, Short.MAX_VALUE))
|
||||||
.addGroup(jPanel9Layout.createSequentialGroup()
|
.addGroup(jPanel9Layout.createSequentialGroup()
|
||||||
.addComponent(m_jPrice, javax.swing.GroupLayout.PREFERRED_SIZE, 44, javax.swing.GroupLayout.PREFERRED_SIZE)
|
.addComponent(m_jPrice, javax.swing.GroupLayout.PREFERRED_SIZE, 44,
|
||||||
|
javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 7, Short.MAX_VALUE)
|
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 7, Short.MAX_VALUE)
|
||||||
.addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
.addGroup(jPanel9Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||||
.addComponent(m_jTax, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE)
|
.addComponent(m_jTax, javax.swing.GroupLayout.Alignment.TRAILING,
|
||||||
.addComponent(m_jaddtax, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
|
javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||||
|
.addComponent(m_jaddtax, javax.swing.GroupLayout.Alignment.TRAILING,
|
||||||
|
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
|
||||||
|
javax.swing.GroupLayout.PREFERRED_SIZE)))
|
||||||
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel9Layout.createSequentialGroup()
|
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel9Layout.createSequentialGroup()
|
||||||
.addComponent(m_jPor)
|
.addComponent(m_jPor)
|
||||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED,
|
||||||
.addComponent(m_jKeyFactory, javax.swing.GroupLayout.PREFERRED_SIZE, 1, javax.swing.GroupLayout.PREFERRED_SIZE))
|
javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||||
);
|
.addComponent(m_jKeyFactory, javax.swing.GroupLayout.PREFERRED_SIZE, 1,
|
||||||
|
javax.swing.GroupLayout.PREFERRED_SIZE)));
|
||||||
|
|
||||||
m_jPanEntries.add(jPanel9);
|
m_jPanEntries.add(jPanel9);
|
||||||
|
|
||||||
@@ -3298,8 +3294,7 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
|||||||
CustomerInfoExt m_customerInfo = dialog.getSelectedCustomer();
|
CustomerInfoExt m_customerInfo = dialog.getSelectedCustomer();
|
||||||
if (dialog.getSelectedCustomer() != null) {
|
if (dialog.getSelectedCustomer() != null) {
|
||||||
try {
|
try {
|
||||||
m_oTicket.setCustomer(dlSales.loadCustomerExt
|
m_oTicket.setCustomer(dlSales.loadCustomerExt(dialog.getSelectedCustomer().getId()));
|
||||||
(dialog.getSelectedCustomer().getId()));
|
|
||||||
} catch (BasicException ex) {
|
} catch (BasicException ex) {
|
||||||
log.error(ex.getMessage());
|
log.error(ex.getMessage());
|
||||||
}
|
}
|
||||||
@@ -3317,11 +3312,10 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
|||||||
|
|
||||||
if (finder.getSelectedCustomer() != null) {
|
if (finder.getSelectedCustomer() != null) {
|
||||||
try {
|
try {
|
||||||
m_oTicket.setCustomer(dlSales.loadCustomerExt
|
m_oTicket.setCustomer(dlSales.loadCustomerExt(finder.getSelectedCustomer().getId()));
|
||||||
(finder.getSelectedCustomer().getId()));
|
|
||||||
if ("restaurant".equals(m_App.getProperties().getProperty("machine.ticketsbag"))) {
|
if ("restaurant".equals(m_App.getProperties().getProperty("machine.ticketsbag"))) {
|
||||||
restDB.setCustomerNameInTableByTicketId(dlSales.loadCustomerExt
|
restDB.setCustomerNameInTableByTicketId(
|
||||||
(finder.getSelectedCustomer().getId()).toString(), m_oTicket.getId());
|
dlSales.loadCustomerExt(finder.getSelectedCustomer().getId()).toString(), m_oTicket.getId());
|
||||||
}
|
}
|
||||||
|
|
||||||
checkCustomer();
|
checkCustomer();
|
||||||
@@ -3352,11 +3346,10 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
|||||||
|
|
||||||
if (finder.getSelectedCustomer() != null) {
|
if (finder.getSelectedCustomer() != null) {
|
||||||
try {
|
try {
|
||||||
m_oTicket.setCustomer(dlSales.loadCustomerExt
|
m_oTicket.setCustomer(dlSales.loadCustomerExt(finder.getSelectedCustomer().getId()));
|
||||||
(finder.getSelectedCustomer().getId()));
|
|
||||||
if ("restaurant".equals(m_App.getProperties().getProperty("machine.ticketsbag"))) {
|
if ("restaurant".equals(m_App.getProperties().getProperty("machine.ticketsbag"))) {
|
||||||
restDB.setCustomerNameInTableByTicketId(dlSales.loadCustomerExt
|
restDB.setCustomerNameInTableByTicketId(
|
||||||
(finder.getSelectedCustomer().getId()).toString(), m_oTicket.getId());
|
dlSales.loadCustomerExt(finder.getSelectedCustomer().getId()).toString(), m_oTicket.getId());
|
||||||
}
|
}
|
||||||
|
|
||||||
checkCustomer();
|
checkCustomer();
|
||||||
@@ -3432,9 +3425,10 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
|||||||
private javax.swing.JButton m_jbtnScale;
|
private javax.swing.JButton m_jbtnScale;
|
||||||
// End of variables declaration//GEN-END:variables
|
// End of variables declaration//GEN-END:variables
|
||||||
|
|
||||||
/* Remote Orders Display
|
/*
|
||||||
We only know about uniCenta oPOS orders and won't try and handle any
|
* Remote Orders Display
|
||||||
that are injected from an external source
|
* We only know about uniCenta oPOS orders and won't try and handle any
|
||||||
|
* that are injected from an external source
|
||||||
*/
|
*/
|
||||||
|
|
||||||
public void remoteOrderDisplay() {
|
public void remoteOrderDisplay() {
|
||||||
@@ -3492,29 +3486,23 @@ public abstract class JPanelTicket extends JPanel implements JPanelView, BeanFac
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
dlSystem.addOrder(getPickupString(m_oTicket)
|
dlSystem.addOrder(getPickupString(m_oTicket), (int) m_oTicket.getLine(i).getMultiply(),
|
||||||
, (int) m_oTicket.getLine(i).getMultiply()
|
m_oTicket.getLine(i).getProductName(), m_oTicket.getLine(i).getProductAttSetInstDesc(),
|
||||||
, m_oTicket.getLine(i).getProductName()
|
m_oTicket.getLine(i).getProperty("notes"), id, null, display, null, null);
|
||||||
, m_oTicket.getLine(i).getProductAttSetInstDesc()
|
|
||||||
, m_oTicket.getLine(i).getProperty("notes")
|
|
||||||
, id
|
|
||||||
, null
|
|
||||||
, display
|
|
||||||
, null
|
|
||||||
, null);
|
|
||||||
|
|
||||||
/* this block for future - right now we're deleting all ticketlines
|
/*
|
||||||
and resending for consistency with actual ticketlines
|
* this block for future - right now we're deleting all ticketlines
|
||||||
dlSystem.updateOrder(getPickupString(m_oTicket)
|
* and resending for consistency with actual ticketlines
|
||||||
, (int) m_oTicket.getLine(i).getMultiply()
|
* dlSystem.updateOrder(getPickupString(m_oTicket)
|
||||||
, m_oTicket.getLine(i).getProductName()
|
* , (int) m_oTicket.getLine(i).getMultiply()
|
||||||
, m_oTicket.getLine(i).getProductAttSetInstDesc()
|
* , m_oTicket.getLine(i).getProductName()
|
||||||
, m_oTicket.getLine(i).getProperty("notes")
|
* , m_oTicket.getLine(i).getProductAttSetInstDesc()
|
||||||
, id
|
* , m_oTicket.getLine(i).getProperty("notes")
|
||||||
, null
|
* , id
|
||||||
, display
|
* , null
|
||||||
, null
|
* , display
|
||||||
, null);
|
* , null
|
||||||
|
* , null);
|
||||||
*/
|
*/
|
||||||
|
|
||||||
} catch (BasicException ex) {
|
} catch (BasicException ex) {
|
||||||
|
|||||||
@@ -112,6 +112,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
|||||||
m_isProcessed = false;
|
m_isProcessed = false;
|
||||||
m_locked = null;
|
m_locked = null;
|
||||||
ticketstatus = 0;
|
ticketstatus = 0;
|
||||||
|
m_sHost = String.valueOf(config.getProperty("machine.hostname"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -212,6 +213,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
|||||||
public int getTicketType() {
|
public int getTicketType() {
|
||||||
return tickettype;
|
return tickettype;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setTicketType(int tickettype) {
|
public void setTicketType(int tickettype) {
|
||||||
this.tickettype = tickettype;
|
this.tickettype = tickettype;
|
||||||
}
|
}
|
||||||
@@ -219,6 +221,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
|||||||
public int getTicketId() {
|
public int getTicketId() {
|
||||||
return m_iTicketId;
|
return m_iTicketId;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setTicketId(int iTicketId) {
|
public void setTicketId(int iTicketId) {
|
||||||
m_iTicketId = iTicketId;
|
m_iTicketId = iTicketId;
|
||||||
}
|
}
|
||||||
@@ -226,6 +229,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
|||||||
public int getTicketStatus() {
|
public int getTicketStatus() {
|
||||||
return ticketstatus;
|
return ticketstatus;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setTicketStatus(int ticketstatus) {
|
public void setTicketStatus(int ticketstatus) {
|
||||||
if (m_iTicketId > 0) {
|
if (m_iTicketId > 0) {
|
||||||
this.ticketstatus = m_iTicketId;
|
this.ticketstatus = m_iTicketId;
|
||||||
@@ -403,9 +407,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
|||||||
|
|
||||||
public double getSubTotal() {
|
public double getSubTotal() {
|
||||||
double sum = 0.0;
|
double sum = 0.0;
|
||||||
sum = m_aLines.stream().map((line) ->
|
sum = m_aLines.stream().map((line) -> line.getSubValue()).reduce(sum, (accumulator, _item) -> accumulator + _item);
|
||||||
line.getSubValue()).reduce(sum, (accumulator, _item) ->
|
|
||||||
accumulator + _item);
|
|
||||||
return sum;
|
return sum;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -418,9 +420,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
|||||||
nsum = sum;
|
nsum = sum;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
sum = m_aLines.stream().map((line) ->
|
sum = m_aLines.stream().map((line) -> line.getTax()).reduce(sum, (accumulator, _item) -> accumulator + _item);
|
||||||
line.getTax()).reduce(sum, (accumulator, _item) ->
|
|
||||||
accumulator + _item);
|
|
||||||
}
|
}
|
||||||
return sum;
|
return sum;
|
||||||
}
|
}
|
||||||
@@ -437,10 +437,8 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
|||||||
|
|
||||||
public double getTotalPaid() {
|
public double getTotalPaid() {
|
||||||
double sum = 0.0;
|
double sum = 0.0;
|
||||||
sum = payments.stream().filter((p) ->
|
sum = payments.stream().filter((p) -> (!"debtpaid".equals(p.getName()))).map((p) -> p.getTotal()).reduce(sum,
|
||||||
(!"debtpaid".equals(p.getName()))).map((p) ->
|
(accumulator, _item) -> accumulator + _item);
|
||||||
p.getTotal()).reduce(sum, (accumulator, _item) ->
|
|
||||||
accumulator + _item);
|
|
||||||
return sum;
|
return sum;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -571,7 +569,6 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
|||||||
return m_sHost;
|
return m_sHost;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Added JDL 28.05.13 for loyalty card functions
|
// Added JDL 28.05.13 for loyalty card functions
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -642,8 +639,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public String getTicketHeaderFooterData(String data) {
|
public String getTicketHeaderFooterData(String data) {
|
||||||
AppConfig m_config = new AppConfig(new File((System.getProperty("user.home"))
|
AppConfig m_config = new AppConfig(new File((System.getProperty("user.home")), AppLocal.APP_ID + ".properties"));
|
||||||
, AppLocal.APP_ID + ".properties"));
|
|
||||||
m_config.load();
|
m_config.load();
|
||||||
String row = (m_config.getProperty("tkt." + data));
|
String row = (m_config.getProperty("tkt." + data));
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user