Fix review issues: CSS syntax, accessibility, colspan values, and avatar toggle state persistence

- Fixed invalid CSS syntax (padding:10px; !important -> padding:10px;) - Added type="button" to avatar toggle buttons to prevent form submission - Fixed colspan values for avatar column in receivings/receiving.php and receivings/receipt.php - Added summary_colspan for tax indicator in sales/receipt_default.php - Changed avatar toggle from <a><div> to proper <button> elements - Fixed persisted avatar state to also hide header columns - Fixed column widths to total 100% in sales/register.php - Fixed no-items-in-cart colspan from 8 to 9 in sales/register.php - Unified localStorage key to 'avatarColumnVisible' across all views
Address review feedback: use ternary, camelCase, remove test file
2026-05-25 08:44:42 -04:00 · 2026-03-17 15:42:17 +00:00 · 2026-03-12 19:44:38 +00:00 · 2026-03-08 22:03:34 +00:00 · 2026-03-05 12:50:09 +00:00 · 2025-11-24 22:57:24 +01:00
634 changed files with 6651 additions and 19490 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,56 +1,23 @@
-# Version control
-.git
-.gitignore
-
-# Sensitive config (user may mount their own)
+node_modules
+tmp
 app/Config/Email.php
-
-# Build artifacts
-node_modules/
-dist/
-tmp/
 *.patch
 patches/
-
-# IDE and editor files
 .idea/
-.vscode/
+git-svn-diff.py
+*.bash
 .swp
-*.swp
 .buildpath
 .project
-.settings/
-
-# Development tools and configs
-tests/
-phpunit.xml
-.php-cs-fixer.*
-phpstan.neon
-*.bash
-git-svn-diff.py
-
-# Documentation
-*.md
-!LICENSE
-branding/
-
-# Build configs (not needed at runtime)
-composer.json
-composer.lock
-package.json
-package-lock.json
-gulpfile.js
-.env.example
-.dockerignore
-
-# Temporary and backup files
+.settings/*
+.git
+dist/
+node_modules/
+*.swp
 *.rej
 *.orig
 *~
 *.~
 *.log
-
-# CI
-.github/
-.github/workflows/
-build/
+app/writable/session/*
+!app/writable/session/index.html
--- a/.env.example
+++ b/.env.example
@@ -3,27 +3,13 @@
 #--------------------------------------------------------------------

 CI_ENVIRONMENT = production
+CI_DEBUG = false

 #--------------------------------------------------------------------
-# SECURITY: ALLOWED HOSTNAMES
+# APP
 #--------------------------------------------------------------------
-# CRITICAL: Whitelist of allowed hostnames to prevent Host Header
-# Injection attacks (GHSA-jchf-7hr6-h4f3).
-#
-# REQUIRED IN PRODUCTION: Application will fail to start if not configured.
-# In development, falls back to 'localhost' with an error log.
-#
-# Configure with comma-separated list of domains/subdomains:
-#   app.allowedHostnames = 'yourdomain.com,www.yourdomain.com'
-#
-# Or via environment variable (useful for Docker/Compose):
-#   ALLOWED_HOSTNAMES=yourdomain.com,www.yourdomain.com
-#
-# For local development:
-#   app.allowedHostnames = 'localhost'
-#
-# Note: Do not include protocol (http/https) or port numbers.
-app.allowedHostnames = ''
+
+app.appTimezone = 'UTC'

 #--------------------------------------------------------------------
 # DATABASE
@@ -35,6 +21,7 @@ database.default.username = 'admin'
 database.default.password = 'pointofsale'
 database.default.DBDriver = 'MySQLi'
 database.default.DBPrefix = 'ospos_'
+database.default.port = 3306

 database.development.hostname = 'localhost'
 database.development.database = 'ospos'
@@ -42,6 +29,7 @@ database.development.username = 'admin'
 database.development.password = 'pointofsale'
 database.development.DBDriver = 'MySQLi'
 database.development.DBPrefix = 'ospos_'
+database.development.port = 3306

 database.tests.hostname = 'localhost'
 database.tests.database = 'ospos'
@@ -49,6 +37,20 @@ database.tests.username = 'admin'
 database.tests.password = 'pointofsale'
 database.tests.DBDriver = 'MySQLi'
 database.tests.DBPrefix = 'ospos_'
+database.tests.charset = utf8mb4
+database.tests.DBCollat = utf8mb4_general_ci
+database.tests.port = 3306
+
+#--------------------------------------------------------------------
+# EMAIL
+#--------------------------------------------------------------------
+
+email.SMTPHost = ''
+email.SMTPUser = ''
+email.SMTPPass = ''
+email.SMTPPort =
+email.SMTPTimeout = 5
+email.SMTPCrypto = 'tls'

 #--------------------------------------------------------------------
 # ENCRYPTION
@@ -56,6 +58,16 @@ database.tests.DBPrefix = 'ospos_'

 encryption.key = ''

+#--------------------------------------------------------------------
+# HONEYPOT
+#--------------------------------------------------------------------
+
+honeypot.hidden = true
+honeypot.label = 'Fill This Field'
+honeypot.name = 'honeypot'
+honeypot.template = '<label>{label}</label><input type="text" name="{name}" value="">'
+honeypot.container = '<div style="display:none">{template}</div>'
+
 #--------------------------------------------------------------------
 # LOGGER
 # - 0 = Disables logging, Error logging TURNED OFF
@@ -72,13 +84,4 @@ encryption.key = ''

 logger.threshold = 0
 app.db_log_enabled = false
-
-#--------------------------------------------------------------------
-# HONEYPOT
-#--------------------------------------------------------------------
-
-honeypot.hidden = true
-honeypot.label = 'Fill This Field'
-honeypot.name = 'honeypot'
-honeypot.template = '<label>{label}</label><input type="text" name="{name}" value="">'
-honeypot.container = '<div style="display:none">{template}</div>'
+app.db_log_only_long = false
--- a/.env-example
+++ b/.env-example
@@ -0,0 +1,63 @@
+#--------------------------------------------------------------------
+# ENVIRONMENT
+#--------------------------------------------------------------------
+
+CI_ENVIRONMENT = production
+
+#--------------------------------------------------------------------
+# DATABASE
+#--------------------------------------------------------------------
+
+database.default.hostname = 'localhost'
+database.default.database = 'ospos'
+database.default.username = 'admin'
+database.default.password = 'pointofsale'
+database.default.DBDriver = 'MySQLi'
+database.default.DBPrefix = 'ospos_'
+
+database.development.hostname = 'localhost'
+database.development.database = 'ospos'
+database.development.username = 'admin'
+database.development.password = 'pointofsale'
+database.development.DBDriver = 'MySQLi'
+database.development.DBPrefix = 'ospos_'
+
+database.tests.hostname = 'localhost'
+database.tests.database = 'ospos'
+database.tests.username = 'admin'
+database.tests.password = 'pointofsale'
+database.tests.DBDriver = 'MySQLi'
+database.tests.DBPrefix = 'ospos_'
+
+#--------------------------------------------------------------------
+# ENCRYPTION
+#--------------------------------------------------------------------
+
+encryption.key = ''
+
+#--------------------------------------------------------------------
+# LOGGER
+# - 0 = Disables logging, Error logging TURNED OFF
+# - 1 = Emergency Messages - System is unusable
+# - 2 = Alert Messages - Action Must Be Taken Immediately
+# - 3 = Critical Messages - Application component unavailable, unexpected exception.
+# - 4 = Runtime Errors - Don't need immediate action, but should be monitored.
+# - 5 = Warnings - Exceptional occurrences that are not errors.
+# - 6 = Notices - Normal but significant events.
+# - 7 = Info - Interesting events, like user logging in, etc.
+# - 8 = Debug - Detailed debug information.
+# - 9 = All Messages
+#--------------------------------------------------------------------
+
+logger.threshold = 0
+app.db_log_enabled = false
+
+#--------------------------------------------------------------------
+# HONEYPOT
+#--------------------------------------------------------------------
+
+honeypot.hidden = true
+honeypot.label = 'Fill This Field'
+honeypot.name = 'honeypot'
+honeypot.template = '<label>{label}</label><input type="text" name="{name}" value="">'
+honeypot.container = '<div style="display:none">{template}</div>'
--- a/.github/ISSUE_TEMPLATE/bug
+++ b/.github/ISSUE_TEMPLATE/bug
@@ -1,187 +1,121 @@
-name: 🐛 Bug Report
-description: File a bug report to help us improve
-title: "[Bug]: "
-labels: ["bug", "triage"]
-projects: ["ospos/3", "ospos/4"]
-assignees: []
-body:
-  # ─────────────────────────────────────────────────────────────────────────────
-  # INTRODUCTION
-  # ─────────────────────────────────────────────────────────────────────────────
-  - type: markdown
-    attributes:
-      value: |
-        ## Thanks for taking the time to fill out this bug report! 🐜
-
-        Bug reports help us identify and fix issues. Please provide as much detail as possible.
-
-        > ⚠️ **Important:** Submit a separate bug report for each problem you encounter.
-        >
-        > 🚫 Do not include personal identifying information such as email addresses or encryption keys.
-
-  # ─────────────────────────────────────────────────────────────────────────────
-  # PROBLEM DESCRIPTION
-  # ─────────────────────────────────────────────────────────────────────────────
-  - type: textarea
-    id: bug-description
-    attributes:
-      label: 🐛 Bug Description
-      description: A clear and concise description of what the bug is.
-      placeholder: |
-        Example: When I try to print a receipt, the application crashes
-        with an error message saying "Unable to connect to printer".
-    validations:
-      required: true
-
-  - type: textarea
-    id: steps-reproduce
-    attributes:
-      label: 📋 Steps to Reproduce
-      description: Detailed steps to reproduce the behavior.
-      placeholder: |
-        1. Go to '...'
-        2. Click on '...'
-        3. Scroll down to '...'
-        4. See error
-    validations:
-      required: true
-
-  - type: textarea
-    id: expected-behavior
-    attributes:
-      label: ✅ Expected Behavior
-      description: A clear and concise description of what you expected to happen.
-      placeholder: |
-        Example: The receipt should print successfully without any errors.
-    validations:
-      required: true
-
-  # ─────────────────────────────────────────────────────────────────────────────
-  # ENVIRONMENT DETAILS
-  # ─────────────────────────────────────────────────────────────────────────────
-  - type: dropdown
-    id: ospos-version
-    attributes:
-      label: 📦 OpenSourcePOS Version
-      description: What version of our software are you running?
-      options:
-        - development (unreleased)
-        - OpenSourcePOS 3.4.2
-        - OpenSourcePOS 3.4.1
-        - OpenSourcePOS 3.4.0
-        - OpenSourcePOS 3.3.9
-        - OpenSourcePOS 3.3.8
-      default: 0
-    validations:
-      required: true
-
-  - type: dropdown
-    id: php-version
-    attributes:
-      label: 🔧 PHP Version
-      description: What version of PHP are you running?
-      options:
-        - PHP 8.4
-        - PHP 8.3
-        - PHP 8.2
-        - PHP 8.1
-        - PHP 7.4
-        - Other
-      default: 0
-    validations:
-      required: true
-
-  - type: dropdown
-    id: browsers
-    attributes:
-      label: 🌐 Browser(s)
-      description: What browser(s) are you seeing the problem on?
-      multiple: true
-      options:
-        - Firefox
-        - Chrome
-        - Safari
-        - Microsoft Edge
-        - Other
-
-  - type: input
-    id: server
-    attributes:
-      label: 🖥️ Server Operating System
-      description: What server OS and version are you running?
-      placeholder: "e.g., Ubuntu 22.04, CentOS 7, Windows Server 2022"
-    validations:
-      required: true
-
-  - type: input
-    id: database
-    attributes:
-      label: 🗄️ Database
-      description: What database management system and version are you using?
-      placeholder: "e.g., MySQL 8.0, MariaDB 10.11, Percona 8.0"
-    validations:
-      required: true
-
-  - type: input
-    id: webserver
-    attributes:
-      label: 🌍 Web Server
-      description: What web server and version are you using?
-      placeholder: "e.g., Apache 2.4, Nginx 1.24, Caddy 2.7"
-    validations:
-      required: true
-
-  # ─────────────────────────────────────────────────────────────────────────────
-  # ADDITIONAL INFORMATION
-  # ─────────────────────────────────────────────────────────────────────────────
-  - type: textarea
-    id: system-info
-    attributes:
-      label: 📊 System Information Report
-      description: |
-        Copy and paste the system information from OSPOS:
-
-        **Navigation:** Configuration → Setup & Conf → System Info
-      placeholder: |
-        Paste the System Information Report here...
-      render: text
-    validations:
-      required: true
-
-  - type: textarea
-    id: logs
-    attributes:
-      label: 📜 Relevant Log Output
-      description: |
-        Please copy and paste any relevant log output.
-
-        **Log locations:**
-        - OSPOS logs: `writable/logs/`
-        - Web server logs: `/var/log/apache2/` or `/var/log/nginx/`
-        - PHP logs: Check your `php.ini` for `error_log` location
-      placeholder: |
-        Paste log output here...
-      render: shell
-
-  - type: textarea
-    id: screenshots
-    attributes:
-      label: 📸 Screenshots
-      description: If applicable, add screenshots to help explain your problem.
-      placeholder: Drag and drop images here...
-
-  # ─────────────────────────────────────────────────────────────────────────────
-  # CONFIRMATION
-  # ─────────────────────────────────────────────────────────────────────────────
-  - type: checkboxes
-    id: terms
-    attributes:
-      label: ✓ Confirmation
-      description: Please confirm the following before submitting
-      options:
-        - label: I certify that this is an unmodified copy of OpenSourcePOS
-          required: true
-        - label: I have searched existing issues to ensure this bug has not already been reported
-          required: true
-        - label: I have provided all the information requested above
-          required: true
+name: Bug Report
+description: File a bug report
+title: "[Bug]: "
+labels: ["bug", "triage"]
+projects: ["ospos/3", "ospos/4"]
+assignees:
+  - none
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Bug reports indicate that something is not working as intended. 
+        Please include as much detail as possible and submit a separate bug report for each problem.
+        Do not include personal identifying information such as email addresses or encryption keys.           
+  - type: textarea
+    id: bug-description
+    attributes:
+      label: Bug Description?
+      description: Describe the problem that you are seeing
+      placeholder: "Describe the problem that you are seeing"
+    validations:
+      required: true 
+  - type: textarea
+    id: steps-reproduce
+    attributes:
+      label: Steps to Reproduce?
+      description: List the steps to reproduce this issue
+      placeholder: "Steps to Reproduce"
+    validations:
+      required: true
+  - type: textarea
+    id: expected-behavior
+    attributes:
+      label: Expected Behavior?
+      description: Tell us what did you expect to happen?
+      placeholder: "Expected Behavior"
+    validations:
+      required: true    
+  - type: dropdown
+    id: ospos-version
+    attributes:
+      label: OpensourcePOS Version
+      description: What version of our software are you running?
+      options:
+        - development (unreleased)
+        - opensourcepos 3.4.1
+        - opensourcepos 3.4.0
+        - opensourcepos 3.3.9
+        - opensourcepos 3.3.8
+        - opensourcepos 3.3.7
+      default: 0
+    validations:
+      required: true
+  - type: dropdown
+    id: php-version
+    attributes:
+      label: Php version
+      description: What version of Php?
+      options:
+        - Php 7.2
+        - Php 7.3
+        - Php 7.4
+        - Php 8.1 
+        - Php 8.2
+        - Php 8.3
+        - Php 8.4
+      default: 0
+    validations:
+      required: true 
+  - type: dropdown
+    id: browsers
+    attributes:
+      label: What browsers are you seeing the problem on?
+      multiple: true
+      options:
+        - Firefox
+        - Chrome
+        - Safari
+        - Microsoft Edge
+        - Other
+  - type: input
+    id: server
+    attributes:
+      label: Server Operating System and version
+      description: "Server Operating System "
+      placeholder: "Server Operating System "
+    validations:
+      required: true  
+  - type: input
+    id: database
+    attributes:
+      label: Database Management System and version
+      description: "Database Management System"
+      placeholder: "Database Management"
+    validations:
+      required: true   
+  - type: input
+    id: webserver
+    attributes:
+      label: Web Server and version
+      description: "Web Server and version "
+      placeholder: "Web Server and version "
+    validations:
+      required: true    
+  - type: textarea
+    id: servers
+    attributes:
+      label: System Information Report (optional)
+      description: Copy and paste from OSPOS > Configuration > Setup & Conf > Setup & Conf?
+      placeholder: System Information Report
+      value: "System Information Report"
+    validations:
+      required: true  
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Unmodified copy of OpensourcePOS
+      description: By submitting this issue you agree this copy has not been modified
+      options:
+        - label: I agree this copy has not been modified
+          required: true
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,136 +1,63 @@
-name: ✨ Feature Request
-description: Suggest an idea or enhancement for this project
-title: "[Feature]: "
-labels: ["enhancement"]
-assignees: []
-body:
-  # ─────────────────────────────────────────────────────────────────────────────
-  # INTRODUCTION
-  # ─────────────────────────────────────────────────────────────────────────────
-  - type: markdown
-    attributes:
-      value: |
-        ## Thanks for suggesting a new feature! 💡
-        
-        We appreciate you taking the time to help improve OpenSourcePOS.
-        
-        > 📋 **Before submitting:** Please search [existing feature requests](https://github.com/opensourcepos/opensourcepos/issues?q=is%3Aissue+is%3Aopen+label%3Aenhancement) to ensure your idea hasn't already been suggested.
-
-  # ─────────────────────────────────────────────────────────────────────────────
-  # FEATURE DETAILS
-  # ─────────────────────────────────────────────────────────────────────────────
-  - type: dropdown
-    id: feature-type
-    attributes:
-      label: 🏷️ Feature Type
-      description: What type of feature are you requesting?
-      options:
-        - "✨ New Feature"
-        - "📝 Documentation Improvement"
-        - "🎨 UI/UX Enhancement"
-        - "🔨 Code Refactoring"
-        - "⚡ Performance Improvement"
-        - "✅ New Test Coverage"
-        - "🔌 Plugin/Integration"
-      default: 0
-    validations:
-      required: true
-
-  - type: dropdown
-    id: ospos-version
-    attributes:
-      label: 📦 OpenSourcePOS Version
-      description: What version are you currently running?
-      options:
-        - development (unreleased)
-        - OpenSourcePOS 3.4.2
-        - OpenSourcePOS 3.4.1
-        - OpenSourcePOS 3.4.0
-        - OpenSourcePOS 3.3.9
-        - OpenSourcePOS 3.3.8
-      default: 0
-    validations:
-      required: true
-
-  - type: textarea
-    id: problem-statement
-    attributes:
-      label: 🎯 Problem Statement
-      description: |
-        Is your feature request related to a problem? Please describe.
-        
-        A clear description of what the problem is. Ex: I'm always frustrated when [...]
-      placeholder: |
-        Example: I always have to manually calculate taxes for different regions, 
-        which is time-consuming and error-prone.
-    validations:
-      required: true
-
-  - type: textarea
-    id: proposed-solution
-    attributes:
-      label: 💡 Proposed Solution
-      description: A clear and concise description of what you want to happen.
-      placeholder: |
-        Example: Add an automatic tax calculation feature that:
-        - Detects the customer's region
-        - Applies the correct tax rate
-        - Generates a tax report automatically
-    validations:
-      required: true
-
-  - type: textarea
-    id: alternatives
-    attributes:
-      label: 🔄 Alternatives Considered
-      description: A clear description of any alternative solutions or features you've considered.
-      placeholder: |
-        Example: I considered using an external tax service, but it would be 
-        better to have this integrated directly into OpenSourcePOS.
-
-  # ─────────────────────────────────────────────────────────────────────────────
-  # ADDITIONAL INFORMATION
-  # ─────────────────────────────────────────────────────────────────────────────
-  - type: textarea
-    id: additional-context
-    attributes:
-      label: 📎 Additional Context
-      description: |
-        Add any other context, screenshots, mockups, or references about the feature request here.
-        
-        **Helpful additions:**
-        - Links to similar features in other software
-        - Mockups or diagrams
-        - Code examples
-        - Documentation references
-      placeholder: |
-        Any other relevant information, links, or screenshots...
-
-  - type: textarea
-    id: acceptance-criteria
-    attributes:
-      label: ✅ Acceptance Criteria
-      description: |
-        (Optional) Define what "done" looks like for this feature.
-        
-        Format: **Given** [context], **When** [action], **Then** [outcome]
-      placeholder: |
-        Given a customer is selected from region X
-        When the sale is completed
-        Then the tax rate for region X is automatically applied
-        And the tax amount is correctly calculated
-        And a tax entry is logged in the report
-
-  # ─────────────────────────────────────────────────────────────────────────────
-  # CONFIRMATION
-  # ─────────────────────────────────────────────────────────────────────────────
-  - type: checkboxes
-    id: terms
-    attributes:
-      label: ✓ Confirmation
-      description: Please confirm before submitting
-      options:
-        - label: I have searched existing feature requests to ensure this is not a duplicate
-          required: true
-        - label: I have provided a clear problem statement and proposed solution
-          required: true
+name: ✨ Feature Request
+description: Suggest an idea for this project
+title: "[Feature]: "
+labels: ["enhancement"]
+assignees: ["none"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this feature request! 🤗
+        Please make sure this feature request hasn't been already submitted by someone by looking through other open/closed issues. 😃
+
+  - type: dropdown
+    attributes:
+      multiple: false
+      label: Type of Feature
+      description: Select the type of feature request.
+      options:
+        - "✨ New Feature"
+        - "📝 Documentation"
+        - "🎨 Style and UI"
+        - "🔨 Code Refactor"
+        - "⚡ Performance Improvements"
+        - "✅ New Test"
+    validations:
+      required: true
+      
+  - type: dropdown
+    id: ospos-version
+    attributes:
+      label: OpensourcePOS Version
+      description: What version of our software are you running?
+      options:
+        - opensourcepos 3.3.9
+        - opensourcepos 3.3.8
+        - opensourcepos 3.3.7
+      default: 0
+    validations:
+      required: true  
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: Give us a brief description of the feature or enhancement you would like
+    validations:
+      required: true
+
+  - type: textarea
+    id: additional-information
+    attributes:
+      label: Additional Information
+      description: Give us some additional information on the feature request like proposed solutions, links, screenshots, etc.
+      
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Verify you searched open requests in OpensourcePOS
+      description: By submitting this request you agree that you have searched Open Requests in the Tracker
+      options:
+        - label: I agree I have searched Open Requests
+          required: true 
+ 
--- a/.github/scripts/get-version.sh
+++ b/.github/scripts/get-version.sh
@@ -1,94 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-# Shared version tag generation script for GitHub Actions workflows
-# Usage: ./get-version.sh [FORMAT] [SHA_LENGTH]
-#
-# Formats:
-#   docker-tag  - Docker image tag (default)
-#   archive     - Archive filename suffix
-#   all         - Output all version variables for GITHUB_OUTPUT
-#
-# Environment variables:
-#   GITHUB_REF        - Git ref (e.g., refs/heads/master, refs/pull/123/merge)
-#   GITHUB_SHA        - Git commit SHA
-#   GITHUB_EVENT_NAME - Event that triggered workflow (push, pull_request, etc.)
-#   GITHUB_EVENT_PATH - Path to event JSON (for PR number extraction)
-#   GITHUB_OUTPUT     - Path to GITHUB_OUTPUT file (when format=all)
-
-# Ensure we're in a git repository with source files
-cd "${GITHUB_WORKSPACE:-.}"
-
-# Get version from App.php
-VERSION=$(grep "application_version" app/Config/App.php | sed "s/.*= '\(.*\)';/\1/g")
-
-# Standardize SHA length (default: 7 chars)
-SHA_LENGTH="${2:-7}"
-SHA="${GITHUB_SHA:0:$SHA_LENGTH}"
-
-# Initialize variables
-IMAGE_TAG=""
-BRANCH=""
-
-# Detect event type and generate appropriate tag
-if [[ "$GITHUB_EVENT_NAME" == "pull_request" || "$GITHUB_EVENT_NAME" == "pull_request_review" ]]; then
-  # Extract PR number from event JSON
-  if [[ -f "${GITHUB_EVENT_PATH:-}" ]]; then
-    PR_NUMBER=$(jq -r '.pull_request.number // .number // empty' < "$GITHUB_EVENT_PATH" 2>/dev/null || true)
-    
-    if [[ -n "$PR_NUMBER" ]]; then
-      # PR-based tag (for PR deployments)
-      IMAGE_TAG="pr-${PR_NUMBER}-${SHA}"
-      BRANCH="pr-${PR_NUMBER}"
-    fi
-  fi
-  
-  # Fallback if we couldn't extract PR number
-  if [[ -z "$IMAGE_TAG" ]]; then
-    # Try to extract from GITHUB_REF
-    PR_NUMBER=$(echo "$GITHUB_REF" | grep -oP 'pull/\K[0-9]+' || true)
-    if [[ -n "$PR_NUMBER" ]]; then
-      IMAGE_TAG="pr-${PR_NUMBER}-${SHA}"
-      BRANCH="pr-${PR_NUMBER}"
-    else
-      # Last resort: use SHA only
-      IMAGE_TAG="${SHA}"
-      BRANCH="unknown"
-    fi
-  fi
-else
-  # Branch-based tag (for push events)
-  BRANCH="${GITHUB_REF#refs/heads/}"
-  BRANCH=$(echo "$BRANCH" | sed 's/feature\///' | tr '/' '_')
-  
-  if [[ "$BRANCH" == "master" ]]; then
-    # Master builds: use version as tag
-    IMAGE_TAG="${VERSION}"
-  else
-    # Feature branch builds: version + branch + sha
-    IMAGE_TAG="${VERSION}-${BRANCH}-${SHA}"
-  fi
-fi
-
-# Output format based on first argument
-case "${1:-docker-tag}" in
-  docker-tag)
-    echo "$IMAGE_TAG"
-    ;;
-  archive)
-    echo "${VERSION}.${SHA}"
-    ;;
-  all)
-    {
-      echo "version=${VERSION}"
-      echo "version-tag=${IMAGE_TAG}"
-      echo "short-sha=${SHA}"
-      echo "branch=${BRANCH}"
-    } >> "$GITHUB_OUTPUT"
-    echo "::debug::version=${VERSION}, version-tag=${IMAGE_TAG}, short-sha=${SHA}, branch=${BRANCH}"
-    ;;
-  *)
-    echo "::error::Unknown format: $1" >&2
-    exit 1
-    ;;
-esac
--- a/.github/workflows/README.md
+++ b/.github/workflows/README.md
@@ -1,61 +0,0 @@
-# GitHub Actions
-
-This document describes the CI/CD workflows for OSPOS.
-
-## Build and Release Workflow (`.github/workflows/build-release.yml`)
-
-### Build Process
- Setup PHP 8.2 with required extensions
- Setup Node.js 20
- Install composer dependencies
- Install npm dependencies
- Build frontend assets with Gulp
-
-### Docker Images
- Build and push `opensourcepos` Docker image for multiple architectures (linux/amd64, linux/arm64)
- On master: tagged with version and `latest`
- On other branches: tagged with version only
- Pushed to Docker Hub
-
-### Releases
- Create distribution archives (tar.gz, zip)
- Create/update GitHub "unstable" release on master branch only
-
-## Required Secrets
-
-To use this workflow, you need to add the following secrets to your repository:
-
-1. **DOCKER_USERNAME** - Docker Hub username for pushing images
-2. **DOCKER_PASSWORD** - Docker Hub password/token for pushing images
-
-### How to add secrets
-
-1. Go to your repository on GitHub
-2. Click **Settings** → **Secrets and variables** → **Actions**
-3. Click **New repository secret**
-4. Add `DOCKER_USERNAME` and `DOCKER_PASSWORD`
-
-The `GITHUB_TOKEN` is automatically provided by GitHub Actions.
-
-## Workflow Triggers
-
- **Push to master** - Runs build, Docker push (with `latest` tag), and release
- **Push to other branches** - Runs build and Docker push (version tag only)
- **Push tags** - Runs build and Docker push (version tag only)
- **Pull requests** - Runs build only (PHPUnit tests run in parallel via phpunit.yml)
-
-## Existing Workflows
-
-This repository also has these workflows:
- `.github/workflows/main.yml` - PHP linting with PHP-CS-Fixer
- `.github/workflows/phpunit.yml` - PHPUnit tests (runs on all PHP versions 8.1-8.4)
- `.github/workflows/php-linter.yml` - PHP linting
-
-## Testing
-
-PHPUnit tests are run separately via `.github/workflows/phpunit.yml` on every push and pull request, testing against PHP 8.1, 8.2, 8.3, and 8.4.
-
-To test the build workflow:
-1. Add the required secrets
-2. Push to master or create a PR
-3. Monitor the Actions tab in GitHub
--- a/.github/workflows/build-release.yml
+++ b/.github/workflows/build-release.yml
@@ -1,213 +0,0 @@
-name: Build and Release
-
-on:
-  push:
-  pull_request:
-    branches:
-      - master
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-22.04
-
-    outputs:
-      version: ${{ steps.version.outputs.version }}
-      version-tag: ${{ steps.version.outputs.version-tag }}
-      short-sha: ${{ steps.version.outputs.short-sha }}
-      branch: ${{ steps.version.outputs.branch }}
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '8.2'
-          extensions: intl, mbstring, mysqli, gd, bcmath, zip
-          coverage: none
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: '20'
-
-      - name: Get composer cache directory
-        run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
-
-      - name: Cache composer dependencies
-        uses: actions/cache@v4
-        with:
-          path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-composer-
-
-      - name: Get npm cache directory
-        run: echo "NPM_CACHE_DIR=$(npm config get cache)" >> $GITHUB_ENV
-
-      - name: Cache npm dependencies
-        uses: actions/cache@v4
-        with:
-          path: ${{ env.NPM_CACHE_DIR }}
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-
-
-      - name: Install composer dependencies
-        run: composer install --no-dev --optimize-autoloader
-
-      - name: Install npm dependencies
-        run: npm ci
-
-      - name: Install gulp globally
-        run: npm install -g gulp-cli
-
-      - name: Get version info
-        id: version
-        run: |
-          chmod +x .github/scripts/get-version.sh
-          .github/scripts/get-version.sh all 7
-        env:
-          GITHUB_EVENT_PATH: ${{ github.event_path }}
-          GITHUB_SHA: ${{ github.sha }}
-          GITHUB_REF: ${{ github.ref }}
-          GITHUB_EVENT_NAME: ${{ github.event_name }}
-
-      - name: Create .env file
-        run: |
-          cp .env.example .env
-          sed -i 's/production/development/g' .env
-
-      - name: Update commit hash
-        run: |
-          SHORT_SHA="${{ steps.version.outputs.short-sha }}"
-          sed -i "s/commit_sha1 = 'dev'/commit_sha1 = '$SHORT_SHA'/g" app/Config/OSPOS.php
-
-      - name: Build frontend assets
-        run: npm run build
-
-      - name: Create distribution archives
-        run: |
-          set -euo pipefail
-          gulp compress
-          VERSION="${{ steps.version.outputs.version }}"
-          SHORT_SHA="${{ steps.version.outputs.short-sha }}"
-          mv dist/opensourcepos.tar "dist/opensourcepos.$VERSION.$SHORT_SHA.tar"
-          mv dist/opensourcepos.zip "dist/opensourcepos.$VERSION.$SHORT_SHA.zip"
-
-      - name: Upload build artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: dist-${{ steps.version.outputs.short-sha }}
-          path: dist/
-          retention-days: 7
-
-      - name: Upload build context for Docker
-        uses: actions/upload-artifact@v4
-        with:
-          name: build-context-${{ steps.version.outputs.short-sha }}
-          path: |
-            .
-            !.git
-            !node_modules
-          include-hidden-files: true
-          retention-days: 1
-
-  docker:
-    name: Build Docker Image
-    runs-on: ubuntu-22.04
-    needs: build
-    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository)
-
-    steps:
-      - name: Download build context
-        uses: actions/download-artifact@v4
-        with:
-          name: build-context-${{ needs.build.outputs.short-sha }}
-          path: .
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Determine Docker tags
-        id: tags
-        run: |
-          TAG="${{ needs.build.outputs.version-tag }}"
-          if [ "${{ github.event_name }}" = "pull_request" ]; then
-            echo "tags=${{ secrets.DOCKER_USERNAME }}/opensourcepos:${TAG}" >> $GITHUB_OUTPUT
-          elif [ "${{ needs.build.outputs.branch }}" = "master" ]; then
-            echo "tags=${{ secrets.DOCKER_USERNAME }}/opensourcepos:${TAG},${{ secrets.DOCKER_USERNAME }}/opensourcepos:latest" >> $GITHUB_OUTPUT
-          else
-            echo "tags=${{ secrets.DOCKER_USERNAME }}/opensourcepos:${TAG}" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Build and push Docker images
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          target: ospos
-          platforms: linux/amd64,linux/arm64
-          push: true
-          tags: ${{ steps.tags.outputs.tags }}
-
-  release:
-    name: Create Release
-    needs: build
-    runs-on: ubuntu-22.04
-    if: github.event_name == 'push' && github.ref == 'refs/heads/master'
-    permissions:
-      contents: write
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Download build artifacts
-        uses: actions/download-artifact@v4
-        with:
-          name: dist-${{ needs.build.outputs.short-sha }}
-          path: dist/
-
-      - name: Get version info
-        id: version
-        run: |
-          VERSION="${{ needs.build.outputs.version }}"
-          SHORT_SHA="${{ needs.build.outputs.short-sha }}"
-          echo "version=$VERSION" >> $GITHUB_OUTPUT
-          echo "short-sha=$SHORT_SHA" >> $GITHUB_OUTPUT
-
-      - name: Create/Update unstable release
-        uses: softprops/action-gh-release@v2
-        with:
-          tag_name: unstable
-          name: Unstable OpenSourcePOS
-          body: |
-            This is a build of the latest master which might contain bugs. Use at your own risk.
-            
-            Check the releases section for the latest official release.
-          files: |
-            dist/opensourcepos.${{ steps.version.outputs.version }}.${{ steps.version.outputs.short-sha }}.zip
-          prerelease: true
-          draft: false
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,71 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '21 12 * * 3'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1
--- a/.github/workflows/deploy-core.yml
+++ b/.github/workflows/deploy-core.yml
@@ -1,219 +0,0 @@
-name: Deploy Core
-
-on:
-  workflow_call:
-    inputs:
-      image_tag:
-        description: 'Docker image tag to deploy'
-        type: string
-        required: true
-      sha:
-        description: 'Git commit SHA to deploy'
-        type: string
-        required: true
-      description:
-        description: 'Deployment description'
-        type: string
-        required: true
-      pr_number:
-        description: 'Pull request number (optional)'
-        type: string
-        required: false
-    outputs:
-      deployment_id:
-        description: 'GitHub deployment ID'
-        value: ${{ jobs.deploy.outputs.deployment_id }}
-      status:
-        description: 'Deployment status (success/failure)'
-        value: ${{ jobs.deploy.outputs.status }}
-
-concurrency:
-  group: deploy-staging
-  cancel-in-progress: false
-
-permissions:
-  contents: read
-  deployments: write
-
-jobs:
-  deploy:
-    name: Deploy to staging
-    runs-on: ubuntu-latest
-    
-    environment:
-      name: staging
-      url: ${{ vars.DEPLOY_URL || 'https://dev.opensourcepos.org' }}
-      deployment: false
-    
-    outputs:
-      deployment_id: ${{ steps.deployment.outputs.deployment_id }}
-      status: ${{ steps.webhook.outputs.status }}
-    
-    steps:
-      - name: Create GitHub Deployment
-        id: deployment
-        env:
-          GH_TOKEN: ${{ github.token }}
-          IMAGE_TAG: ${{ inputs.image_tag }}
-          REF_SHA: ${{ inputs.sha }}
-          DESCRIPTION: ${{ inputs.description }}
-        run: |
-          set -euo pipefail
-          
-          DEPLOYMENT_ID=$(gh api "repos/${GITHUB_REPOSITORY}/deployments" \
-            -X POST \
-            -f ref="${REF_SHA}" \
-            -f environment="staging" \
-            -f description="${DESCRIPTION}" \
-            -F auto_merge=false \
-            -F required_contexts[] \
-            --jq '.id')
-          
-          if [ -z "$DEPLOYMENT_ID" ]; then
-            echo "::error::Failed to create deployment"
-            exit 1
-          fi
-          
-          echo "deployment_id=$DEPLOYMENT_ID" >> "$GITHUB_OUTPUT"
-          echo "Created deployment: $DEPLOYMENT_ID"
-      
-      - name: Set deployment status to in_progress
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          set -euo pipefail
-          
-          gh api "repos/${GITHUB_REPOSITORY}/deployments/${{ steps.deployment.outputs.deployment_id }}/statuses" \
-            -X POST \
-            -f state="in_progress" \
-            -f description="Deployment in progress..." \
-            -f log_url="${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}"
-      
-      - name: Trigger deployment webhook
-        id: webhook
-        env:
-          DEPLOY_WEBHOOK_URL: ${{ secrets.DEPLOY_WEBHOOK_URL }}
-          DEPLOY_WEBHOOK_SECRET: ${{ secrets.DEPLOY_WEBHOOK_SECRET }}
-          DOCKER_REPO_NAME: ${{ secrets.DOCKER_REPO_NAME }}
-          IMAGE_TAG: ${{ inputs.image_tag }}
-          REF_SHA: ${{ inputs.sha }}
-          DEPLOYMENT_ID: ${{ steps.deployment.outputs.deployment_id }}
-          PR_NUMBER: ${{ inputs.pr_number }}
-        run: |
-          set -euo pipefail
-          
-          if [ -z "$DEPLOY_WEBHOOK_URL" ]; then
-            echo "::error::DEPLOY_WEBHOOK_URL secret is not configured"
-            echo "Please add the DEPLOY_WEBHOOK_URL secret in your repository settings"
-            echo "status=failure" >> "$GITHUB_OUTPUT"
-            exit 1
-          fi
-          
-          REPO_NAME="${DOCKER_REPO_NAME:-opensourcepos/opensourcepos}"
-          REPO_NAMESPACE="${REPO_NAME%%/*}"
-          REPO_SHORT_NAME="${REPO_NAME#*/}"
-          PUSHED_AT=$(date +%s)
-          
-          if [ -n "$PR_NUMBER" ]; then
-            PAYLOAD=$(jq -n \
-              --arg callback_url "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}" \
-              --argjson pushed_at "$PUSHED_AT" \
-              --arg pusher "$GITHUB_ACTOR" \
-              --arg tag "$IMAGE_TAG" \
-              --arg repo_name "$REPO_NAME" \
-              --arg name "$REPO_SHORT_NAME" \
-              --arg namespace "$REPO_NAMESPACE" \
-              --arg repo_url "https://hub.docker.com/r/${REPO_NAME}/" \
-              --arg deployment_id "$DEPLOYMENT_ID" \
-              --arg repository "$GITHUB_REPOSITORY" \
-              --arg sha "$REF_SHA" \
-              --arg run_id "$GITHUB_RUN_ID" \
-              --arg actor "$GITHUB_ACTOR" \
-              --argjson pr_number "$PR_NUMBER" \
-              '{
-                callback_url: $callback_url,
-                push_data: {pushed_at: $pushed_at, pusher: $pusher, tag: $tag},
-                repository: {repo_name: $repo_name, name: $name, namespace: $namespace, repo_url: $repo_url, status: "Active"},
-                github_deployment: {id: $deployment_id, environment: "staging", repository: $repository, sha: $sha, run_id: $run_id, actor: $actor, pull_request: $pr_number}
-              }')
-          else
-            PAYLOAD=$(jq -n \
-              --arg callback_url "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}" \
-              --argjson pushed_at "$PUSHED_AT" \
-              --arg pusher "$GITHUB_ACTOR" \
-              --arg tag "$IMAGE_TAG" \
-              --arg repo_name "$REPO_NAME" \
-              --arg name "$REPO_SHORT_NAME" \
-              --arg namespace "$REPO_NAMESPACE" \
-              --arg repo_url "https://hub.docker.com/r/${REPO_NAME}/" \
-              --arg deployment_id "$DEPLOYMENT_ID" \
-              --arg repository "$GITHUB_REPOSITORY" \
-              --arg sha "$REF_SHA" \
-              --arg run_id "$GITHUB_RUN_ID" \
-              --arg actor "$GITHUB_ACTOR" \
-              '{
-                callback_url: $callback_url,
-                push_data: {pushed_at: $pushed_at, pusher: $pusher, tag: $tag},
-                repository: {repo_name: $repo_name, name: $name, namespace: $namespace, repo_url: $repo_url, status: "Active"},
-                github_deployment: {id: $deployment_id, environment: "staging", repository: $repository, sha: $sha, run_id: $run_id, actor: $actor}
-              }')
-          fi
-          
-          echo "Sending webhook..."
-          echo "Image: ${IMAGE_TAG}"
-          echo "Environment: staging"
-          
-          HEADERS=(-H "Content-Type: application/json")
-          
-          if [ -n "$DEPLOY_WEBHOOK_SECRET" ]; then
-            SIGNATURE=$(printf '%s' "$PAYLOAD" | openssl dgst -sha256 -hmac "$DEPLOY_WEBHOOK_SECRET" | sed 's/.*= //')
-            HEADERS+=(-H "X-Hub-Signature-256: sha256=$SIGNATURE")
-            echo "Using HMAC-SHA256 signature verification"
-          else
-            echo "::warning::DEPLOY_WEBHOOK_SECRET not set - webhook calls will not be signed"
-            echo "For security, configure DEPLOY_WEBHOOK_SECRET in your repository settings"
-          fi
-          
-          HTTP_CODE=$(curl -sS --connect-timeout 10 --max-time 120 \
-            -o response.txt -w "%{http_code}" \
-            -X POST \
-            "${HEADERS[@]}" \
-            -d "$PAYLOAD" \
-            "$DEPLOY_WEBHOOK_URL") || HTTP_CODE="000"
-          
-          echo "Response code: $HTTP_CODE"
-          if [ -s response.txt ]; then
-            cat response.txt
-          fi
-          
-          if [ "$HTTP_CODE" -ge 200 ] && [ "$HTTP_CODE" -lt 300 ]; then
-            echo "status=success" >> "$GITHUB_OUTPUT"
-          else
-            echo "status=failure" >> "$GITHUB_OUTPUT"
-          fi
-      
-      - name: Set deployment status
-        if: always()
-        env:
-          GH_TOKEN: ${{ github.token }}
-          IMAGE_TAG: ${{ inputs.image_tag }}
-        run: |
-          set -euo pipefail
-          
-          STATE="${{ steps.webhook.outputs.status }}"
-          
-          if [ "$STATE" = "success" ]; then
-            DESCRIPTION=$(jq -nr --arg tag "$IMAGE_TAG" \
-              '"Deployed image \($tag) to staging"')
-            
-            gh api "repos/${GITHUB_REPOSITORY}/deployments/${{ steps.deployment.outputs.deployment_id }}/statuses" \
-              -X POST \
-              -f state="success" \
-              -f description="$DESCRIPTION"
-          else
-            gh api "repos/${GITHUB_REPOSITORY}/deployments/${{ steps.deployment.outputs.deployment_id }}/statuses" \
-              -X POST \
-              -f state="failure" \
-              -f description="Deployment failed"
-            exit 1
-          fi
--- a/.github/workflows/deploy-pr.yml
+++ b/.github/workflows/deploy-pr.yml
@@ -1,82 +0,0 @@
-name: PR Deploy
-
-on:
-  pull_request_review:
-    types: [submitted]
-
-concurrency:
-  group: staging-deploy
-  cancel-in-progress: false
-
-permissions:
-  contents: read
-  deployments: write
-  pull-requests: write
-
-jobs:
-  prepare:
-    name: Prepare deployment
-    runs-on: ubuntu-latest
-    if: >
-      github.event.review.state == 'approved' &&
-      github.event.pull_request.head.repo.full_name == github.repository
-    outputs:
-      image_tag: ${{ steps.image.outputs.tag }}
-      sha: ${{ github.event.pull_request.head.sha }}
-      pr_number: ${{ github.event.pull_request.number }}
-    
-    steps:
-      - name: Checkout PR
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-      
-      - name: Get image tag
-        id: image
-        run: |
-          chmod +x .github/scripts/get-version.sh
-          IMAGE_TAG=$(.github/scripts/get-version.sh docker-tag 7)
-          echo "tag=$IMAGE_TAG" >> "$GITHUB_OUTPUT"
-        env:
-          GITHUB_EVENT_PATH: ${{ github.event_path }}
-          GITHUB_SHA: ${{ github.event.pull_request.head.sha }}
-          GITHUB_REF: ${{ github.ref }}
-          GITHUB_EVENT_NAME: ${{ github.event_name }}
-
-  deploy:
-    name: Deploy to staging
-    needs: prepare
-    uses: ./.github/workflows/deploy-core.yml
-    with:
-      image_tag: ${{ needs.prepare.outputs.image_tag }}
-      sha: ${{ needs.prepare.outputs.sha }}
-      description: Deploy PR #${{ needs.prepare.outputs.pr_number }} to staging
-      pr_number: ${{ needs.prepare.outputs.pr_number }}
-    secrets: inherit
-
-  comment:
-    name: Comment deployment status
-    needs: [prepare, deploy]
-    if: always()
-    runs-on: ubuntu-latest
-    env:
-      GH_TOKEN: ${{ github.token }}
-      IMAGE_TAG: ${{ needs.prepare.outputs.image_tag }}
-      PR_NUMBER: ${{ needs.prepare.outputs.pr_number }}
-      REF_SHA: ${{ needs.prepare.outputs.sha }}
-      STATUS: ${{ needs.deploy.outputs.status }}
-    
-    steps:
-      - name: Comment on PR
-        run: |
-          if [ "$STATUS" = "success" ]; then
-            BODY=$(jq -nr --arg tag "$IMAGE_TAG" --arg sha "$REF_SHA" --arg url "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}" \
-              '"✅ **Staging deployment completed**\n\n🔗 **URL**: https://dev.opensourcepos.org\n📦 **Image Tag**: `\($tag)`\n🔨 **Commit**: \($sha)\n\nView logs: \($url)"')
-          else
-            BODY=$(jq -nr --arg url "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}" \
-              '"❌ **Staging deployment failed**\n\nCheck the [workflow logs](\($url)) for details."')
-          fi
-          
-          gh api "repos/${GITHUB_REPOSITORY}/issues/${PR_NUMBER}/comments" \
-            -X POST \
-            -f body="$BODY"
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,23 +0,0 @@
-name: Deploy
-
-on:
-  workflow_dispatch:
-    inputs:
-      image_tag:
-        description: 'Docker image tag to deploy (e.g., v3.4.0, latest)'
-        required: true
-        default: 'latest'
-
-permissions:
-  contents: read
-  deployments: write
-
-jobs:
-  deploy:
-    name: Deploy to staging
-    uses: ./.github/workflows/deploy-core.yml
-    with:
-      image_tag: ${{ inputs.image_tag }}
-      sha: ${{ github.sha }}
-      description: Deploy image ${{ inputs.image_tag }}
-    secrets: inherit
--- a/.github/workflows/install-script-test.yml
+++ b/.github/workflows/install-script-test.yml
@@ -1,131 +0,0 @@
-name: Install Script Test
-
-on:
-  push:
-    paths:
-      - 'scripts/install-ubuntu.sh'
-      - '.github/workflows/install-script-test.yml'
-  pull_request:
-    paths:
-      - 'scripts/install-ubuntu.sh'
-      - '.github/workflows/install-script-test.yml'
-  workflow_dispatch:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-permissions:
-  contents: read
-
-jobs:
-  install-test:
-    name: Test Install Script (${{ matrix.scenario }})
-    runs-on: ubuntu-22.04
-    timeout-minutes: 30
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - scenario: default
-            db_pass: ''
-          - scenario: custom-password
-            db_pass: 'TestPass123!'
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Make install script executable
-        run: chmod +x scripts/install-ubuntu.sh
-
-      - name: Run install script
-        env:
-          DB_PASS: ${{ matrix.db_pass }}
-        run: |
-          set -o pipefail
-          echo "Running install script with scenario: ${{ matrix.scenario }}"
-          sudo -E bash scripts/install-ubuntu.sh 2>&1 | tee install-output.log
-          echo "Install completed successfully"
-
-      - name: Wait for services to stabilize
-        run: sleep 10
-
-      - name: Verify Apache is running
-        run: |
-          echo "Checking Apache status..."
-          sudo systemctl status apache2 --no-pager
-          sudo systemctl is-active apache2
-
-      - name: Verify MariaDB is running
-        run: |
-          echo "Checking MariaDB status..."
-          sudo systemctl status mariadb --no-pager
-          sudo systemctl is-active mariadb
-
-      - name: Verify Apache HTTP response
-        run: |
-          echo "Testing HTTP response on port 80..."
-          HTTP_CODE=$(curl -s -o /dev/null -w "%{http_code}" http://localhost/)
-          echo "HTTP Response Code: $HTTP_CODE"
-          if [ "$HTTP_CODE" = "200" ] || [ "$HTTP_CODE" = "302" ]; then
-            echo "Apache is responding correctly"
-          elif [ "$HTTP_CODE" = "500" ]; then
-            echo "HTTP 500 - Application error. Checking .env configuration..."
-            sudo cat /var/www/ospos/.env 2>/dev/null | grep -E "database\.default\.(hostname|database|username|password)|encryption\.key|CI_ENVIRONMENT" | head -10
-            sudo cat /var/www/ospos/writable/logs/*.log 2>/dev/null | tail -20 || true
-            curl -s http://localhost/ | head -50
-            exit 1
-          else
-            echo "Unexpected HTTP code: $HTTP_CODE"
-            exit 1
-          fi
-
-      - name: Verify OSPOS login page
-        run: |
-          echo "Checking OSPOS login page..."
-          curl -s http://localhost/ | grep -qi "login\|password\|username" && echo "Login page content found" || {
-            echo "Login page verification failed"
-            curl -s http://localhost/ | head -50
-            exit 1
-          }
-
-      - name: Verify database exists
-        env:
-          DB_PASS: ${{ matrix.db_pass != '' && matrix.db_pass || '' }}
-        run: |
-          echo "Verifying database..."
-          
-          # Extract the generated password from install output if using default
-          if [ -z "${{ matrix.db_pass }}" ]; then
-            GENERATED_PASS=$(grep -oP 'Database Password: \K[^\s]+' install-output.log || true)
-            if [ -n "$GENERATED_PASS" ]; then
-              DB_PASS="$GENERATED_PASS"
-            fi
-          fi
-          
-          # Check database exists
-          sudo mysql -u root -e "SHOW DATABASES LIKE 'ospos';" | grep -q ospos && echo "Database 'ospos' exists" || {
-            echo "Database 'ospos' not found"
-            sudo mysql -u root -e "SHOW DATABASES;"
-            exit 1
-          }
-          
-          # Check tables exist
-          TABLE_COUNT=$(sudo mysql -u root ospos -e "SHOW TABLES;" | wc -l)
-          echo "Found $TABLE_COUNT tables in database"
-          if [ "$TABLE_COUNT" -gt 5 ]; then
-            echo "Database tables verified"
-          else
-            echo "Not enough tables found"
-            exit 1
-          fi
-
-      - name: Upload install log
-        uses: actions/upload-artifact@v4
-        if: always()
-        with:
-          name: install-log-${{ matrix.scenario }}
-          path: install-output.log
-          retention-days: 7
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -28,6 +28,7 @@ jobs:
      fail-fast: false
      matrix:
        php-version:
+          - '8.1'
          - '8.2'
          - '8.3'
          - '8.4'
--- a/.github/workflows/php-linter.yml
+++ b/.github/workflows/php-linter.yml
@@ -12,6 +12,14 @@ jobs:
        uses: actions/checkout@v4
        with:
          fetch-depth: 0
+      - name: PHP Lint 8.0
+        uses: dbfx/github-phplint/8.0@master
+        with:
+          folder-to-exclude: "! -path \"./vendor/*\" ! -path \"./folder/excluded/*\""   
+      - name: PHP Lint 8.1
+        uses: dbfx/github-phplint/8.1@master
+        with:
+          folder-to-exclude: "! -path \"./vendor/*\" ! -path \"./folder/excluded/*\""
      - name: PHP Lint 8.2
        uses: dbfx/github-phplint/8.2@master
        with:
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -1,121 +0,0 @@
-name: PHPUnit Tests
-
-on:
-  push:
-    paths:
-      - '**.php'
-      - 'spark'
-      - 'tests/**'
-      - '.github/workflows/phpunit.yml'
-      - 'gulpfile.js'
-      - 'app/Database/**'
-  pull_request:
-    paths:
-      - '**.php'
-      - 'spark'
-      - 'tests/**'
-      - '.github/workflows/phpunit.yml'
-      - 'gulpfile.js'
-      - 'app/Database/**'
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
-permissions:
-  contents: read
-
-jobs:
-  test:
-    name: PHP ${{ matrix.php-version }} Tests
-    runs-on: ubuntu-22.04
-
-    strategy:
-      fail-fast: false
-      matrix:
-        php-version:
-          - '8.2'
-          - '8.3'
-          - '8.4'
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-version }}
-          extensions: intl, mbstring, mysqli
-          coverage: none
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: '20'
-
-      - name: Get npm cache directory
-        run: echo "NPM_CACHE_DIR=$(npm config get cache)" >> $GITHUB_ENV
-
-      - name: Cache npm dependencies
-        uses: actions/cache@v3
-        with:
-          path: ${{ env.NPM_CACHE_DIR }}
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-
-
-      - name: Install npm dependencies
-        run: npm install
-
-      - name: Start MariaDB
-        run: |
-          docker run -d --name mysql \
-            -e MYSQL_ROOT_PASSWORD=root \
-            -e MYSQL_DATABASE=ospos \
-            -e MYSQL_USER=admin \
-            -e MYSQL_PASSWORD=pointofsale \
-            -p 3306:3306 \
-            mariadb:10.5
-          # Wait for MariaDB to be ready
-          until docker exec mysql mysqladmin ping -h 127.0.0.1 -u root -proot --silent; do
-            echo "Waiting for MariaDB..."
-            sleep 2
-          done
-          echo "MariaDB is ready!"
-
-      - name: Get composer cache directory
-        run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV
-
-      - name: Cache dependencies
-        uses: actions/cache@v3
-        with:
-          path: ${{ env.COMPOSER_CACHE_FILES_DIR }}
-          key: ${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-${{ matrix.php-version }}-
-            ${{ runner.os }}-
-
-      - name: Install dependencies
-        run: composer update --ansi --no-interaction
-
-      - name: Create .env file
-        run: cp .env.example .env
-
-      - name: Run PHPUnit tests
-        env:
-          CI_ENVIRONMENT: testing
-          MYSQL_HOST_NAME: 127.0.0.1
-        run: composer test -- --log-junit test-results/junit.xml
-
-      - name: Upload test results
-        uses: actions/upload-artifact@v4
-        if: always()
-        with:
-          name: test-results-php-${{ matrix.php-version }}
-          path: test-results/
-          retention-days: 30
-
-      - name: Stop MariaDB
-        if: always()
-        run: docker stop mysql && docker rm mysql
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,172 +0,0 @@
-name: Release Version Bump
-
-on:
-  workflow_dispatch:
-    inputs:
-      version_type:
-        description: 'Version bump type'
-        required: true
-        type: choice
-        options:
-          - minor
-          - major
-          - patch
-        default: 'minor'
-
-permissions:
-  contents: write
-
-jobs:
-  prepare-release:
-    name: Prepare Release
-    runs-on: ubuntu-22.04
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Get current version
-        id: current_version
-        run: |
-          CURRENT_VERSION=$(grep "application_version" app/Config/App.php | sed "s/.*= '\(.*\)';/\1/g")
-          echo "current_version=$CURRENT_VERSION" >> $GITHUB_OUTPUT
-          echo "Current version: $CURRENT_VERSION"
-
-      - name: Calculate new version
-        id: version
-        run: |
-          CURRENT_VERSION="${{ steps.current_version.outputs.current_version }}"
-          VERSION_TYPE="${{ github.event.inputs.version_type }}"
-          
-          # Parse current version
-          MAJOR=$(echo $CURRENT_VERSION | cut -d. -f1)
-          MINOR=$(echo $CURRENT_VERSION | cut -d. -f2)
-          PATCH=$(echo $CURRENT_VERSION | cut -d. -f3)
-          
-          # Bump version based on type
-          case $VERSION_TYPE in
-            major)
-              MAJOR=$((MAJOR + 1))
-              MINOR=0
-              PATCH=0
-              ;;
-            minor)
-              MINOR=$((MINOR + 1))
-              PATCH=0
-              ;;
-            patch)
-              PATCH=$((PATCH + 1))
-              ;;
-          esac
-          
-          NEW_VERSION="${MAJOR}.${MINOR}.${PATCH}"
-          echo "new_version=$NEW_VERSION" >> $GITHUB_OUTPUT
-          echo "previous_version=$CURRENT_VERSION" >> $GITHUB_OUTPUT
-          echo "New version: $NEW_VERSION (was: $CURRENT_VERSION, type: $VERSION_TYPE)"
-
-      - name: Update version in App.php
-        run: |
-          NEW_VERSION="${{ steps.version.outputs.new_version }}"
-          sed -i "s/public string \\\$application_version = '[^']*';/public string \\\$application_version = '$NEW_VERSION';/" app/Config/App.php
-          echo "Updated app/Config/App.php"
-
-      - name: Update version in package.json
-        run: |
-          NEW_VERSION="${{ steps.version.outputs.new_version }}"
-          sed -i "s/\"version\": \"[^\"]*\",/\"version\": \"$NEW_VERSION\",/" package.json
-          echo "Updated package.json"
-
-      - name: Update version in docker-compose.nginx.yml
-        run: |
-          NEW_VERSION="${{ steps.version.outputs.new_version }}"
-          sed -i "s/jekkos\/opensourcepos:[^ ]*/jekkos\/opensourcepos:$NEW_VERSION/" docker-compose.nginx.yml
-          echo "Updated docker-compose.nginx.yml"
-
-      - name: Update version in README.md
-        run: |
-          NEW_VERSION="${{ steps.version.outputs.new_version }}"
-          # Extract major.minor for the "latest X.Y version" text
-          MAJOR_MINOR=$(echo "$NEW_VERSION" | cut -d. -f1,2)
-          sed -i "s/The latest \`[0-9]*\.[0-9]*\` version/The latest \`${MAJOR_MINOR}\` version/" README.md
-          echo "Updated README.md with version ${MAJOR_MINOR}"
-
-      - name: Generate changelog
-        id: changelog
-        run: |
-          PREVIOUS_VERSION="${{ steps.version.outputs.previous_version }}"
-          NEW_VERSION="${{ steps.version.outputs.new_version }}"
-          
-          # Get commits since last version
-          if git rev-parse "$PREVIOUS_VERSION" >/dev/null 2>&1; then
-            COMMITS=$(git log "$PREVIOUS_VERSION"..HEAD --pretty=format:"- %s" --no-merges)
-          else
-            COMMITS=$(git log --pretty=format:"- %s" --no-merges -50)
-          fi
-          
-          # Create changelog entry
-          CHANGELOG_FILE="CHANGELOG.md"
-          
-          # Create the new version comparison link
-          NEW_LINK="[${NEW_VERSION}]: https://github.com/opensourcepos/opensourcepos/compare/${PREVIOUS_VERSION}...${NEW_VERSION}"
-          
-          # Insert new link after [unreleased] line
-          sed -i "/^\[unreleased\]/a $NEW_LINK" "$CHANGELOG_FILE"
-          
-          # Update [unreleased] link to start from new version
-          sed -i "s|^\[unreleased\]: .*|\[unreleased\]: https://github.com/opensourcepos/opensourcepos/compare/${NEW_VERSION}...HEAD|" "$CHANGELOG_FILE"
-          
-          # Create version header and content using temp file to avoid sed issues with special characters
-          VERSION_DATE=$(date +%Y-%m-%d)
-          VERSION_HEADER="## [$NEW_VERSION] - $VERSION_DATE"
-          
-          # Create temp file with changelog entry
-          TMP_FILE=$(mktemp)
-          {
-            echo ""
-            echo "$VERSION_HEADER"
-            echo ""
-            echo "$COMMITS"
-          } > "$TMP_FILE"
-          
-          # Insert after Unreleased header
-          sed -i "/^## \[Unreleased\]/r $TMP_FILE" "$CHANGELOG_FILE"
-          rm "$TMP_FILE"
-          
-          echo "Updated CHANGELOG.md"
-          echo "Changelog entries:"
-          echo "$COMMITS"
-
-      - name: Update version in issue templates
-        run: |
-          NEW_VERSION="${{ steps.version.outputs.new_version }}"
-          
-          # Calculate version to remove (keep 5 versions)
-          PREVIOUS_VERSION="${{ steps.version.outputs.previous_version }}"
-          
-          # Bug report template - insert new version after development (unreleased)
-          BUG_TEMPLATE=".github/ISSUE_TEMPLATE/bug report.yml"
-          sed -i "/- development (unreleased)/a\\        - OpenSourcePOS ${NEW_VERSION}" "$BUG_TEMPLATE"
-          # Remove the oldest version (5th version from the end)
-          sed -i "/OpenSourcePOS 3\\.3\\.7/d" "$BUG_TEMPLATE"
-          echo "Updated $BUG_TEMPLATE"
-          
-          # Feature request template - insert new version after development (unreleased)
-          FEATURE_TEMPLATE=".github/ISSUE_TEMPLATE/feature_request.yml"
-          sed -i "/- development (unreleased)/a\\        - OpenSourcePOS ${NEW_VERSION}" "$FEATURE_TEMPLATE"
-          # Remove the oldest version (5th version from the end)
-          sed -i "/OpenSourcePOS 3\\.3\\.7/d" "$FEATURE_TEMPLATE"
-          echo "Updated $FEATURE_TEMPLATE"
-
-      - name: Commit version bump
-        run: |
-          git config user.name "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-          
-          NEW_VERSION="${{ steps.version.outputs.new_version }}"
-          
-          git add app/Config/App.php package.json docker-compose.nginx.yml CHANGELOG.md README.md .github/ISSUE_TEMPLATE/
-          git commit -m "chore: release version $NEW_VERSION"
-          git push origin HEAD
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,6 @@ public/license/*
 !public/license/.gitkeep
 app/Config/email.php
 npm-debug.log*
-.vscode

 # Docker
 !docker/.env
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,54 @@
+sudo: required
+
+branches:
+  except:
+    - unstable
+    - weblate
+services:
+  - docker
+
+dist: jammy
+language: node_js
+node_js:
+  - 20
+script:
+  - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+  - docker run --rm -u $(id -u) -v $(pwd):/app opensourcepos/composer:ci4 composer install
+  - version=$(grep application_version app/Config/App.php | sed "s/.*=\s'\(.*\)';/\1/g")
+  - sed -i 's/production/development/g' .env
+  - sed -i "s/commit_sha1 = 'dev'/commit_sha1 = '$rev'/g" app/Config/OSPOS.php
+  - echo "$version-$branch-$rev"
+  - npm version "$version-$branch-$rev" --force || true
+  - sed -i 's/opensourcepos.tar.gz/opensourcepos.$version.tgz/g' package.json
+  - npm ci && npm install -g gulp && npm run build
+  - docker build . --target ospos -t ospos
+  - docker build . --target ospos_test -t ospos_test
+  - docker run --rm ospos_test /app/vendor/bin/phpunit --testdox
+  - docker build app/Database/ -t "jekkos/opensourcepos:sql-$TAG"
+env:
+  global:
+  - BRANCH=$(echo ${TRAVIS_BRANCH} | sed s/feature\\///)
+  - TAG=${TRAVIS_TAG:-$BRANCH}
+  - date=`date +%Y%m%d%H%M%S` && branch=${TRAVIS_BRANCH} && rev=`git rev-parse --short=6 HEAD`
+after_success:
+  - docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" && docker tag "ospos:latest"
+    "jekkos/opensourcepos:$TAG" && docker push "jekkos/opensourcepos:$TAG" && docker push "jekkos/opensourcepos:sql-$TAG"
+  - gulp compress
+  - mv dist/opensourcepos.tar.gz "dist/opensourcepos.$version.$rev.tgz"
+  - mv dist/opensourcepos.zip "dist/opensourcepos.$version.$rev.zip"
+deploy:
+  - provider: releases
+    edge: true
+    file: dist/opensourcepos.$version.$rev.zip
+    name: "Unstable OpensourcePos"
+    overwrite: true
+    release_notes: "This is a build of the latest master which might contain bugs. Use at your own risk. Check releases section for the latest official release"
+    prerelease: true
+    tag_name: unstable
+    user: jekkos
+
+    api_key:
+      secure: "KOukL8IFf/uL/BjMyCSKjf2vylydjcWqgEx0eMqFCg3nZ4ybMaOwPORRthIfyT72/FvGX/aoxxEn0uR/AEtb+hYQXHmNS+kZdX72JCe8LpGuZ7FJ5X+Eo9mhJcsmS+smd1sC95DySSc/GolKPo+0WtJYONY/xGCLxm+9Ay4HREg="
+
+    on:
+      branch: master
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -1,40 +0,0 @@
-# Agent Instructions
-
-This document provides guidance for AI agents working on the Open Source Point of Sale (OSPOS) codebase.
-
-## Code Style
-
- Follow PHP CodeIgniter 4 coding standards
- Run PHP-CS-Fixer before committing: `vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.no-header.php`
- Write PHP 8.1+ compatible code with proper type declarations
- Use PSR-12 naming conventions: `camelCase` for variables and functions, `PascalCase` for classes, `UPPER_CASE` for constants
-
-## Development
-
- Create a new git worktree for each issue, based on the latest state of `origin/master`
- Commit fixes to the worktree and push to the remote
-
-## Testing
-
- Run PHPUnit tests: `composer test`
- Tests must pass before submitting changes
-
-## Build
-
- Install dependencies: `composer install && npm install`
- Build assets: `npm run build` or `gulp`
-
-## Conventions
-
- Controllers go in `app/Controllers/`
- Models go in `app/Models/`
- Views go in `app/Views/`
- Database migrations in `app/Database/Migrations/`
- Use CodeIgniter 4 framework patterns and helpers
- Sanitize user input; escape output using `esc()` helper
-
-## Security
-
- Never commit secrets, credentials, or `.env` files
- Use parameterized queries to prevent SQL injection
- Validate and sanitize all user input
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
-[unreleased]: https://github.com/opensourcepos/opensourcepos/compare/3.4.1...HEAD
+[unreleased]: https://github.com/opensourcepos/opensourcepos/compare/3.4.0...HEAD
+[3.4.2]: https://github.com/opensourcepos/opensourcepos/compare/3.4.1...3.4.2
 [3.4.1]: https://github.com/opensourcepos/opensourcepos/compare/3.4.0...3.4.1
 [3.4.0]: https://github.com/opensourcepos/opensourcepos/compare/3.3.9...3.4.0
 [3.3.9]: https://github.com/opensourcepos/opensourcepos/compare/3.3.8...3.3.9
@@ -33,36 +34,10 @@ All notable changes to this project will be documented in this file.

 ## [Unreleased]

-## [3.4.1] - 2025-06-05
- Feature: PSR-12 Compliant Indentation by @objecttothis in ([#4196](https://github.com/opensourcepos/opensourcepos/pull/4196))
- Add .env to dist zip by @jekkos in ([#4199](https://github.com/opensourcepos/opensourcepos/pull/4199))
- Add CI4 coding standards linter ([#3708](https://github.com/opensourcepos/opensourcepos/issues/3708)) by @jekkos in ([#4198](https://github.com/opensourcepos/opensourcepos/pull/4198))
- Bump canvg from 3.0.10 to 3.0.11 by @dependabot in ([#4189](https://github.com/opensourcepos/opensourcepos/pull/4189))
- Bump jspdf and jspdf-autotable by @dependabot in ([#4190](https://github.com/opensourcepos/opensourcepos/pull/4190))
- Feature bump ci to 4.6.0 by @objecttothis in ([#4197](https://github.com/opensourcepos/opensourcepos/pull/4197))
- Add Kurdish language option to UI by @BudsieBuds in ([#4210](https://github.com/opensourcepos/opensourcepos/pull/4210))
- Convert language ku to ckb by @BudsieBuds in ([#4211](https://github.com/opensourcepos/opensourcepos/pull/4211))
- Fix PHP 8.4 errors by @BudsieBuds in ([#4215](https://github.com/opensourcepos/opensourcepos/pull/4215))
- Add default bootstrap to themes by @BudsieBuds in ([#4219](https://github.com/opensourcepos/opensourcepos/pull/4219))
- Update language names by @BudsieBuds in ([#4218](https://github.com/opensourcepos/opensourcepos/pull/4218))
- Update install docs by @BudsieBuds in ([#4217](https://github.com/opensourcepos/opensourcepos/pull/4217))
- Convert menu icons to SVG by @BudsieBuds in ([#4220](https://github.com/opensourcepos/opensourcepos/pull/4220))
- Enhance license handling by @BudsieBuds in ([#4223](https://github.com/opensourcepos/opensourcepos/pull/4223))
- Fix datetime rendering ([#4226](https://github.com/opensourcepos/opensourcepos/issues/4226)) by @jekkos in ([#4227](https://github.com/opensourcepos/opensourcepos/pull/4227))
- Fix datetime rendering by @jekkos in ([#4228](https://github.com/opensourcepos/opensourcepos/pull/4228))
- Fix null error when sending by email a receipt of a sale that has no invoice by @diego-ramos in ([#4229](https://github.com/opensourcepos/opensourcepos/pull/4229))
- Update Receivings.php to save form. by @odiea in ([#4231](https://github.com/opensourcepos/opensourcepos/pull/4231))
- Update Cashups.php for ajax cashup total to work. by @odiea in ([#4238](https://github.com/opensourcepos/opensourcepos/pull/4238))
- Coding style updates for PSR-12 compliance & improved readability by @BudsieBuds in ([#4204](https://github.com/opensourcepos/opensourcepos/pull/4204))
- Fix Codeigniter disallowed characters error with payment types that have accents by @diego-ramos in ([#4232](https://github.com/opensourcepos/opensourcepos/pull/4232))
- Fixed broken escape string for success & warning messages by @Franchovy in ([#4253](https://github.com/opensourcepos/opensourcepos/pull/4253))
- Bugfix constraint migration fix by @objecttothis in ([#4230](https://github.com/opensourcepos/opensourcepos/pull/4230))
- Fix item number lookup in sales/receivings ([#4212](https://github.com/opensourcepos/opensourcepos/issues/4212)) by @jekkos in ([#4250](https://github.com/opensourcepos/opensourcepos/pull/4250))
-
-## [3.4.0] - 2025-03-23
+## [3.4.0] - 2025-02-06

 - Translation updates (Spanish, Indonesian, Swedish, Urdu, Chinese, Thai, French, Dutch)
- PHP `8.x` support
+- PHP 8.x support
 - Security fixes (XSS, SQLi)
 - Migration to Gulp as buildsystem
 - Decimal validation fix
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,85 +1,98 @@
-[comment]: # (Contributor Covenant 2.1 - from https://www.contributor-covenant.org/version/2/1/code_of_conduct/code_of_conduct.md)
-
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, caste, color, religion, or sexual identity and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our community include:
+Contributor Covenant Code of Conduct
+Our Pledge
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, caste, color, religion, or sexual
+identity and orientation.
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+Our Standards
+Examples of behavior that contributes to a positive environment for our
+community include:

 * Demonstrating empathy and kindness toward other people
 * Being respectful of differing opinions, viewpoints, and experiences
 * Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the overall community
+* Accepting responsibility and apologizing to those affected by our mistakes,
+and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall
+community

 Examples of unacceptable behavior include:

-* The use of sexualized language or imagery, and sexual attention or advances of any kind
+* The use of sexualized language or imagery, and sexual attention or advances of
+any kind
 * Trolling, insulting or derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing others' private information, such as a physical or email address, without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
+* Publishing others’ private information, such as a physical or email address,
+without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+professional setting

-## Enforcement Responsibilities
+Enforcement Responsibilities
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+Scope
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official email address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+Enforcement
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+[INSERT CONTACT METHOD].
+All complaints will be reviewed and investigated promptly and fairly.
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+Enforcement Guidelines
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+1. Correction
+Community Impact: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+Consequence: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+2. Warning
+Community Impact: A violation through a single incident or series of
+actions.
+Consequence: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or permanent
+ban.
+3. Temporary Ban
+Community Impact: A serious violation of community standards, including
+sustained inappropriate behavior.
+Consequence: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+4. Permanent Ban
+Community Impact: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+Consequence: A permanent ban from any sort of public interaction within the
+community.
+Attribution
+This Code of Conduct is adapted from the Contributor Covenant,
+version 2.1, available at
+https://www.contributor-covenant.org/version/2/1/code_of_conduct.html.
+Community Impact Guidelines were inspired by
+Mozilla’s code of conduct enforcement ladder.
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

-Community leaders are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, or harmful.

-Community leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for moderation decisions when appropriate.
-
-## Scope
-
-This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing the community in public spaces. Examples of representing our community include using an official e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at [INSERT CONTACT METHOD]. All complaints will be reviewed and investigated promptly and fairly.
-
-All community leaders are obligated to respect the privacy and security of the reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series of actions.
-
-**Consequence**: A warning with consequences for continued behavior. No interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding interactions in community spaces as well as external channels like social media. Violating these terms may lead to a temporary or permanent ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior, harassment of an individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within the community.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 2.1, available at [https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
-
-Community Impact Guidelines were inspired by [Mozilla's code of conduct enforcement ladder][Mozilla CoC].
-
-For answers to common questions about this code of conduct, see the FAQ at [https://www.contributor-covenant.org/faq][FAQ]. Translations are available at [https://www.contributor-covenant.org/translations][translations].
-
-[homepage]: https://www.contributor-covenant.org
-[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
-[Mozilla CoC]: https://github.com/mozilla/diversity
-[FAQ]: https://www.contributor-covenant.org/faq
-[translations]: https://www.contributor-covenant.org/translations
--- a/33
+++ b/33
@@ -1,23 +1,28 @@
 FROM php:8.2-apache AS ospos
 LABEL maintainer="jekkos"

-RUN apt-get update && apt-get install -y --no-install-recommends \
-    libicu-dev \
-    libgd-dev \
-    && docker-php-ext-install mysqli bcmath intl gd \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* \
-    && a2enmod rewrite
-
+RUN apt update && apt-get install -y libicu-dev libgd-dev
+RUN a2enmod rewrite
+RUN docker-php-ext-install mysqli bcmath intl gd
 RUN echo "date.timezone = \"\${PHP_TIMEZONE}\"" > /usr/local/etc/php/conf.d/timezone.ini

 WORKDIR /app
-COPY --chown=www-data:www-data . /app
-RUN chmod 750 /app/writable/logs /app/writable/uploads /app/writable/cache /app/public/uploads /app/public/uploads/item_pics \
-    && chmod 640 /app/writable/uploads/importCustomers.csv \
-    && ln -s /app/*[^public] /var/www \
-    && rm -rf /var/www/html \
-    && ln -nsf /app/public /var/www/html
+COPY . /app
+RUN ln -s /app/*[^public] /var/www && rm -rf /var/www/html && ln -nsf /app/public /var/www/html
+RUN chmod -R 770 /app/writable/uploads /app/writable/logs /app/writable/cache && chown -R www-data:www-data /app
+
+FROM ospos AS ospos_test
+
+COPY --from=composer /usr/bin/composer /usr/bin/composer
+
+RUN apt-get install -y libzip-dev wget git
+RUN wget https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh -O /bin/wait-for-it.sh && chmod +x /bin/wait-for-it.sh
+RUN docker-php-ext-install zip
+RUN composer install -d/app
+#RUN sed -i 's/backupGlobals="true"/backupGlobals="false"/g' /app/tests/phpunit.xml
+WORKDIR /app/tests
+
+CMD ["/app/vendor/phpunit/phpunit/phpunit", "/app/test/helpers"]

 FROM ospos AS ospos_dev

--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1,68 +1,27 @@
 ## Server Requirements

- PHP version `8.2` to `8.4` are supported, PHP version `≤ 8.1` is NOT supported. Please note that PHP needs to have the extensions `php-json`, `php-gd`, `php-bcmath`, `php-intl`, `php-openssl`, `php-mbstring`, `php-curl` and `php-xml` installed and enabled. An unstable master build can be downloaded in the releases section.
+- PHP version `8.1` to `8.4` are supported, PHP version `≤7.4` is NOT supported. Please note that PHP needs to have the extensions `php-json`, `php-gd`, `php-bcmath`, `php-intl`, `php-openssl`, `php-mbstring`, `php-curl` and `php-xml` installed and enabled. An unstable master build can be downloaded in the releases section.
 - MySQL `5.7` is supported, also MariaDB replacement `10.x` is supported and might offer better performance.
 - Apache `2.4` is supported. Nginx should work fine too, see [wiki page here](https://github.com/opensourcepos/opensourcepos/wiki/Local-Deployment-using-LEMP).
 - Raspberry PI based installations proved to work, see [wiki page here](<https://github.com/opensourcepos/opensourcepos/wiki/Installing-on-Raspberry-PI---Orange-PI-(Headless-OSPOS)>).
 - For Windows based installations please read [the wiki](https://github.com/opensourcepos/opensourcepos/wiki). There are closed issues about this subject, as this topic has been covered a lot.

-## Security Configuration
-
-### Allowed Hostnames (REQUIRED for Production)
-
-⚠️ **CRITICAL**: OpenSourcePOS validates the Host header to prevent Host Header Injection attacks (GHSA-jchf-7hr6-h4f3). **You MUST configure `app.allowedHostnames` for production deployments. If not configured, the application will fail to start.**
-
-**Add to your `.env` file:**
-
-```bash
-# Comma-separated list of allowed hostnames (no protocols or ports)
-app.allowedHostnames = 'yourdomain.com,www.yourdomain.com'
-```
-
-**For local development:**
-
-```bash
-app.allowedHostnames = 'localhost'
-```
-
-**If you see this error at startup:**
-
-```text
-RuntimeException: Security: allowedHostnames is not configured.
-```
-
-**Solution**: Add `app.allowedHostnames` to your `.env` file with your domain(s).
-
-**Why this matters:**
- Prevents Host Header Injection attacks (GHSA-jchf-7hr6-h4f3)
- Ensures URLs are generated with the correct domain
- Security advisory: https://github.com/opensourcepos/opensourcepos/security/advisories/GHSA-jchf-7hr6-h4f3
- Fixes issue #4480: .env configuration now works via comma-separated values
-
-### HTTPS Behind Proxy
-
-If your installation is behind a proxy with SSL offloading, set:
-```
-FORCE_HTTPS = true
-```
-
 ## Local install

-First of all, if you're seeing the message `system folder missing` after launching your browser, that most likely means you have cloned the repository and have not built the project. To build the project from a source commit point instead of from an official release check out [Building OSPOS](BUILD.md). Otherwise, continue with the following steps.
+First of all, if you're seeing the message `system folder missing` after launching your browser, or cannot find `database.sql`, that most likely means you have cloned the repository and have not built the project.  To build the project from a source commit point instead of from an official release check out [Building OSPOS](BUILD.md). Otherwise, continue with the following steps.

 1. Download the a [pre-release for a specific branch](https://github.com/opensourcepos/opensourcepos/releases) or the latest stable [from GitHub here](https://github.com/opensourcepos/opensourcepos/releases). A repository clone will not work unless know how to build the project.
 2. Create/locate a new MySQL database to install Open Source Point of Sale into.
-3. Unzip and upload Open Source Point of Sale files to the web-server.
-4. If `.env` does not exist, copy `.env.example` to `.env`.
-5. Open `.env` and modify credentials to connect to your database if needed.
-6. The database schema will be automatically created when you first access the application. Migrations run automatically on fresh installs.
+3. Execute the file `app/Database/database.sql` to create the tables needed.
+4. Unzip and upload Open Source Point of Sale files to the web-server.
+5. Open `.env` file and modify credentials to connect to your database if needed.
 7. Go to your install `public` dir via the browser.
 8. Log in using
   - Username: admin
   - Password: pointofsale
 9. If everything works, then set the `CI_ENVIRONMENT` variable to `production` in the .env file
-10. Enjoy!
-11. Oops, an issue? Please make sure you read the FAQ, wiki page, and you checked open and closed issues on GitHub. PHP `display_errors` is disabled by default. Create an` app/Config/.env` file from the `.env.example` to enable it in a development environment.
+9. Enjoy!
+10. Oops, an issue? Please make sure you read the FAQ, wiki page, and you checked open and closed issues on GitHub. PHP `display_errors` is disabled by default. Create an` app/Config/.env` file from the `.env.example` to enable it in a development environment.

 ## Local install using Docker

@@ -102,73 +61,5 @@ Do **not** use below command on live deployments unless you want to tear everyth

 ## Cloud install

-### Recommended: DigitalOcean
-
-Sign up through [our referral link](https://m.do.co/c/ac38c262507b) to get a [**$100, 60-day credit**](https://m.do.co/c/ac38c262507b).
-
-1. Create an Ubuntu 20.04+ or 22.04+ droplet
-2. SSH into your server: `ssh root@<your-droplet-ip>`
-3. Run the one-line installer:
-   ```bash
-   curl -sSL https://opensourcepos.org/install | sudo bash
-   ```
-
-The installer will:
- Install Apache, MariaDB, PHP 8.2 and required extensions
- Download the **latest stable release** of OSPOS from GitHub
- Create a database with secure random password
- Configure OSPOS and Apache
- **Set up SSL/TLS certificates** (interactive prompt or environment variables)
- Display login credentials after completion
-
-**Interactive Mode (Recommended for first-time users):**
-
-When run without environment variables, the installer will prompt you:
-1. Whether to configure SSL (recommended for production)
-2. Your domain name (e.g., `pos.example.com`)
-3. Your email for Let's Encrypt (for production SSL)
-
-```bash
-curl -sSL https://opensourcepos.org/install | sudo bash
-# Script will ask:
-# - Configure SSL? (y/n)
-# - Domain name: pos.example.com
-# - Email for Let's Encrypt: admin@example.com
-```
-
-**Non-Interactive Mode (for automation):**
-
-```bash
-# Development (no SSL)
-curl -sSL https://opensourcepos.org/install | APACHE_SERVER_NAME=localhost sudo -E bash
-
-# Production with Let's Encrypt SSL
-curl -sSL https://opensourcepos.org/install | APACHE_SERVER_NAME=pos.example.com SSL_EMAIL=admin@example.com sudo -E bash
-
-# Custom database password
-curl -sSL https://opensourcepos.org/install | DB_PASS=securepassword APACHE_SERVER_NAME=pos.example.com SSL_EMAIL=admin@example.com sudo -E bash
-```
-
-**Environment variables:**
- `DB_HOST` - Database host (default: localhost)
- `DB_NAME` - Database name (default: ospos)
- `DB_USER` - Database user (default: ospos)
- `DB_PASS` - Database password (default: auto-generated)
- `MYSQL_ROOT_PASS` - MariaDB root password (default: empty/no password)
- `OSPOS_DIR` - Installation directory (default: /var/www/ospos)
- `OSPOS_VERSION` - OSPOS version to install (default: latest stable release)
- `PHP_VERSION` - PHP version (default: 8.2)
- `APACHE_SERVER_NAME` - Server hostname (default: localhost, or set interactively)
- `SSL_EMAIL` - Email for Let's Encrypt. When set, enables production SSL with auto-renewal
- `SSL_DOMAIN` - Alternative to `APACHE_SERVER_NAME` for SSL certificate domain
-
-> **Testing:** This installer is tested with each commit via our CI workflow. A fresh Ubuntu container is spawned, the script runs to completion, and basic sanity checks verify the installation. For production deployments, we recommend testing on a staging server first. If you encounter issues, please [open an issue](https://github.com/opensourcepos/opensourcepos/issues/new?template=bug_report.yml) with your server version and error output.
-
-> **Note:** If the short URL is unavailable, use the direct GitHub URL:
-> ```bash
-> curl -sSL https://raw.githubusercontent.com/opensourcepos/opensourcepos/master/scripts/install-ubuntu.sh | sudo bash
-> ```
-
-For other cloud providers or manual installation, see the [detailed installation guide](https://github.com/opensourcepos/opensourcepos/wiki/Getting-Started-installations) in the wiki.
-
-**Important:** Change the default password after first login!
+If you choose DigitalOcean:
+[Through this link](https://m.do.co/c/ac38c262507b), you will get a [**free $100, 60-day credit**](https://m.do.co/c/ac38c262507b). [Check the wiki](https://github.com/opensourcepos/opensourcepos/wiki/Getting-Started-installations) for further instructions on how to install the necessary components.
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 </p>

 <p align="center">
-<a href="https://github.com/opensourcepos/opensourcepos/actions/workflows/build-release.yml" target="_blank"><img src="https://github.com/opensourcepos/opensourcepos/actions/workflows/build-release.yml/badge.svg" alt="Build Status"></a>
+<a href="https://app.travis-ci.com/opensourcepos/opensourcepos" target="_blank"><img src="https://api.travis-ci.com/opensourcepos/opensourcepos.svg?branch=master" alt="Build Status"></a>
 <a href="https://app.gitter.im/#/room/#opensourcepos_Lobby:gitter.im?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge" target="_blank"><img src="https://badges.gitter.im/jekkos/opensourcepos.svg" alt="Join the chat at https://app.gitter.im"></a>
 <a href="https://badge.fury.io/gh/opensourcepos%2Fopensourcepos" target="_blank"><img src="https://badge.fury.io/gh/opensourcepos%2Fopensourcepos.svg" alt="Project Version"></a>
 <a href="https://translate.opensourcepos.org/engage/opensourcepos/?utm_source=widget" target="_blank"><img src="https://translate.opensourcepos.org/widgets/opensourcepos/-/svg-badge.svg" alt="Translation Status"></a>
@@ -102,11 +102,11 @@ NOTE: If you're running non-release code, please make sure you always run the la

 - If you have suhosin installed and face an issue with CSRF, please make sure you read [issue #1492](https://github.com/opensourcepos/opensourcepos/issues/1492).

- PHP `≥ 8.2` is required to run this app.
+- PHP `≥ 8.1` is required to run this app.

 ## 🏃 Keep the Machine Running

-If you like our project, please consider buying us a coffee through the button below so we can keep adding features. Please star the project if you like it!
+If you like our project, please consider buying us a coffee through the button below so we can keep adding features.

 [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=MUN6AEG7NY6H8)\
 Or refer to the [FUNDING.yml](.github/FUNDING.yml) file.
@@ -137,7 +137,7 @@ Any person or company found breaching the license agreement might find a bunch o

 ## 🙏 Credits

-| <div align="center">DigitalOcean</div> | <div align="center">JetBrains</div> | <div align="center">GitHub</div> |
+| <div align="center">DigitalOcean</div> | <div align="center">JetBrains</div> | <div align="center">Travis CI</div> |
 | --- | --- | --- |
-| <div align="center"><a href="https://www.digitalocean.com?utm_medium=opensource&utm_source=opensourcepos" target="_blank"><img src="https://github.com/user-attachments/assets/fbbf7433-ed35-407d-8946-fd03d236d350" alt="DigitalOcean Logo" height="50"></a></div> | <div align="center"><a href="https://www.jetbrains.com/idea/" target="_blank"><img src="https://github.com/opensourcepos/opensourcepos/assets/12870258/187f9bbe-4484-475c-9b58-5e5d5f931f09" alt="IntelliJ IDEA Logo" height="50"></a></div> | <div align="center"><a href="https://github.com/features/actions" target="_blank"><img src="https://github.githubassets.com/images/modules/site/icons/eyebrow-panel/actions-icon.svg" alt="GitHub Actions Logo" height="50"></a></div> |
-| Many thanks to [DigitalOcean](https://www.digitalocean.com) for providing the project with hosting credits. | Many thanks to [JetBrains](https://www.jetbrains.com/) for providing a free license of [IntelliJ IDEA](https://www.jetbrains.com/idea/) to kindly support the development of OSPOS. | Many thanks to [GitHub](https://github.com) for providing free continuous integration via GitHub Actions for open-source projects. |
+| <div align="center"><a href="https://www.digitalocean.com?utm_medium=opensource&utm_source=opensourcepos" target="_blank"><img src="https://github.com/user-attachments/assets/fbbf7433-ed35-407d-8946-fd03d236d350" alt="DigitalOcean Logo" height="50"></a></div> | <div align="center"><a href="https://www.jetbrains.com/idea/" target="_blank"><img src="https://github.com/opensourcepos/opensourcepos/assets/12870258/187f9bbe-4484-475c-9b58-5e5d5f931f09" alt="IntelliJ IDEA Logo" height="50"></a></div> | <div align="center"><a href="https://www.travis-ci.com/" target="_blank"><img src="https://github.com/opensourcepos/opensourcepos/assets/12870258/71cc2b44-83af-4510-a543-6358285f43c6" alt="Travis CI Logo" height="50"></a></div> |
+| Many thanks to [DigitalOcean](https://www.digitalocean.com) for providing the project with hosting credits. | Many thanks to [JetBrains](https://www.jetbrains.com/) for providing a free license of [IntelliJ IDEA](https://www.jetbrains.com/idea/) to kindly support the development of OSPOS. | Many thanks to [Travis CI](https://www.travis-ci.com/) for providing a free continuous integration service for open source projects. |
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,137 +1,25 @@
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->

+
 - [Security Policy](#security-policy)
  - [Supported Versions](#supported-versions)
-  - [Security Advisories](#security-advisories)
  - [Reporting a Vulnerability](#reporting-a-vulnerability)
-  - [Disclosure Process](#disclosure-process)

-<!-- END doctoc generated TOC please keep comment here to allow update -->
+<!-- END doctoc generated TOC please keep comment here to allow auto update -->

 # Security Policy

 ## Supported Versions

-We release patches for security vulnerabilities.
+We release patches for security vulnerabilities. Which versions are eligible to receive such patches depend on the CVSS v3.0 Rating:

-| Version   | Supported          |
-| --------- | ------------------ |
-| >= 3.4.2  | :white_check_mark: |
-| < 3.4.2   | :x:                |
-
-## Security Advisories
-
-For a complete list of published and draft security advisories with CVE details, see our [GitHub Security Advisories page](https://github.com/opensourcepos/opensourcepos/security/advisories).
+| CVSS v3.0 | Supported Versions                                 |
+| --------- | -------------------------------------------------- |
+| 7.3       | 3.3.5                                              |
+| 9.8       | 3.3.6                                              |
+| 6.8       | 3.4.2                                              |

 ## Reporting a Vulnerability

-**Option 1: GitHub Security Advisory (Preferred)**
-
-1. Create a draft security advisory directly on GitHub:
-   - Go to https://github.com/opensourcepos/opensourcepos/security/advisories
-   - Click "New draft security advisory"
-   - Fill in the vulnerability details using our [template below](#vulnerability-template)
-   - Submit as **draft** (not published)
-
-2. Notify us for triage:
-   - Send an email to **[jeroen@steganos.dev](mailto:jeroen@steganos.dev)** with:
-     - Subject: `[GHSA] Brief description of vulnerability`
-     - Link to the draft advisory
-     - Brief summary
-
-**Option 2: Email Report**
-
-Send vulnerability details to **[jeroen@steganos.dev](mailto:jeroen@steganos.dev)**.
-
-You will receive a response within 48 hours. Confirmed vulnerabilities will be patched within a few days depending on complexity.
-
-## Disclosure Process
-
-### Timeline
-
-| Step | Timeline | Action |
-|------|----------|--------|
-| 1. Report received | Day 0 | We acknowledge within 48 hours |
-| 2. Triage & confirmation | Day 1-3 | We validate the vulnerability |
-| 3. Fix development | Day 3-7 | We develop and test the fix |
-| 4. Patch release | Day 7-10 | We release a security patch |
-| 5. CVE request | Day 7-14 | We request CVE from GitHub (if applicable) |
-| 6. Advisory published | Day 14 | We publish the advisory with credit |
-| 7. Public disclosure | Day 14+ | Full disclosure after patch release |
-
-### CVE Process
-
-**We request CVE identifiers through GitHub's security advisory system.** This is the preferred and easiest method:
-
-1. After we confirm and fix the vulnerability, we'll request a CVE through GitHub
-2. GitHub coordinates with MITRE on our behalf
-3. The CVE is automatically linked to the advisory
-4. You'll be credited as the reporter in the published advisory
-
-**Already have a CVE?** If you've already obtained a CVE from another source (e.g., VulDB, CVE.MITRE.ORG), please include it in your report or advisory. We'll update our advisory to reference the existing CVE.
-
-### No Bug Bounty Program
-
-**Important:** Open Source Point of Sale does not offer a bug bounty program.
-
- All security research and vulnerability triage is done on a **voluntary basis** in our free time
- We do not offer monetary rewards for vulnerability reports
- We do credit reporters in published advisories (unless anonymity is requested)
- We greatly appreciate the security research community's efforts to help improve project security
-
-### Security Best Practices for Researchers
-
- **Do not** access, modify, or delete data that doesn't belong to you
- **Do not** perform denial of service attacks
- **Do not** publicly disclose vulnerabilities before we've had time to fix them
- **Do** provide sufficient information to reproduce the vulnerability
- **Do** allow us reasonable time to fix before public disclosure
- **Do** report through official channels (GitHub advisories or email)
-
-### Vulnerability Template
-
-When creating a draft advisory, please include:
-
-```
-## Summary
-[Brief description of the vulnerability]
-
-## Impact
- **Confidentiality:** [High/Medium/Low - what data can be exposed]
- **Integrity:** [High/Medium/Low - what can be modified]
- **Availability:** [High/Medium/Low - service disruption potential]
- **Privilege Required:** [None/Low/High - authentication level needed]
- **CVSS v3.1:** [Score] ([Vector string])
-
-## Details
-[Technical details about the vulnerability]
-
-**Affected Code:**
-```php
-// Path to affected file and vulnerable code
-```
-
-**Attack Vector:**
-[How an attacker can exploit this]
-
-## Proof of Concept
-```bash
-# Steps to reproduce
-```
-
-## Patch
-[Suggested fix or approach]
-
-## Affected Versions
- OpenSourcePOS X.Y.Z and earlier
-
-## Credit
-[Your GitHub username or preferred name]
-```
-
---
-
-**Thank you to all security researchers who have contributed to making Open Source Point of Sale more secure.** Your voluntary efforts help protect thousands of users worldwide and contribute to a safer, more trustworthy free and open-source software ecosystem. We deeply appreciate your responsible disclosure and the time you invest in improving our project.
-
-If you've reported a vulnerability and would like to discuss CVE coordination or have questions about the process, please reach out to us at [jeroen@steganos.dev](mailto:jeroen@steganos.dev).
+Please report (suspected) security vulnerabilities to **[jeroen@steganos.dev](mailto:jeroen@steganos.dev)**. You will receive a response from us within 48 hours. If the issue is confirmed, we will release a patch as soon as possible depending on complexity but historically within a few days.
--- a/app/Config/App.php
+++ b/app/Config/App.php
@@ -58,9 +58,9 @@ class App extends BaseConfig
     * Allowed Hostnames in the Site URL other than the hostname in the baseURL.
     * If you want to accept multiple Hostnames, set this.
     *
-     * Or via environment variable (useful for Docker/Compose):
-     *   ALLOWED_HOSTNAMES=example.com,www.example.com
-     * 
+     * E.g.,
+     * When your site URL ($baseURL) is 'http://example.com/', and your site
+     * also accepts 'http://media.example.com/' and 'http://accounts.example.com/':
     *     ['media.example.com', 'accounts.example.com']
     *
     * @var list<string>
@@ -278,83 +278,14 @@ class App extends BaseConfig
     * @see http://www.html5rocks.com/en/tutorials/security/content-security-policy/
     * @see http://www.w3.org/TR/CSP/
     */
-    public bool $CSPEnabled = false;
+    public bool $CSPEnabled = false;    // TODO: Currently CSP3 tags are not supported so enabling this causes problems with script-src-elem, style-src-attr and style-src-elem

    public function __construct()
    {
        parent::__construct();
-
-        // Solution for CodeIgniter 4 limitation: arrays cannot be set from .env
-        // See: https://github.com/codeigniter4/CodeIgniter4/issues/7311
-        // Support both: app.allowedHostnames (from .env) and ALLOWED_HOSTNAMES (from environment/Docker)
-        $envAllowedHostnames = getenv('ALLOWED_HOSTNAMES');
-        if ($envAllowedHostnames === false || trim($envAllowedHostnames) === '') {
-            $envAllowedHostnames = getenv('app.allowedHostnames');
-        }
-        if ($envAllowedHostnames !== false && trim($envAllowedHostnames) !== '') {
-            $this->allowedHostnames = array_values(array_filter(
-                array_map('trim', explode(',', $envAllowedHostnames)),
-                static fn (string $hostname): bool => $hostname !== ''
-            ));
-        }
-
        $this->https_on = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') || (isset($_ENV['FORCE_HTTPS']) && $_ENV['FORCE_HTTPS'] == 'true');
-
-        $host = $this->getValidHost();
        $this->baseURL = $this->https_on ? 'https' : 'http';
-        $this->baseURL .= '://' . $host . '/';
+        $this->baseURL .= '://' . ((isset($_SERVER['HTTP_HOST'])) ? $_SERVER['HTTP_HOST'] : 'localhost') . '/';
        $this->baseURL .= str_replace(basename($_SERVER['SCRIPT_NAME']), '', $_SERVER['SCRIPT_NAME']);
    }
-
-    /**
-     * Validates and returns a trusted hostname.
-     *
-     * Security: Prevents Host Header Injection attacks (GHSA-jchf-7hr6-h4f3)
-     * by validating the HTTP_HOST against a whitelist of allowed hostnames.
-     *
-     * In production: Fails fast if allowedHostnames is not configured.
-     * In development: Allows localhost fallback with an error log.
-     *
-     * @return string A validated hostname
-     * @throws \RuntimeException If allowedHostnames is not configured in production
-     */
-    private function getValidHost(): string
-    {
-        $httpHost = $_SERVER['HTTP_HOST'] ?? 'localhost';
-
-        // Determine environment
-        // CodeIgniter's test bootstrap sets $_SERVER['CI_ENVIRONMENT'] = 'testing'
-        // Check $_SERVER first, then $_ENV, then fall back to 'production'
-        $environment = $_SERVER['CI_ENVIRONMENT'] ?? $_ENV['CI_ENVIRONMENT'] ?? getenv('CI_ENVIRONMENT') ?: 'production';
-
-        if (empty($this->allowedHostnames)) {
-            $errorMessage =
-                'Security: allowedHostnames is not configured. ' .
-                'Host header injection protection is disabled. ' .
-                'Set app.allowedHostnames in your .env file or ALLOWED_HOSTNAMES environment variable. ' .
-                'Example: app.allowedHostnames = "example.com,www.example.com" ' .
-                'Received Host: ' . $httpHost;
-
-            // Production: Fail explicitly to prevent silent security vulnerabilities
-            // Testing and development: Allow localhost fallback
-            if ($environment === 'production') {
-                throw new \RuntimeException($errorMessage);
-            }
-
-            log_message('error', $errorMessage . ' Using localhost fallback (development only).');
-            return 'localhost';
-        }
-
-        if (in_array($httpHost, $this->allowedHostnames, true)) {
-            return $httpHost;
-        }
-
-        // Host not in whitelist - use first configured hostname as fallback
-        log_message('warning',
-            'Security: Rejected HTTP_HOST "' . $httpHost . '" - not in allowedHostnames whitelist. ' .
-            'Using fallback: ' . $this->allowedHostnames[0]
-        );
-
-        return $this->allowedHostnames[0];
-    }
 }
--- a/app/Config/Autoload.php
+++ b/app/Config/Autoload.php
@@ -17,6 +17,8 @@ use CodeIgniter\Config\AutoloadConfig;
 *
 * NOTE: This class is required prior to Autoloader instantiation,
 *       and does not extend BaseConfig.
+ *
+ * @immutable
 */
 class Autoload extends AutoloadConfig
 {
--- a/app/Config/CURLRequest.php
+++ b/app/Config/CURLRequest.php
@@ -6,22 +6,6 @@ use CodeIgniter\Config\BaseConfig;

 class CURLRequest extends BaseConfig
 {
-    /**
-     * --------------------------------------------------------------------------
-     * CURLRequest Share Connection Options
-     * --------------------------------------------------------------------------
-     *
-     * Share connection options between requests.
-     *
-     * @var list<int>
-     *
-     * @see https://www.php.net/manual/en/curl.constants.php#constant.curl-lock-data-connect
-     */
-    public array $shareConnectionOptions = [
-        CURL_LOCK_DATA_CONNECT,
-        CURL_LOCK_DATA_DNS,
-    ];
-
    /**
     * --------------------------------------------------------------------------
     * CURLRequest Share Options
--- a/app/Config/Cache.php
+++ b/app/Config/Cache.php
@@ -3,7 +3,6 @@
 namespace Config;

 use CodeIgniter\Cache\CacheInterface;
-use CodeIgniter\Cache\Handlers\ApcuHandler;
 use CodeIgniter\Cache\Handlers\DummyHandler;
 use CodeIgniter\Cache\Handlers\FileHandler;
 use CodeIgniter\Cache\Handlers\MemcachedHandler;
@@ -79,7 +78,7 @@ class Cache extends BaseConfig
     * Your file storage preferences can be specified below, if you are using
     * the File driver.
     *
-     * @var array{storePath?: string, mode?: int}
+     * @var array<string, int|string|null>
     */
    public array $file = [
        'storePath' => WRITEPATH . 'cache/',
@@ -96,7 +95,7 @@ class Cache extends BaseConfig
     *
     * @see https://codeigniter.com/user_guide/libraries/caching.html#memcached
     *
-     * @var array{host?: string, port?: int, weight?: int, raw?: bool}
+     * @var array<string, bool|int|string>
     */
    public array $memcached = [
        'host'   => '127.0.0.1',
@@ -109,28 +108,17 @@ class Cache extends BaseConfig
     * -------------------------------------------------------------------------
     * Redis settings
     * -------------------------------------------------------------------------
-     *
     * Your Redis server can be specified below, if you are using
     * the Redis or Predis drivers.
     *
-     * @var array{
-     *     host?: string,
-     *     password?: string|null,
-     *     port?: int,
-     *     timeout?: int,
-     *     async?: bool,
-     *     persistent?: bool,
-     *     database?: int
-     * }
+     * @var array<string, int|string|null>
     */
    public array $redis = [
-        'host'       => '127.0.0.1',
-        'password'   => null,
-        'port'       => 6379,
-        'timeout'    => 0,
-        'async'      => false, // specific to Predis and ignored by the native Redis extension
-        'persistent' => false,
-        'database'   => 0,
+        'host'     => '127.0.0.1',
+        'password' => null,
+        'port'     => 6379,
+        'timeout'  => 0,
+        'database' => 0,
    ];

    /**
@@ -144,7 +132,6 @@ class Cache extends BaseConfig
     * @var array<string, class-string<CacheInterface>>
     */
    public array $validHandlers = [
-        'apcu'      => ApcuHandler::class,
        'dummy'     => DummyHandler::class,
        'file'      => FileHandler::class,
        'memcached' => MemcachedHandler::class,
@@ -171,28 +158,4 @@ class Cache extends BaseConfig
     * @var bool|list<string>
     */
    public $cacheQueryString = false;
-
-    /**
-     * --------------------------------------------------------------------------
-     * Web Page Caching: Cache Status Codes
-     * --------------------------------------------------------------------------
-     *
-     * HTTP status codes that are allowed to be cached. Only responses with
-     * these status codes will be cached by the PageCache filter.
-     *
-     * Default: [] - Cache all status codes (backward compatible)
-     *
-     * Recommended: [200] - Only cache successful responses
-     *
-     * You can also use status codes like:
-     *   [200, 404, 410] - Cache successful responses and specific error codes
-     *   [200, 201, 202, 203, 204] - All 2xx successful responses
-     *
-     * WARNING: Using [] may cache temporary error pages (404, 500, etc).
-     * Consider restricting to [200] for production applications to avoid
-     * caching errors that should be temporary.
-     *
-     * @var list<int>
-     */
-    public array $cacheStatusCodes = [];
 }
--- a/app/Config/Constants.php
+++ b/app/Config/Constants.php
@@ -169,8 +169,3 @@ const MAX_PRECISION = 1e14;
 const DEFAULT_PRECISION = 2;
 const DEFAULT_LANGUAGE = 'english';
 const DEFAULT_LANGUAGE_CODE = 'en';
-
-/**
- * Admin modules - list of modules required for admin privileges
- */
-const ADMIN_MODULES = ['customers', 'employees', 'giftcards', 'items', 'item_kits', 'messages', 'receivings', 'reports', 'sales', 'config', 'suppliers'];
--- a/app/Config/ContentSecurityPolicy.php
+++ b/app/Config/ContentSecurityPolicy.php
@@ -30,11 +30,6 @@ class ContentSecurityPolicy extends BaseConfig
     */
    public ?string $reportURI = null;

-    /**
-     * Specifies a reporting endpoint to which violation reports ought to be sent.
-     */
-    public ?string $reportTo = null;
-
    /**
     * Instructs user agents to rewrite URL schemes, changing
     * HTTP to HTTPS. This directive is for websites with
@@ -43,12 +38,12 @@ class ContentSecurityPolicy extends BaseConfig
    public bool $upgradeInsecureRequests = false;

    // -------------------------------------------------------------------------
-    // CSP DIRECTIVES SETTINGS
+    // Sources allowed
    // NOTE: once you set a policy to 'none', it cannot be further restricted
    // -------------------------------------------------------------------------

    /**
-     * Will default to `'self'` if not overridden
+     * Will default to self if not overridden
     *
     * @var list<string>|string|null
     */
@@ -69,21 +64,6 @@ class ContentSecurityPolicy extends BaseConfig
        'www.google.com www.gstatic.com'
    ];

-    /**
-     * Specifies valid sources for JavaScript <script> elements.
-     *
-     * @var list<string>|string
-     */
-    public array|string $scriptSrcElem = 'self';
-
-    /**
-     * Specifies valid sources for JavaScript inline event
-     * handlers and JavaScript URLs.
-     *
-     * @var list<string>|string
-     */
-    public array|string $scriptSrcAttr = 'self';
-
    /**
     * Lists allowed stylesheets' URLs.
     *
@@ -96,21 +76,6 @@ class ContentSecurityPolicy extends BaseConfig
        'https://fonts.googleapis.com',
    ];

-    /**
-     * Specifies valid sources for stylesheets <link> elements.
-     *
-     * @var list<string>|string
-     */
-    public array|string $styleSrcElem = 'self';
-
-    /**
-     * Specifies valid sources for stylesheets inline
-     * style attributes and `<style>` elements.
-     *
-     * @var list<string>|string
-     */
-    public array|string $styleSrcAttr = 'self';
-
    /**
     * Defines the origins from which images can be loaded.
     *
@@ -204,11 +169,6 @@ class ContentSecurityPolicy extends BaseConfig
     */
    public $manifestSrc;

-    /**
-     * @var list<string>|string
-     */
-    public array|string $workerSrc = [];
-
    /**
     * Limits the kinds of plugins a page may invoke.
     *
@@ -224,17 +184,17 @@ class ContentSecurityPolicy extends BaseConfig
    public $sandbox;

    /**
-     * Nonce placeholder for style tags.
+     * Nonce tag for style
     */
    public string $styleNonceTag = '{csp-style-nonce}';

    /**
-     * Nonce placeholder for script tags.
+     * Nonce tag for script
     */
    public string $scriptNonceTag = '{csp-script-nonce}';

    /**
-     * Replace nonce tag automatically?
+     * Replace nonce tag automatically
     */
    public bool $autoNonce = true;
 }
--- a/app/Config/Cookie.php
+++ b/app/Config/Cookie.php
@@ -85,7 +85,7 @@ class Cookie extends BaseConfig
     * (empty string) means default SameSite attribute set by browsers (`Lax`)
     * will be set on cookies. If set to `None`, `$secure` must also be set.
     *
-     * @var ''|'Lax'|'None'|'Strict'
+     * @phpstan-var 'None'|'Lax'|'Strict'|''
     */
    public string $samesite = 'Lax';

--- a/app/Config/Database.php
+++ b/app/Config/Database.php
@@ -42,8 +42,6 @@ class Database extends Config
        'strictOn'     => false,
        'failover'     => [],
        'port'         => 3306,
-        'numberNative' => false,
-        'foundRows'    => false,
        'dateFormat'   => [
            'date'     => 'Y-m-d',
            'datetime' => 'Y-m-d H:i:s',
@@ -57,27 +55,26 @@ class Database extends Config
     * @var array<string, mixed>
     */
    public array $tests = [
-        'DSN'         => '',
-        'hostname'    => 'localhost',
-        'username'    => 'admin',
-        'password'    => 'pointofsale',
-        'database'    => 'ospos',
-        'DBDriver'    => 'MySQLi',
-        'DBPrefix'    => 'ospos_',
-        'pConnect'    => false,
-        'DBDebug'     => (ENVIRONMENT !== 'production'),
-        'charset'     => 'utf8mb4',
-        'DBCollat'    => 'utf8mb4_general_ci',
-        'swapPre'     => '',
-        'encrypt'     => false,
-        'compress'    => false,
-        'strictOn'    => false,
-        'failover'    => [],
-        'port'        => 3306,
-        'foreignKeys' => true,
-        'busyTimeout' => 1000,
-        'synchronous' => null,
-        'dateFormat'  => [
+        'DSN'          => '',
+        'hostname'     => 'localhost',
+        'username'     => 'admin',
+        'password'     => 'pointofsale',
+        'database'     => 'ospos',
+        'DBDriver'     => 'MySQLi',
+        'DBPrefix'     => 'ospos_',
+        'pConnect'     => false,
+        'DBDebug'      => (ENVIRONMENT !== 'production'),
+        'charset'      => 'utf8mb4',
+        'DBCollat'     => 'utf8mb4_general_ci',
+        'swapPre'      => '',
+        'encrypt'      => false,
+        'compress'     => false,
+        'strictOn'     => false,
+        'failover'     => [],
+        'port'         => 3306,
+        'foreignKeys'  => true,
+        'busyTimeout'  => 1000,
+        'dateFormat'   => [
            'date'     => 'Y-m-d',
            'datetime' => 'Y-m-d H:i:s',
            'time'     => 'H:i:s',
--- a/app/Config/DocTypes.php
+++ b/app/Config/DocTypes.php
@@ -2,6 +2,9 @@

 namespace Config;

+/**
+ * @immutable
+ */
 class DocTypes
 {
    /**
--- a/app/Config/Email.php
+++ b/app/Config/Email.php
@@ -30,11 +30,6 @@ class Email extends BaseConfig
     */
    public string $SMTPHost = 'mail.mxserver.com';

-    /**
-     * Which SMTP authentication method to use: login, plain
-     */
-    public string $SMTPAuthMethod = 'login';
-
    /**
     * SMTP Username
     */
--- a/app/Config/Encryption.php
+++ b/app/Config/Encryption.php
@@ -23,23 +23,6 @@ class Encryption extends BaseConfig
     */
    public string $key = '';

-    /**
-     * --------------------------------------------------------------------------
-     * Previous Encryption Keys
-     * --------------------------------------------------------------------------
-     *
-     * When rotating encryption keys, add old keys here to maintain ability
-     * to decrypt data encrypted with previous keys. Encryption always uses
-     * the current $key. Decryption tries current key first, then falls back
-     * to previous keys if decryption fails.
-     *
-     * In .env file, use comma-separated string:
-     *   encryption.previousKeys = hex2bin:9be8c64fcea509867...,hex2bin:3f5a1d8e9c2b7a4f6...
-     *
-     * @var list<string>|string
-     */
-    public array|string $previousKeys = '';
-
    /**
     * --------------------------------------------------------------------------
     * Encryption Driver to Use
--- a/app/Config/Filters.php
+++ b/app/Config/Filters.php
@@ -65,15 +65,12 @@ class Filters extends BaseFilters
     * List of filter aliases that are always
     * applied before and after every request.
     *
-     * @var array{
-     *     before: array<string, array{except: list<string>|string}>|list<string>,
-     *     after: array<string, array{except: list<string>|string}>|list<string>
-     * }
+     * @var array<string, array<string, array<string, string>>>|array<string, list<string>>
     */
    public array $globals = [
        'before' => [
            'honeypot',
-            'csrf' => ['except' => 'login|migrate'],
+            // 'csrf' => ['except' => 'login'],    // TODO: Temporarily disable CSRF until we get everything sorted
            'invalidchars',
        ],
        'after' => [
@@ -108,20 +105,4 @@ class Filters extends BaseFilters
     * @var array<string, array<string, list<string>>>
     */
    public array $filters = [];
-
-    /**
-     * Constructor to conditionally disable CSRF filter in testing environment
-     */
-    public function __construct()
-    {
-        // Check for testing environment via env variable or constant
-        $isTesting = ($_ENV['CI_ENVIRONMENT'] ?? $_SERVER['CI_ENVIRONMENT'] ?? getenv('CI_ENVIRONMENT')) === 'testing'
-            || (defined('ENVIRONMENT') && ENVIRONMENT === 'testing');
-
-        // Remove CSRF filter from globals in testing environment
-        if ($isTesting) {
-            // Remove the 'csrf' key from $globals['before'] while preserving array structure
-            $this->globals['before'] = array_filter($this->globals['before'], static fn($key) => $key !== 'csrf', ARRAY_FILTER_USE_KEY);
-        }
-    }
 }
--- a/app/Config/Format.php
+++ b/app/Config/Format.php
@@ -61,13 +61,4 @@ class Format extends BaseConfig
        'application/xml'  => 0,
        'text/xml'         => 0,
    ];
-
-    /**
-     * --------------------------------------------------------------------------
-     * Maximum depth for JSON encoding.
-     * --------------------------------------------------------------------------
-     *
-     * This value determines how deep the JSON encoder will traverse nested structures.
-     */
-    public int $jsonEncodeDepth = 512;
 }
--- a/app/Config/Hostnames.php
+++ b/app/Config/Hostnames.php
@@ -1,40 +0,0 @@
-<?php
-
-namespace Config;
-
-class Hostnames
-{
-    // List of known two-part TLDs for subdomain extraction
-    public const TWO_PART_TLDS = [
-        'co.uk', 'org.uk', 'gov.uk', 'ac.uk', 'sch.uk', 'ltd.uk', 'plc.uk',
-        'com.au', 'net.au', 'org.au', 'edu.au', 'gov.au', 'asn.au', 'id.au',
-        'co.jp', 'ac.jp', 'go.jp', 'or.jp', 'ne.jp', 'gr.jp',
-        'co.nz', 'org.nz', 'govt.nz', 'ac.nz', 'net.nz', 'geek.nz', 'maori.nz', 'school.nz',
-        'co.in', 'net.in', 'org.in', 'ind.in', 'ac.in', 'gov.in', 'res.in',
-        'com.cn', 'net.cn', 'org.cn', 'gov.cn', 'edu.cn',
-        'com.sg', 'net.sg', 'org.sg', 'gov.sg', 'edu.sg', 'per.sg',
-        'co.za', 'org.za', 'gov.za', 'ac.za', 'net.za',
-        'co.kr', 'or.kr', 'go.kr', 'ac.kr', 'ne.kr', 'pe.kr',
-        'co.th', 'or.th', 'go.th', 'ac.th', 'net.th', 'in.th',
-        'com.my', 'net.my', 'org.my', 'edu.my', 'gov.my', 'mil.my', 'name.my',
-        'com.mx', 'org.mx', 'net.mx', 'edu.mx', 'gob.mx',
-        'com.br', 'net.br', 'org.br', 'gov.br', 'edu.br', 'art.br', 'eng.br',
-        'co.il', 'org.il', 'ac.il', 'gov.il', 'net.il', 'muni.il',
-        'co.id', 'or.id', 'ac.id', 'go.id', 'net.id', 'web.id', 'my.id',
-        'com.hk', 'edu.hk', 'gov.hk', 'idv.hk', 'net.hk', 'org.hk',
-        'com.tw', 'net.tw', 'org.tw', 'edu.tw', 'gov.tw', 'idv.tw',
-        'com.sa', 'net.sa', 'org.sa', 'gov.sa', 'edu.sa', 'sch.sa', 'med.sa',
-        'co.ae', 'net.ae', 'org.ae', 'gov.ae', 'ac.ae', 'sch.ae',
-        'com.tr', 'net.tr', 'org.tr', 'gov.tr', 'edu.tr', 'av.tr', 'gen.tr',
-        'co.ke', 'or.ke', 'go.ke', 'ac.ke', 'sc.ke', 'me.ke', 'mobi.ke', 'info.ke',
-        'com.ng', 'org.ng', 'gov.ng', 'edu.ng', 'net.ng', 'sch.ng', 'name.ng',
-        'com.pk', 'net.pk', 'org.pk', 'gov.pk', 'edu.pk', 'fam.pk',
-        'com.eg', 'edu.eg', 'gov.eg', 'org.eg', 'net.eg',
-        'com.cy', 'net.cy', 'org.cy', 'gov.cy', 'ac.cy',
-        'com.lk', 'org.lk', 'edu.lk', 'gov.lk', 'net.lk', 'int.lk',
-        'com.bd', 'net.bd', 'org.bd', 'ac.bd', 'gov.bd', 'mil.bd',
-        'com.ar', 'net.ar', 'org.ar', 'gov.ar', 'edu.ar', 'mil.ar',
-        'gob.cl', 'com.pl', 'net.pl', 'org.pl', 'gov.pl', 'edu.pl',
-        'co.ir', 'ac.ir', 'org.ir', 'id.ir', 'gov.ir', 'sch.ir', 'net.ir',
-    ];
-}
--- a/app/Config/Images.php
+++ b/app/Config/Images.php
@@ -16,8 +16,6 @@ class Images extends BaseConfig
    /**
     * The path to the image library.
     * Required for ImageMagick, GraphicsMagick, or NetPBM.
-     *
-     * @deprecated 4.7.0 No longer used.
     */
    public string $libraryPath = '/usr/local/bin/convert';

--- a/app/Config/Logger.php
+++ b/app/Config/Logger.php
@@ -4,7 +4,6 @@ namespace Config;

 use CodeIgniter\Config\BaseConfig;
 use CodeIgniter\Log\Handlers\FileHandler;
-use CodeIgniter\Log\Handlers\HandlerInterface;

 class Logger extends BaseConfig
 {
@@ -74,7 +73,7 @@ class Logger extends BaseConfig
     * Handlers are executed in the order defined in this array, starting with
     * the handler on top and continuing down.
     *
-     * @var array<class-string<HandlerInterface>, array<string, int|list<string>|string>>
+     * @var array<class-string, array<string, int|list<string>|string>>
     */
    public array $handlers = [
        /*
--- a/app/Config/Migrations.php
+++ b/app/Config/Migrations.php
@@ -47,19 +47,4 @@ class Migrations extends BaseConfig
     * - Y_m_d_His_
     */
    public string $timestampFormat = 'YmdHis_';
-
-    /**
-     * --------------------------------------------------------------------------
-     * Enable/Disable Migration Lock
-     * --------------------------------------------------------------------------
-     *
-     * Locking is disabled by default.
-     *
-     * When enabled, it will prevent multiple migration processes
-     * from running at the same time by using a lock mechanism.
-     *
-     * This is useful in production environments to avoid conflicts
-     * or race conditions during concurrent deployments.
-     */
-    public bool $lock = false;
 }
--- a/app/Config/Mimes.php
+++ b/app/Config/Mimes.php
@@ -3,6 +3,8 @@
 namespace Config;

 /**
+ * Mimes
+ *
 * This file contains an array of mime types.  It is used by the
 * Upload class to help identify allowed file types.
 *
@@ -13,6 +15,8 @@ namespace Config;
 *
 * When working with mime types, please make sure you have the ´fileinfo´
 * extension enabled to reliably detect the media types.
+ *
+ * @immutable
 */
 class Mimes
 {
@@ -478,8 +482,6 @@ class Mimes
            'application/sla',
            'application/vnd.ms-pki.stl',
            'application/x-navistyle',
-            'model/stl',
-            'application/octet-stream',
        ],
    ];

@@ -488,7 +490,7 @@ class Mimes
     *
     * @return string|null The mime type found, or none if unable to determine.
     */
-    public static function guessTypeFromExtension(string $extension)
+    public static function guessTypeFromExtension(string $extension): array|string|null
    {
        $extension = trim(strtolower($extension), '. ');

@@ -506,7 +508,7 @@ class Mimes
     *
     * @return string|null The extension determined, or null if unable to match.
     */
-    public static function guessExtensionFromType(string $type, ?string $proposedExtension = null)
+    public static function guessExtensionFromType(string $type, ?string $proposedExtension = null): ?string
    {
        $type = trim(strtolower($type), '. ');

--- a/app/Config/Modules.php
+++ b/app/Config/Modules.php
@@ -9,6 +9,8 @@ use CodeIgniter\Modules\Modules as BaseModules;
 *
 * NOTE: This class is required prior to Autoloader instantiation,
 *       and does not extend BaseConfig.
+ *
+ * @immutable
 */
 class Modules extends BaseModules
 {
--- a/app/Config/OSPOS.php
+++ b/app/Config/OSPOS.php
@@ -34,24 +34,11 @@ class OSPOS extends BaseConfig
        if ($cache) {
            $this->settings = decode_array($cache);
        } else {
-            try {
-                $appconfig = model(Appconfig::class);
-                foreach ($appconfig->get_all()->getResult() as $app_config) {
-                    $this->settings[$app_config->key] = $app_config->value;
-                }
-                $this->cache->save('settings', encode_array($this->settings));
-            } catch (\Exception $e) {
-                // Database table doesn't exist yet (migrations haven't run)
-                // or database connection failed. Return empty settings to
-                // allow migration page to display. Catches mysqli_sql_exception
-                // which is not a subclass of DatabaseException.
-                $this->settings = [
-                    'language' => 'english',
-                    'language_code' => 'en',
-                    'company' => 'Home',
-                    'barcode_type' => 'Code39'
-                ];
+            $appconfig = model(Appconfig::class);
+            foreach ($appconfig->get_all()->getResult() as $app_config) {
+                $this->settings[$app_config->key] = $app_config->value;
            }
+            $this->cache->save('settings', encode_array($this->settings));
        }
    }

@@ -63,4 +50,4 @@ class OSPOS extends BaseConfig
        $this->cache->delete('settings');
        $this->set_settings();
    }
-}
+}
--- a/app/Config/Optimize.php
+++ b/app/Config/Optimize.php
@@ -8,7 +8,7 @@ namespace Config;
 * NOTE: This class does not extend BaseConfig for performance reasons.
 *       So you cannot replace the property values with Environment Variables.
 *
- * WARNING: Do not use these options when running the app in the Worker Mode.
+ * @immutable
 */
 class Optimize
 {
--- a/app/Config/Paths.php
+++ b/app/Config/Paths.php
@@ -15,6 +15,8 @@ namespace Config;
 *
 * NOTE: This class is required prior to Autoloader instantiation,
 *       and does not extend BaseConfig.
+ *
+ * @immutable
 */
 class Paths
 {
@@ -75,16 +77,4 @@ class Paths
     * is used when no value is provided to `Services::renderer()`.
     */
    public string $viewDirectory = __DIR__ . '/../Views';
-
-    /**
-     * ---------------------------------------------------------------
-     * ENVIRONMENT DIRECTORY NAME
-     * ---------------------------------------------------------------
-     *
-     * This variable must contain the name of the directory where
-     * the .env file is located.
-     * Please consider security implications when changing this
-     * value - the directory should not be publicly accessible.
-     */
-    public string $envDirectory = __DIR__ . '/../../';
 }
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -10,7 +10,6 @@ $routes->setDefaultController('Login');
 $routes->get('/', 'Login::index');
 $routes->get('login', 'Login::index');
 $routes->post('login', 'Login::index');
-$routes->post('migrate', 'Login::migrate');

 $routes->add('no_access/index/(:segment)', 'No_access::index/$1');
 $routes->add('no_access/index/(:segment)/(:segment)', 'No_access::index/$1/$2');
--- a/app/Config/Routing.php
+++ b/app/Config/Routing.php
@@ -96,15 +96,6 @@ class Routing extends BaseRouting
     */
    public bool $autoRoute = true;

-    /**
-     * If TRUE, the system will look for attributes on controller
-     * class and methods that can run before and after the
-     * controller/method.
-     *
-     * If FALSE, will ignore any attributes.
-     */
-    public bool $useControllerAttributes = true;
-
    /**
     * For Defined Routes.
     * If TRUE, will enable the use of the 'prioritize' option
--- a/app/Config/Security.php
+++ b/app/Config/Security.php
@@ -15,7 +15,7 @@ class Security extends BaseConfig
     *
     * @var string 'cookie' or 'session'
     */
-    public string $csrfProtection = 'session';
+    public string $csrfProtection = 'cookie';

    /**
     * --------------------------------------------------------------------------
@@ -71,7 +71,7 @@ class Security extends BaseConfig
     *
     * Regenerate CSRF Token on every submission.
     */
-    public bool $regenerate = false;
+    public bool $regenerate = true;

    /**
     * --------------------------------------------------------------------------
--- a/app/Config/Services.php
+++ b/app/Config/Services.php
@@ -2,13 +2,11 @@

 namespace Config;

-use App\Libraries\MY_Language;
-use Locale;
+use CodeIgniter\Config\BaseService;
+use CodeIgniter\HTTP\IncomingRequest;
+use Config\Services as AppServices;
 use HTMLPurifier;
 use HTMLPurifier_Config;
-use CodeIgniter\Config\BaseService;
-use Config\Services as AppServices;
-use CodeIgniter\HTTP\IncomingRequest;

 /**
 * Services Configuration file.
@@ -39,11 +37,9 @@ class Services extends BaseService
    /**
     * Responsible for loading the language string translations.
     *
-     * @param string|null $locale
-     * @param bool $getShared
     * @return MY_Language
     */
-    public static function language(?string $locale = null, bool $getShared = true): MY_Language
+    public static function language(?string $locale = null, bool $getShared = true)
    {
        if ($getShared) {
            return static::getSharedInstance('language', $locale)->setLocale($locale);
@@ -58,12 +54,12 @@ class Services extends BaseService
        // Use '?:' for empty string check
        $locale = $locale ?: $requestLocale;

-        return new MY_Language($locale);
+        return new \App\Libraries\MY_Language($locale);
    }

-    private static HTMLPurifier $htmlPurifier;
+    private static $htmlPurifier;

-    public static function htmlPurifier($getShared = true): object
+    public static function htmlPurifier($getShared = true)
    {
        if ($getShared) {
            return static::getSharedInstance('htmlPurifier');
--- a/app/Config/Session.php
+++ b/app/Config/Session.php
@@ -5,7 +5,6 @@ namespace Config;
 use CodeIgniter\Config\BaseConfig;
 use CodeIgniter\Session\Handlers\BaseHandler;
 use CodeIgniter\Session\Handlers\DatabaseHandler;
-use CodeIgniter\Session\Handlers\FileHandler;

 class Session extends BaseConfig
 {
@@ -125,27 +124,4 @@ class Session extends BaseConfig
     * seconds.
     */
    public int $lockMaxRetries = 300;
-
-    public function __construct()
-    {
-        parent::__construct();
-
-        if ($this->driver === DatabaseHandler::class) {
-            try {
-                $db = Database::connect();
-
-                if (!$db->tableExists($this->savePath)) {
-                    $this->driver = FileHandler::class;
-                    $this->savePath = WRITEPATH . 'session';
-                }
-            } catch (\Exception $e) {
-                // Database not available yet (e.g. fresh install before migrations).
-                // Fall back to file-based sessions so the login/migration page
-                // can still be served. Catches mysqli_sql_exception which is
-                // not a subclass of DatabaseException but is a RuntimeException.
-                $this->driver = FileHandler::class;
-                $this->savePath = WRITEPATH . 'session';
-            }
-        }
-    }
 }
--- a/app/Config/Toolbar.php
+++ b/app/Config/Toolbar.php
@@ -119,29 +119,4 @@ class Toolbar extends BaseConfig
    public array $watchedExtensions = [
        'php', 'css', 'js', 'html', 'svg', 'json', 'env',
    ];
-
-    /**
-     * --------------------------------------------------------------------------
-     * Ignored HTTP Headers
-     * --------------------------------------------------------------------------
-     *
-     * CodeIgniter Debug Toolbar normally injects HTML and JavaScript into every
-     * HTML response. This is correct for full page loads, but it breaks requests
-     * that expect only a clean HTML fragment.
-     *
-     * Libraries like HTMX, Unpoly, and Hotwire (Turbo) update parts of the page or
-     * manage navigation on the client side. Injecting the Debug Toolbar into their
-     * responses can cause invalid HTML, duplicated scripts, or JavaScript errors
-     * (such as infinite loops or "Maximum call stack size exceeded").
-     *
-     * Any request containing one of the following headers is treated as a
-     * client-managed or partial request, and the Debug Toolbar injection is skipped.
-     *
-     * @var array<string, string|null>
-     */
-    public array $disableOnHeaders = [
-        'X-Requested-With' => 'xmlhttprequest', // AJAX requests
-        'HX-Request'       => 'true',           // HTMX requests
-        'X-Up-Version'     => null,             // Unpoly partial requests
-    ];
 }
--- a/app/Config/UserAgents.php
+++ b/app/Config/UserAgents.php
@@ -230,13 +230,9 @@ class UserAgents extends BaseConfig
     */
    public array $robots = [
        'googlebot'            => 'Googlebot',
-        'google-pagerenderer'  => 'Google Page Renderer',
-        'google-read-aloud'    => 'Google Read Aloud',
-        'google-safety'        => 'Google Safety Bot',
        'msnbot'               => 'MSNBot',
        'baiduspider'          => 'Baiduspider',
        'bingbot'              => 'Bing',
-        'bingpreview'          => 'BingPreview',
        'slurp'                => 'Inktomi Slurp',
        'yahoo'                => 'Yahoo',
        'ask jeeves'           => 'Ask Jeeves',
@@ -252,11 +248,5 @@ class UserAgents extends BaseConfig
        'ia_archiver'          => 'Alexa Crawler',
        'MJ12bot'              => 'Majestic-12',
        'Uptimebot'            => 'Uptimebot',
-        'duckduckbot'          => 'DuckDuckBot',
-        'sogou'                => 'Sogou Spider',
-        'exabot'               => 'Exabot',
-        'bot'                  => 'Generic Bot',
-        'crawler'              => 'Generic Crawler',
-        'spider'               => 'Generic Spider',
    ];
 }
--- a/app/Config/Validation/OSPOSRules.php
+++ b/app/Config/Validation/OSPOSRules.php
@@ -135,19 +135,4 @@ class OSPOSRules
    {
        return parse_decimals($candidate) !== false;
    }
-
-    /**
-     * Validates that a locale-aware decimal value is non-negative (>= 0).
-     *
-     * @param string $candidate
-     * @param string|null $error
-     * @return bool
-     * @noinspection PhpUnused
-     */
-    public function nonNegativeDecimal(string $candidate, ?string &$error = null): bool
-    {
-        $value = parse_decimals($candidate);
-
-        return $value !== false && $value >= 0;
-    }
 }
--- a/app/Config/View.php
+++ b/app/Config/View.php
@@ -59,21 +59,4 @@ class View extends BaseView
     * @var list<class-string<ViewDecoratorInterface>>
     */
    public array $decorators = [];
-
-    /**
-     * Subdirectory within app/Views for namespaced view overrides.
-     *
-     * Namespaced views will be searched in:
-     *
-     *   app/Views/{$appOverridesFolder}/{Namespace}/{view_path}.{php|html...}
-     *
-     * This allows application-level overrides for package or module views
-     * without modifying vendor source files.
-     *
-     * Examples:
-     *   'overrides' -> app/Views/overrides/Example/Blog/post/card.php
-     *   'vendor'    -> app/Views/vendor/Example/Blog/post/card.php
-     *   ''          -> app/Views/Example/Blog/post/card.php (direct mapping)
-     */
-    public string $appOverridesFolder = 'overrides';
 }
--- a/app/Config/WorkerMode.php
+++ b/app/Config/WorkerMode.php
@@ -1,62 +0,0 @@
-<?php
-
-namespace Config;
-
-/**
- * This configuration controls how CodeIgniter behaves when running
- * in worker mode (with FrankenPHP).
- */
-class WorkerMode
-{
-    /**
-     * Persistent Services
-     *
-     * List of service names that should persist across requests.
-     * These services will NOT be reset between requests.
-     *
-     * Services not in this list will be reset for each request to prevent
-     * state leakage.
-     *
-     * Recommended persistent services:
-     * - `autoloader`: PSR-4 autoloading configuration
-     * - `locator`: File locator
-     * - `exceptions`: Exception handler
-     * - `commands`: CLI commands registry
-     * - `codeigniter`: Main application instance
-     * - `superglobals`: Superglobals wrapper
-     * - `routes`: Router configuration
-     * - `cache`: Cache instance
-     *
-     * @var list<string>
-     */
-    public array $persistentServices = [
-        'autoloader',
-        'locator',
-        'exceptions',
-        'commands',
-        'codeigniter',
-        'superglobals',
-        'routes',
-        'cache',
-    ];
-
-    /**
-     * Reset Event Listeners
-     *
-     * List of event names whose listeners should be removed between requests.
-     * Use this if you register event listeners inside other event callbacks
-     * (rather than at the top level of Config/Events.php), which would cause
-     * them to accumulate across requests in worker mode.
-     *
-     * @var list<string>
-     */
-    public array $resetEventListeners = [];
-
-    /**
-     * Force Garbage Collection
-     *
-     * Whether to force garbage collection after each request.
-     * Helps prevent memory leaks at a small performance cost.
-     */
-    public bool $forceGarbageCollection = true;
-}
--- a/app/Controllers/Attributes.php
+++ b/app/Controllers/Attributes.php
@@ -3,7 +3,6 @@
 namespace App\Controllers;

 use App\Models\Attribute;
-use CodeIgniter\HTTP\ResponseInterface;
 use Config\Services;

 require_once('Secure_Controller.php');
@@ -25,19 +24,19 @@ class Attributes extends Secure_Controller
    /**
     * Gets and sends the main view for Attributes to the browser.
     *
-     * @return string
+     * @return void
     **/
-    public function getIndex(): string
+    public function getIndex(): void
    {
        $data['table_headers'] = get_attribute_definition_manage_table_headers();

-        return view('attributes/manage', $data);
+        echo view('attributes/manage', $data);
    }

    /**
     * Returns attribute table data rows. This will be called with AJAX.
     */
-    public function getSearch(): ResponseInterface
+    public function getSearch(): void
    {
        $search = $this->request->getGet('search');
        $limit  = $this->request->getGet('limit', FILTER_SANITIZE_NUMBER_INT);
@@ -54,15 +53,15 @@ class Attributes extends Secure_Controller
            $data_rows[] = get_attribute_definition_data_row($attribute_row);
        }

-        return $this->response->setJSON(['total' => $total_rows, 'rows' => $data_rows]);
+        echo json_encode(['total' => $total_rows, 'rows' => $data_rows]);
    }

    /**
     * AJAX called function which saves the attribute value sent via POST by using the model save function.
-     * @return ResponseInterface
+     * @return void
     * @noinspection PhpUnused
     */
-    public function postSaveAttributeValue(): ResponseInterface
+    public function postSaveAttributeValue(): void
    {
        $success = $this->attribute->saveAttributeValue(
            html_entity_decode($this->request->getPost('attribute_value')),
@@ -71,32 +70,32 @@ class Attributes extends Secure_Controller
            $this->request->getPost('attribute_id', FILTER_SANITIZE_NUMBER_INT) ?? false
        );

-        return $this->response->setJSON(['success' => $success != 0]);
+        echo json_encode(['success' => $success != 0]);
    }

    /**
     * AJAX called function deleting an attribute value using the model delete function.
-     * @return ResponseInterface
+     * @return void
     * @noinspection PhpUnused
     */
-    public function postDeleteDropdownAttributeValue(): ResponseInterface
+    public function postDeleteDropdownAttributeValue(): void
    {
        $success = $this->attribute->deleteDropdownAttributeValue(
            html_entity_decode($this->request->getPost('attribute_value')),
            $this->request->getPost('definition_id', FILTER_SANITIZE_NUMBER_INT)
        );

-        return $this->response->setJSON(['success' => $success]);
+        echo json_encode(['success' => $success]);
    }

    /**
     * AJAX called function which saves the attribute definition.
     *
     * @param int $definition_id
-     * @return ResponseInterface
+     * @return void
     * @noinspection PhpUnused
     */
-    public function postSaveDefinition(int $definition_id = NO_DEFINITION_ID): ResponseInterface
+    public function postSaveDefinition(int $definition_id = NO_DEFINITION_ID): void
    {
        $definition_flags = 0;

@@ -106,24 +105,12 @@ class Attributes extends Secure_Controller
            $definition_flags |= $flag;
        }

-        // Validate definition_group (definition_fk) foreign key
-        $definition_group_input = $this->request->getPost('definition_group');
-        $definition_fk = $this->validateDefinitionGroup($definition_group_input);
-
-        if ($definition_fk === false) {
-            return $this->response->setJSON([
-                'success' => false,
-                'message' => lang('Attributes.definition_invalid_group'),
-                'id'      => NEW_ENTRY
-            ]);
-        }
-
        // Save definition data
        $definition_data = [
            'definition_name'  => $this->request->getPost('definition_name'),
            'definition_unit'  => $this->request->getPost('definition_unit') != '' ? $this->request->getPost('definition_unit') : null,
            'definition_flags' => $definition_flags,
-            'definition_fk'    => $definition_fk
+            'definition_fk'    => $this->request->getPost('definition_group') != '' ? $this->request->getPost('definition_group') : null
        ];

        if ($this->request->getPost('definition_type') != null) {
@@ -132,7 +119,7 @@ class Attributes extends Secure_Controller

        $definition_name = $definition_data['definition_name'];

-        if ($this->attribute->saveDefinition($definition_data, $definition_id)) {
+        if ($this->attribute->save_definition($definition_data, $definition_id)) {
            // New definition
            if ($definition_id == NO_DEFINITION_ID) {
                $definition_values = json_decode(html_entity_decode($this->request->getPost('definition_values')));
@@ -141,20 +128,20 @@ class Attributes extends Secure_Controller
                    $this->attribute->saveAttributeValue($definition_value, $definition_data['definition_id']);
                }

-                return $this->response->setJSON([
+                echo json_encode([
                    'success' => true,
                    'message' => lang('Attributes.definition_successful_adding') . ' ' . $definition_name,
                    'id'      => $definition_data['definition_id']
                ]);
            } else { // Existing definition
-                return $this->response->setJSON([
+                echo json_encode([
                    'success' => true,
                    'message' => lang('Attributes.definition_successful_updating') . ' ' . $definition_name,
                    'id'      => $definition_id
                ]);
            }
        } else { // Failure
-            return $this->response->setJSON([
+            echo json_encode([
                'success' => false,
                'message' => lang('Attributes.definition_error_adding_updating', [$definition_name]),
                'id'      => NEW_ENTRY
@@ -162,56 +149,30 @@ class Attributes extends Secure_Controller
        }
    }

-    /**
-     * Validates a definition_group foreign key.
-     * Returns the validated integer ID, null if empty, or false if invalid.
-     *
-     * @param mixed $definition_group_input
-     * @return int|null|false
-     */
-    private function validateDefinitionGroup(mixed $definition_group_input): int|null|false
-    {
-        if ($definition_group_input === '' || $definition_group_input === null) {
-            return null;
-        }
-
-        $definition_group_id = (int) $definition_group_input;
-
-        // Must be a positive integer, exist in attribute_definitions, and be of type GROUP
-        if ($definition_group_id <= 0
-            || !$this->attribute->exists($definition_group_id)
-            || $this->attribute->getAttributeInfo($definition_group_id)->definition_type !== GROUP
-        ) {
-            return false;
-        }
-
-        return $definition_group_id;
-    }
-
    /**
     *
     * @param int $definition_id
-     * @return ResponseInterface
+     * @return void
     * @noinspection PhpUnused
     */
-    public function getSuggestAttribute(int $definition_id): ResponseInterface
+    public function getSuggestAttribute(int $definition_id): void
    {
        $suggestions = $this->attribute->get_suggestions($definition_id, html_entity_decode($this->request->getGet('term')));

-        return $this->response->setJSON($suggestions);
+        echo json_encode($suggestions);
    }

    /**
     * @param int $row_id
-     * @return ResponseInterface
+     * @return void
     */
-    public function getRow(int $row_id): ResponseInterface
+    public function getRow(int $row_id): void
    {
        $attribute_definition_info = $this->attribute->getAttributeInfo($row_id);
        $attribute_definition_info->definition_flags = $this->get_attributes($attribute_definition_info->definition_flags);
        $data_row = get_attribute_definition_data_row($attribute_definition_info);

-        return $this->response->setJSON($data_row);
+        echo json_encode($data_row);
    }

    /**
@@ -231,9 +192,9 @@ class Attributes extends Secure_Controller

    /**
     * @param int $definition_id
-     * @return string
+     * @return void
     */
-    public function getView(int $definition_id = NO_DEFINITION_ID): string
+    public function getView(int $definition_id = NO_DEFINITION_ID): void
    {
        $info = $this->attribute->getAttributeInfo($definition_id);
        foreach (get_object_vars($info) as $property => $value) {
@@ -251,22 +212,22 @@ class Attributes extends Secure_Controller
        $selected_flags = $info->definition_flags === '' ? $show_all : $info->definition_flags;
        $data['selected_definition_flags'] = $this->get_attributes($selected_flags);

-        return view('attributes/form', $data);
+        echo view('attributes/form', $data);
    }

    /**
     * Deletes an attribute definition
-     * @return ResponseInterface
+     * @return void
     */
-    public function postDelete(): ResponseInterface
+    public function postDelete(): void
    {
        $attributes_to_delete = $this->request->getPost('ids', FILTER_SANITIZE_FULL_SPECIAL_CHARS);

        if($this->attribute->deleteDefinitionList($attributes_to_delete)) {
            $message = lang('Attributes.definition_successful_deleted') . ' ' . count($attributes_to_delete) . ' ' . lang('Attributes.definition_one_or_multiple');
-            return $this->response->setJSON(['success' => true, 'message' => $message]);
+            echo json_encode(['success' => true, 'message' => $message]);
        } else {
-            return $this->response->setJSON(['success' => false, 'message' => lang('Attributes.definition_cannot_be_deleted')]);
+            echo json_encode(['success' => false, 'message' => lang('Attributes.definition_cannot_be_deleted')]);
        }
    }
 }
--- a/app/Controllers/BaseController.php
+++ b/app/Controllers/BaseController.php
@@ -3,28 +3,44 @@
 namespace App\Controllers;

 use CodeIgniter\Controller;
+use CodeIgniter\HTTP\CLIRequest;
+use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
 use Psr\Log\LoggerInterface;

 /**
+ * Class BaseController
+ *
 * BaseController provides a convenient place for loading components
 * and performing functions that are needed by all your controllers.
- *
 * Extend this class in any new controllers:
- * ```
 *     class Home extends BaseController
- * ```
 *
- * For security, be sure to declare any new methods as protected or private.
+ * For security be sure to declare any new methods as protected or private.
 */
 abstract class BaseController extends Controller
 {
+    /**
+     * Instance of the main Request object.
+     *
+     * @var CLIRequest|IncomingRequest
+     */
+    protected $request;
+
+    /**
+     * An array of helpers to be loaded automatically upon
+     * class instantiation. These helpers will be available
+     * to all other controllers that extend BaseController.
+     *
+     * @var list<string>
+     */
+    protected $helpers = [];
+
    /**
     * Be sure to declare properties for any property fetch you initialized.
     * The creation of dynamic property is deprecated in PHP 8.2.
     */
-
    // protected $session;

    /**
@@ -32,14 +48,11 @@ abstract class BaseController extends Controller
     */
    public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger)
    {
-        // Load here all helpers you want to be available in your controllers that extend BaseController.
-        // Caution: Do not put the this below the parent::initController() call below.
-        // $this->helpers = ['form', 'url'];
-
-        // Caution: Do not edit this line.
+        // Do Not Edit This Line
        parent::initController($request, $response, $logger);

        // Preload any models, libraries, etc, here.
-        // $this->session = service('session');
+
+        // E.g.: $this->session = service('session');
    }
 }
--- a/app/Controllers/Cashups.php
+++ b/app/Controllers/Cashups.php
@@ -5,7 +5,6 @@ namespace App\Controllers;
 use App\Models\Cashup;
 use App\Models\Expense;
 use App\Models\Reports\Summary_payments;
-use CodeIgniter\HTTP\ResponseInterface;
 use Config\OSPOS;
 use Config\Services;

@@ -27,25 +26,22 @@ class Cashups extends Secure_Controller
    }

    /**
-     * @return string
+     * @return void
     */
-    public function getIndex(): string
+    public function getIndex(): void
    {
        $data['table_headers'] = get_cashups_manage_table_headers();

        // filters that will be loaded in the multiselect dropdown
        $data['filters'] = ['is_deleted' => lang('Cashups.is_deleted')];

-        // Restore filters from URL
-        $data = array_merge($data, restoreTableFilters($this->request));
-
-        return view('cashups/manage', $data);
+        echo view('cashups/manage', $data);
    }

    /**
     * @return void
     */
-    public function getSearch(): ResponseInterface
+    public function getSearch(): void
    {
        $search = $this->request->getGet('search');
        $limit = $this->request->getGet('limit', FILTER_SANITIZE_NUMBER_INT);
@@ -68,14 +64,14 @@ class Cashups extends Secure_Controller
            $data_rows[] = get_cash_up_data_row($cash_up);
        }

-        return $this->response->setJSON(['total' => $total_rows, 'rows' => $data_rows]);
+        echo json_encode(['total' => $total_rows, 'rows' => $data_rows]);
    }

    /**
     * @param int $cashup_id
-     * @return string
+     * @return void
     */
-    public function getView(int $cashup_id = NEW_ENTRY): string
+    public function getView(int $cashup_id = NEW_ENTRY): void
    {
        $data = [];

@@ -184,26 +180,26 @@ class Cashups extends Secure_Controller

        $data['cash_ups_info'] = $cash_ups_info;

-        return view("cashups/form", $data);
+        echo view("cashups/form", $data);
    }

    /**
     * @param int $row_id
-     * @return ResponseInterface
+     * @return void
     */
-    public function getRow(int $row_id): ResponseInterface
+    public function getRow(int $row_id): void
    {
        $cash_ups_info = $this->cashup->get_info($row_id);
        $data_row = get_cash_up_data_row($cash_ups_info);

-        return $this->response->setJSON($data_row);
+        echo json_encode($data_row);
    }

    /**
     * @param int $cashup_id
-     * @return ResponseInterface
+     * @return void
     */
-    public function postSave(int $cashup_id = NEW_ENTRY): ResponseInterface
+    public function postSave(int $cashup_id = NEW_ENTRY): void
    {
        $open_date = $this->request->getPost('open_date');
        $open_date_formatter = date_create_from_format($this->config['dateformat'] . ' ' . $this->config['timeformat'], $open_date);
@@ -231,36 +227,36 @@ class Cashups extends Secure_Controller
        if ($this->cashup->save_value($cash_up_data, $cashup_id)) {
            // New cashup_id
            if ($cashup_id == NEW_ENTRY) {
-                return $this->response->setJSON(['success' => true, 'message' => lang('Cashups.successful_adding'), 'id' => $cash_up_data['cashup_id']]);
+                echo json_encode(['success' => true, 'message' => lang('Cashups.successful_adding'), 'id' => $cash_up_data['cashup_id']]);
            } else { // Existing Cashup
-                return $this->response->setJSON(['success' => true, 'message' => lang('Cashups.successful_updating'), 'id' => $cashup_id]);
+                echo json_encode(['success' => true, 'message' => lang('Cashups.successful_updating'), 'id' => $cashup_id]);
            }
        } else { // Failure
-            return $this->response->setJSON(['success' => false, 'message' => lang('Cashups.error_adding_updating'), 'id' => NEW_ENTRY]);
+            echo json_encode(['success' => false, 'message' => lang('Cashups.error_adding_updating'), 'id' => NEW_ENTRY]);
        }
    }

    /**
-     * @return ResponseInterface
+     * @return void
     */
-    public function postDelete(): ResponseInterface
+    public function postDelete(): void
    {
        $cash_ups_to_delete = $this->request->getPost('ids', FILTER_SANITIZE_FULL_SPECIAL_CHARS);

        if ($this->cashup->delete_list($cash_ups_to_delete)) {
-            return $this->response->setJSON(['success' => true, 'message' => lang('Cashups.successful_deleted') . ' ' . count($cash_ups_to_delete) . ' ' . lang('Cashups.one_or_multiple'), 'ids' => $cash_ups_to_delete]);
+            echo json_encode(['success' => true, 'message' => lang('Cashups.successful_deleted') . ' ' . count($cash_ups_to_delete) . ' ' . lang('Cashups.one_or_multiple'), 'ids' => $cash_ups_to_delete]);
        } else {
-            return $this->response->setJSON(['success' => false, 'message' => lang('Cashups.cannot_be_deleted'), 'ids' => $cash_ups_to_delete]);
+            echo json_encode(['success' => false, 'message' => lang('Cashups.cannot_be_deleted'), 'ids' => $cash_ups_to_delete]);
        }
    }

    /**
     * Calculate the total for cashups. Used in app\Views\cashups\form.php
     *
-     * @return ResponseInterface
+     * @return void
     * @noinspection PhpUnused
     */
-    public function postAjax_cashup_total(): ResponseInterface
+    public function postAjax_cashup_total(): void
    {
        $open_amount_cash = parse_decimals($this->request->getPost('open_amount_cash'));
        $transfer_amount_cash = parse_decimals($this->request->getPost('transfer_amount_cash'));
@@ -271,7 +267,7 @@ class Cashups extends Secure_Controller

        $total = $this->_calculate_total($open_amount_cash, $transfer_amount_cash, $closed_amount_due, $closed_amount_cash, $closed_amount_card, $closed_amount_check);    // TODO: hungarian notation

-        return $this->response->setJSON(['total' => to_currency_no_money($total)]);
+        echo json_encode(['total' => to_currency_no_money($total)]);
    }

    /**
--- a/app/Controllers/Config.php
+++ b/app/Controllers/Config.php
@@ -11,14 +11,12 @@ use App\Models\Appconfig;
 use App\Models\Attribute;
 use App\Models\Customer_rewards;
 use App\Models\Dinner_table;
-use App\Models\Item;
 use App\Models\Module;
 use App\Models\Enums\Rounding_mode;
 use App\Models\Stock_location;
 use App\Models\Tax;
 use CodeIgniter\Database\BaseConnection;
 use CodeIgniter\Encryption\EncrypterInterface;
-use CodeIgniter\HTTP\ResponseInterface;
 use Config\Database;
 use Config\OSPOS;
 use Config\Services;
@@ -82,7 +80,7 @@ class Config extends Secure_Controller
        $npmDev = false;
        $license = [];

-        $license[$i]['title'] = 'Open Source Point of Sale ' . config('App')->application_version;
+        $license[$i]['title'] = 'Open Source Point Of Sale ' . config('App')->application_version;

        if (file_exists('license/LICENSE')) {
            $license[$i]['text'] = file_get_contents('license/LICENSE', false, null, 0, 3000);
@@ -217,23 +215,18 @@ class Config extends Secure_Controller
    }

    /**
-     * @return string
     */
-    public function getIndex(): string
+    public function getIndex(): void
    {
-        $data['config'] = $this->config;
        $data['stock_locations'] = $this->stock_location->get_all()->getResultArray();
        $data['dinner_tables'] = $this->dinner_table->get_all()->getResultArray();
        $data['customer_rewards'] = $this->customer_rewards->get_all()->getResultArray();
        $data['support_barcode'] = $this->barcode_lib->get_list_barcodes();
        $data['barcode_fonts'] = $this->barcode_lib->listfonts('fonts');
        $data['logo_exists'] = $this->config['company_logo'] != '';
-        $data['logo_src'] = !empty($this->config['company_logo']) ? base_url('uploads/' . $this->config['company_logo']) : '';
        $data['line_sequence_options'] = $this->sale_lib->get_line_sequence_options();
        $data['register_mode_options'] = $this->sale_lib->get_register_mode_options();
        $data['invoice_type_options'] = $this->sale_lib->get_invoice_type_options();
-        $data['keyboardShortcutOptions'] = $this->sale_lib->getKeyShortcutsOptions();
-        $data['keyboardShortcuts'] = $this->sale_lib->getKeyShortcuts();
        $data['rounding_options'] = rounding_mode::get_rounding_options();
        $data['tax_code_options'] = $this->tax_lib->get_tax_code_options();
        $data['tax_category_options'] = $this->tax_lib->get_tax_category_options();
@@ -279,17 +272,17 @@ class Config extends Secure_Controller

        $data['mailchimp']['lists'] = $this->_mailchimp();

-        return view('configs/manage', $data);
+        echo view('configs/manage', $data);
    }

    /**
     * Saves company information. Used in app/Views/configs/info_config.php
     *
     * @throws ReflectionException
-     * @return ResponseInterface
+     * @return void
     * @noinspection PhpUnused
     */
-    public function postSaveInfo(): ResponseInterface
+    public function postSaveInfo(): void
    {
        $upload_data = $this->upload_logo();
        $upload_success = empty($upload_data['error']);
@@ -313,7 +306,7 @@ class Config extends Secure_Controller
        $message = lang('Config.saved_' . ($success ? '' : 'un') . 'successfully');
        $message = $upload_success ? $message : strip_tags($upload_data['error']);

-        return $this->response->setJSON(['success' => $success, 'message' => $message]);
+        echo json_encode(['success' => $success, 'message' => $message]);
    }


@@ -365,12 +358,11 @@ class Config extends Secure_Controller
     * Saves general configuration. Used in app/Views/configs/general_config.php
     *
     * @throws ReflectionException
-     * @return ResponseInterface
     * @noinspection PhpUnused
     */
-    public function postSaveGeneral(): ResponseInterface
+    public function postSaveGeneral(): void
    {
-        $batchSaveData = [
+        $batch_save_data = [
            'theme'                             => $this->request->getPost('theme'),
            'login_form'                        => $this->request->getPost('login_form'),
            'default_sales_discount_type'       => $this->request->getPost('default_sales_discount_type') != null,
@@ -389,9 +381,9 @@ class Config extends Secure_Controller
            'gcaptcha_enable'                   => $this->request->getPost('gcaptcha_enable') != null,
            'gcaptcha_secret_key'               => $this->request->getPost('gcaptcha_secret_key'),
            'gcaptcha_site_key'                 => $this->request->getPost('gcaptcha_site_key'),
-            'suggestions_first_column'          => $this->validateSuggestionsColumn($this->request->getPost('suggestions_first_column'), 'first'),
-            'suggestions_second_column'         => $this->validateSuggestionsColumn($this->request->getPost('suggestions_second_column'), 'other'),
-            'suggestions_third_column'          => $this->validateSuggestionsColumn($this->request->getPost('suggestions_third_column'), 'other'),
+            'suggestions_first_column'          => $this->request->getPost('suggestions_first_column'),
+            'suggestions_second_column'         => $this->request->getPost('suggestions_second_column'),
+            'suggestions_third_column'          => $this->request->getPost('suggestions_third_column'),
            'giftcard_number'                   => $this->request->getPost('giftcard_number'),
            'derive_sale_quantity'              => $this->request->getPost('derive_sale_quantity') != null,
            'multi_pack_enabled'                => $this->request->getPost('multi_pack_enabled') != null,
@@ -401,67 +393,57 @@ class Config extends Secure_Controller

        $this->module->set_show_office_group($this->request->getPost('show_office_group') != null);

-        $this->db->transStart();
+        if ($batch_save_data['category_dropdown'] == 1) {
+            $definition_data['definition_name'] = 'ospos_category';
+            $definition_data['definition_flags'] = 0;
+            $definition_data['definition_type'] = 'DROPDOWN';
+            $definition_data['definition_id'] = CATEGORY_DEFINITION_ID;
+            $definition_data['deleted'] = 0;

-        $attributeSuccess = true;
-        if ($batchSaveData['category_dropdown']) {
-            $definitionData['definition_name'] = 'ospos_category';
-            $definitionData['definition_flags'] = 0;
-            $definitionData['definition_type'] = 'DROPDOWN';
-            $definitionData['definition_id'] = CATEGORY_DEFINITION_ID;
-            $definitionData['deleted'] = 0;
-
-            $attributeSuccess = $this->attribute->saveDefinition($definitionData, CATEGORY_DEFINITION_ID);
-        } elseif ($batchSaveData['category_dropdown'] == NO_DEFINITION_ID) {
-            $attributeSuccess = $this->attribute->deleteDefinition(CATEGORY_DEFINITION_ID);
+            $this->attribute->save_definition($definition_data, CATEGORY_DEFINITION_ID);
+        } elseif ($batch_save_data['category_dropdown'] == NO_DEFINITION_ID) {
+            $this->attribute->deleteDefinition(CATEGORY_DEFINITION_ID);
        }

-        $success = $attributeSuccess && $this->appconfig->batch_save($batchSaveData);
+        $success = $this->appconfig->batch_save($batch_save_data);

-        $this->db->transComplete();
-
-        $success = $success && $this->db->transStatus();
-
-        return $this->response->setJSON(['success' => $success, 'message' => lang('Config.saved_' . ($success ? '' : 'un') . 'successfully')]);
+        echo json_encode(['success' => $success, 'message' => lang('Config.saved_' . ($success ? '' : 'un') . 'successfully')]);
    }

    /**
     * Checks a number against the currently selected locale. Used in app/Views/configs/locale_config.php
     *
-     * @return ResponseInterface
+     * @return void
     * @noinspection PhpUnused
     */
-    public function postCheckNumberLocale(): ResponseInterface
+    public function postCheckNumberLocale(): void
    {
-        $numberLocale = $this->request->getPost('number_locale');
-        $saveNumberLocale = $this->request->getPost('save_number_locale');
-        $postedCurrencySymbol = $this->request->getPost('currency_symbol');
-        $postedCurrencyCode = $this->request->getPost('currency_code');
+        $number_locale = $this->request->getPost('number_locale');
+        $save_number_locale = $this->request->getPost('save_number_locale');

-        $fmt = new NumberFormatter($numberLocale, NumberFormatter::CURRENCY);
-
-        // Use posted values if provided, otherwise fall back to locale defaults
-        $currencySymbol = $postedCurrencySymbol !== '' ? $postedCurrencySymbol : $fmt->getSymbol(NumberFormatter::CURRENCY_SYMBOL);
-        $currencyCode = $postedCurrencyCode !== '' ? $postedCurrencyCode : $fmt->getTextAttribute(NumberFormatter::CURRENCY_CODE);
-
-        // Update saved locale if it changed
-        if ($numberLocale !== $saveNumberLocale) {
-            $saveNumberLocale = $numberLocale;
+        $fmt = new NumberFormatter($number_locale, NumberFormatter::CURRENCY);
+        if ($number_locale != $save_number_locale) {
+            $currency_symbol = $fmt->getSymbol(NumberFormatter::CURRENCY_SYMBOL);
+            $currency_code = $fmt->getTextAttribute(NumberFormatter::CURRENCY_CODE);
+            $save_number_locale = $number_locale;
+        } else {
+            $currency_symbol = empty($this->request->getPost('currency_symbol')) ? $fmt->getSymbol(NumberFormatter::CURRENCY_SYMBOL) : $this->request->getPost('currency_symbol');
+            $currency_code = empty($this->request->getPost('currency_code')) ? $fmt->getTextAttribute(NumberFormatter::CURRENCY_CODE) : $this->request->getPost('currency_code');
        }

        if ($this->request->getPost('thousands_separator') == 'false') {
            $fmt->setTextAttribute(NumberFormatter::GROUPING_SEPARATOR_SYMBOL, '');
        }

-        $fmt->setSymbol(NumberFormatter::CURRENCY_SYMBOL, $currencySymbol);
-        $numberLocaleExample = $fmt->format(1234567890.12300);
+        $fmt->setSymbol(NumberFormatter::CURRENCY_SYMBOL, $currency_symbol);
+        $number_local_example = $fmt->format(1234567890.12300);

-        return $this->response->setJSON([
-            'success'               => $numberLocaleExample != false,
-            'save_number_locale'    => $saveNumberLocale,
-            'number_locale_example' => $numberLocaleExample,
-            'currency_symbol'       => $currencySymbol,
-            'currency_code'         => $currencyCode,
+        echo json_encode([
+            'success'               => $number_local_example != false,
+            'save_number_locale'    => $save_number_locale,
+            'number_locale_example' => $number_local_example,
+            'currency_symbol'       => $currency_symbol,
+            'currency_code'         => $currency_code,
        ]);
    }

@@ -469,15 +451,14 @@ class Config extends Secure_Controller
     * Saves locale configuration. Used in app/Views/configs/locale_config.php
     *
     * @throws ReflectionException
-     * @return ResponseInterface
+     * @return void
     * @noinspection PhpUnused
     */
-    public function postSaveLocale(): ResponseInterface
+    public function postSaveLocale(): void
    {
        $exploded = explode(":", $this->request->getPost('language'));
-        $currency_symbol = $this->request->getPost('currency_symbol');
        $batch_save_data = [
-            'currency_symbol'       => htmlspecialchars($currency_symbol ?? ''),
+            'currency_symbol'       => $this->request->getPost('currency_symbol'),
            'currency_code'         => $this->request->getPost('currency_code'),
            'language_code'         => $exploded[0],
            'language'              => $exploded[1],
@@ -499,17 +480,17 @@ class Config extends Secure_Controller

        $success = $this->appconfig->batch_save($batch_save_data);

-        return $this->response->setJSON(['success' => $success, 'message' => lang('Config.saved_' . ($success ? '' : 'un') . 'successfully')]);
+        echo json_encode(['success' => $success, 'message' => lang('Config.saved_' . ($success ? '' : 'un') . 'successfully')]);
    }

    /**
     * Saves email configuration. Used in app/Views/configs/email_config.php
     *
     * @throws ReflectionException
-     * @return ResponseInterface
+     * @return void
     * @noinspection PhpUnused
     */
-    public function postSaveEmail(): ResponseInterface
+    public function postSaveEmail(): void
    {
        $password = '';

@@ -517,24 +498,9 @@ class Config extends Secure_Controller
            $password = $this->encrypter->encrypt($this->request->getPost('smtp_pass'));
        }

-        $protocol = $this->request->getPost('protocol');
-        $mailpath = $this->request->getPost('mailpath');
-
-        // Validate mailpath: required for sendmail, optional for others but must be safe if provided
-        $isMailpathRequired = ($protocol === 'sendmail');
-        $isMailpathProvided = !empty($mailpath);
-        $isMailpathValid = $isMailpathProvided && preg_match('/^[a-zA-Z0-9_\-\/.]+$/', $mailpath);
-
-        if (($isMailpathRequired && !$isMailpathProvided) || ($isMailpathProvided && !$isMailpathValid)) {
-            return $this->response->setJSON([
-                'success' => false,
-                'message' => lang('Config.mailpath_invalid')
-            ]);
-        }
-
        $batch_save_data = [
-            'protocol'     => $protocol,
-            'mailpath'     => $mailpath,
+            'protocol'     => $this->request->getPost('protocol'),
+            'mailpath'     => $this->request->getPost('mailpath'),
            'smtp_host'    => $this->request->getPost('smtp_host'),
            'smtp_user'    => $this->request->getPost('smtp_user'),
            'smtp_pass'    => $password,
@@ -545,17 +511,17 @@ class Config extends Secure_Controller

        $success = $this->appconfig->batch_save($batch_save_data);

-        return $this->response->setJSON(['success' => $success, 'message' => lang('Config.saved_' . ($success ? '' : 'un') . 'successfully')]);
+        echo json_encode(['success' => $success, 'message' => lang('Config.saved_' . ($success ? '' : 'un') . 'successfully')]);
    }

    /**
     * Saves SMS message configuration. Used in app/Views/configs/message_config.php.
     *
     * @throws ReflectionException
-     * @return ResponseInterface
+     * @return void
     * @noinspection PhpUnused
     */
-    public function postSaveMessage(): ResponseInterface
+    public function postSaveMessage(): void
    {
        $password = '';

@@ -572,7 +538,7 @@ class Config extends Secure_Controller

        $success = $this->appconfig->batch_save($batch_save_data);

-        return $this->response->setJSON(['success' => $success, 'message' => lang('Config.saved_' . ($success ? '' : 'un') . 'successfully')]);
+        echo json_encode(['success' => $success, 'message' => lang('Config.saved_' . ($success ? '' : 'un') . 'successfully')]);
    }

    /**
@@ -599,15 +565,15 @@ class Config extends Secure_Controller
    /**
     * Gets Mailchimp lists when a valid API key is inserted. Used in app/Views/configs/integrations_config.php
     *
-     * @return ResponseInterface
+     * @return void
     * @noinspection PhpUnused
     */
-    public function postCheckMailchimpApiKey(): ResponseInterface
+    public function postCheckMailchimpApiKey(): void
    {
        $lists = $this->_mailchimp($this->request->getPost('mailchimp_api_key'));
        $success = count($lists) > 0;

-        return $this->response->setJSON([
+        echo json_encode([
            'success'         => $success,
            'message'         => lang('Config.mailchimp_key_' . ($success ? '' : 'un') . 'successfully'),
            'mailchimp_lists' => $lists
@@ -618,10 +584,10 @@ class Config extends Secure_Controller
     * Saves Mailchimp configuration. Used in app/Views/configs/integrations_config.php
     *
     * @throws ReflectionException
-     * @return ResponseInterface
+     * @return void
     * @noinspection PhpUnused
     */
-    public function postSaveMailchimp(): ResponseInterface
+    public function postSaveMailchimp(): void
    {
        $api_key = '';
        $list_id = '';
@@ -642,56 +608,56 @@ class Config extends Secure_Controller

        $success = $this->appconfig->batch_save($batch_save_data);

-        return $this->response->setJSON(['success' => $success, 'message' => lang('Config.saved_' . ($success ? '' : 'un') . 'successfully')]);
+        echo json_encode(['success' => $success, 'message' => lang('Config.saved_' . ($success ? '' : 'un') . 'successfully')]);
    }

    /**
     * Gets all stock locations. Used in app/Views/configs/stock_config.php
     *
-     * @return string
+     * @return void
     * @noinspection PhpUnused
     */
-    public function getStockLocations(): string
+    public function getStockLocations(): void
    {
        $stock_locations = $this->stock_location->get_all()->getResultArray();

-        return view('partial/stock_locations', ['stock_locations' => $stock_locations]);
+        echo view('partial/stock_locations', ['stock_locations' => $stock_locations]);
    }

    /**
-     * @return string
+     * @return void
     */
-    public function getDinnerTables(): string
+    public function getDinnerTables(): void
    {
        $dinner_tables = $this->dinner_table->get_all()->getResultArray();

-        return view('partial/dinner_tables', ['dinner_tables' => $dinner_tables]);
+        echo view('partial/dinner_tables', ['dinner_tables' => $dinner_tables]);
    }


    /**
     * Gets all tax categories.
     *
-     * @return string
+     * @return void
     */
-    public function ajax_tax_categories(): string    // TODO: Is this function called anywhere in the code?
+    public function ajax_tax_categories(): void    // TODO: Is this function called anywhere in the code?
    {
        $tax_categories = $this->tax->get_all_tax_categories()->getResultArray();

-        return view('partial/tax_categories', ['tax_categories' => $tax_categories]);
+        echo view('partial/tax_categories', ['tax_categories' => $tax_categories]);
    }

    /**
     * Gets all customer rewards. Used in app/Views/configs/reward_config.php
     *
-     * @return string
+     * @return void
     * @noinspection PhpUnused
     */
-    public function getCustomerRewards(): string
+    public function getCustomerRewards(): void
    {
        $customer_rewards = $this->customer_rewards->get_all()->getResultArray();

-        return view('partial/customer_rewards', ['customer_rewards' => $customer_rewards]);
+        echo view('partial/customer_rewards', ['customer_rewards' => $customer_rewards]);
    }

    /**
@@ -711,10 +677,10 @@ class Config extends Secure_Controller
    /**
     * Saves stock locations. Used in app/Views/configs/stock_config.php
     *
-     * @return ResponseInterface
+     * @return void
     * @noinspection PhpUnused
     */
-    public function postSaveLocations(): ResponseInterface
+    public function postSaveLocations(): void
    {
        $this->db->transStart();

@@ -746,17 +712,17 @@ class Config extends Secure_Controller

        $success = $this->db->transStatus();

-        return $this->response->setJSON(['success' => $success, 'message' => lang('Config.saved_' . ($success ? '' : 'un') . 'successfully')]);
+        echo json_encode(['success' => $success, 'message' => lang('Config.saved_' . ($success ? '' : 'un') . 'successfully')]);
    }

    /**
     * Saves all dinner tables. Used in app/Views/configs/table_config.php
     *
     * @throws ReflectionException
-     * @return ResponseInterface
+     * @return void
     * @noinspection PhpUnused
     */
-    public function postSaveTables(): ResponseInterface
+    public function postSaveTables(): void
    {
        $this->db->transStart();

@@ -793,17 +759,17 @@ class Config extends Secure_Controller

        $success = $this->db->transStatus();

-        return $this->response->setJSON(['success' => $success, 'message' => lang('Config.saved_' . ($success ? '' : 'un') . 'successfully')]);
+        echo json_encode(['success' => $success, 'message' => lang('Config.saved_' . ($success ? '' : 'un') . 'successfully')]);
    }

    /**
     * Saves tax configuration. Used in app/Views/configs/tax_config.php
     *
     * @throws ReflectionException
-     * @return ResponseInterface
+     * @return void
     * @noinspection PhpUnused
     */
-    public function postSaveTax(): ResponseInterface
+    public function postSaveTax(): void
    {
        $default_tax_1_rate = $this->request->getPost('default_tax_1_rate');
        $default_tax_2_rate = $this->request->getPost('default_tax_2_rate');
@@ -825,17 +791,17 @@ class Config extends Secure_Controller

        $message = lang('Config.saved_' . ($success ? '' : 'un') . 'successfully');

-        return $this->response->setJSON(['success' => $success, 'message' => $message]);
+        echo json_encode(['success' => $success, 'message' => $message]);
    }

    /**
     * Saves customer rewards configuration. Used in app/Views/configs/reward_config.php
     *
-      * @throws ReflectionException
-      * @return ResponseInterface
-      * @noinspection PhpUnused
-      */
-    public function postSaveRewards(): ResponseInterface
+     * @throws ReflectionException
+     * @return void
+     * @noinspection PhpUnused
+     */
+    public function postSaveRewards(): void
    {
        $this->db->transStart();

@@ -879,17 +845,17 @@ class Config extends Secure_Controller

        $success = $this->db->transStatus();

-        return $this->response->setJSON(['success' => $success, 'message' => lang('Config.saved_' . ($success ? '' : 'un') . 'successfully')]);
+        echo json_encode(['success' => $success, 'message' => lang('Config.saved_' . ($success ? '' : 'un') . 'successfully')]);
    }

    /**
     * Saves barcode configuration. Used in app/Views/configs/barcode_config.php
     *
     * @throws ReflectionException
-     * @return ResponseInterface
+     * @return void
     * @noinspection PhpUnused
     */
-    public function postSaveBarcode(): ResponseInterface
+    public function postSaveBarcode(): void
    {
        $batch_save_data = [
            'barcode_type'              => $this->request->getPost('barcode_type'),
@@ -911,22 +877,20 @@ class Config extends Secure_Controller

        $success = $this->appconfig->batch_save($batch_save_data);

-        return $this->response->setJSON(['success' => $success, 'message' => lang('Config.saved_' . ($success ? '' : 'un') . 'successfully')]);
+        echo json_encode(['success' => $success, 'message' => lang('Config.saved_' . ($success ? '' : 'un') . 'successfully')]);
    }

    /**
     * Saves receipt configuration. Used in app/Views/configs/receipt_config.php.
     *
     * @throws ReflectionException
-     * @return ResponseInterface
+     * @return void
     * @noinspection PhpUnused
     */
-    public function postSaveReceipt(): ResponseInterface
+    public function postSaveReceipt(): void
    {
        $batch_save_data = [
-            'receipt_template'              => Sale_lib::isValidReceiptTemplate($this->request->getPost('receipt_template'))
-                ? $this->request->getPost('receipt_template')
-                : 'receipt_default',
+            'receipt_template'              => $this->request->getPost('receipt_template'),
            'receipt_font_size'             => $this->request->getPost('receipt_font_size', FILTER_SANITIZE_NUMBER_INT),
            'print_delay_autoreturn'        => $this->request->getPost('print_delay_autoreturn', FILTER_SANITIZE_NUMBER_INT),
            'email_receipt_check_behaviour' => $this->request->getPost('email_receipt_check_behaviour'),
@@ -948,55 +912,17 @@ class Config extends Secure_Controller

        $success = $this->appconfig->batch_save($batch_save_data);

-        return $this->response->setJSON(['success' => $success, 'message' => lang('Config.saved_' . ($success ? '' : 'un') . 'successfully')]);
-    }
-
-    /**
-     * Saves keyboard shortcut bindings.
-     *
-     * @return ResponseInterface
-     * @noinspection PhpUnused
-     */
-    public function postSaveShortcuts(): ResponseInterface
-    {
-        $allowedShortcuts = array_keys($this->sale_lib->getKeyShortcutsOptions());
-        $currentShortcuts = $this->sale_lib->getKeyShortcuts();
-        $batchSaveData = [];
-
-        foreach ($currentShortcuts as $name => $shortcut) {
-            $postedValue = trim((string)$this->request->getPost('key_' . $name));
-
-            if (!in_array($postedValue, $allowedShortcuts, true)) {
-                $postedValue = $shortcut['value'];
-            }
-
-            $batchSaveData['key_' . $name] = $postedValue;
-        }
-
-        $duplicateValues = array_filter(array_count_values($batchSaveData), static fn(int $count): bool => $count > 1);
-        if (!empty($duplicateValues)) {
-            return $this->response->setJSON([
-                'success' => false,
-                'message' => lang('Config.shortcuts_duplicate_bindings')
-            ]);
-        }
-
-        $success = $this->appconfig->batch_save($batchSaveData);
-
-        return $this->response->setJSON([
-            'success' => $success,
-            'message' => lang('Config.saved_' . ($success ? '' : 'un') . 'successfully')
-        ]);
+        echo json_encode(['success' => $success, 'message' => lang('Config.saved_' . ($success ? '' : 'un') . 'successfully')]);
    }

    /**
     * Saves invoice configuration. Used in app/Views/configs/invoice_config.php.
     *
     * @throws ReflectionException
-     * @return ResponseInterface
+     * @return void
     * @noinspection PhpUnused
     */
-    public function postSaveInvoice(): ResponseInterface
+    public function postSaveInvoice(): void
    {
        $batch_save_data = [
            'invoice_enable'              => $this->request->getPost('invoice_enable') != null,
@@ -1012,9 +938,7 @@ class Config extends Secure_Controller
            'work_order_enable'           => $this->request->getPost('work_order_enable') != null,
            'work_order_format'           => $this->request->getPost('work_order_format'),
            'last_used_work_order_number' => $this->request->getPost('last_used_work_order_number', FILTER_SANITIZE_NUMBER_INT),
-            'invoice_type'                => Sale_lib::isValidInvoiceType($this->request->getPost('invoice_type')) 
-                ? $this->request->getPost('invoice_type') 
-                : 'invoice'
+            'invoice_type'                => $this->request->getPost('invoice_type')
        ];

        $success = $this->appconfig->batch_save($batch_save_data);
@@ -1029,42 +953,20 @@ class Config extends Secure_Controller
            }
        }

-        return $this->response->setJSON(['success' => $success, 'message' => lang('Config.saved_' . ($success ? '' : 'un') . 'successfully')]);
+        echo json_encode(['success' => $success, 'message' => lang('Config.saved_' . ($success ? '' : 'un') . 'successfully')]);
    }

    /**
     * Removes the company logo from the database. Used in app/Views/configs/info_config.php.
     *
-     * @return ResponseInterface
+     * @return void
     * @throws ReflectionException
     * @noinspection PhpUnused
     */
-    public function postRemoveLogo(): ResponseInterface
+    public function postRemoveLogo(): void
    {
        $success = $this->appconfig->save(['company_logo' => '']);

-        return $this->response->setJSON(['success' => $success]);
-    }
-
-    /**
-     * Validates suggestions column configuration to prevent SQL injection.
-     *
-     * @param mixed $column The column value from POST
-     * @param string $fieldType Either 'first' or 'other' to determine default fallback
-     * @return string Validated column name
-     */
-    private function validateSuggestionsColumn(mixed $column, string $fieldType): string
-    {
-        if (!is_string($column)) {
-            return $fieldType === 'first' ? 'name' : '';
-        }
-
-        $allowed = $fieldType === 'first' 
-            ? Item::ALLOWED_SUGGESTIONS_COLUMNS 
-            : Item::ALLOWED_SUGGESTIONS_COLUMNS_WITH_EMPTY;
-
-        $fallback = $fieldType === 'first' ? 'name' : '';
-
-        return in_array($column, $allowed, true) ? $column : $fallback;
+        echo json_encode(['success' => $success]);
    }
 }
--- a/app/Controllers/Customers.php
+++ b/app/Controllers/Customers.php
@@ -8,7 +8,6 @@ use App\Models\Customer;
 use App\Models\Customer_rewards;
 use App\Models\Tax_code;
 use CodeIgniter\HTTP\DownloadResponse;
-use CodeIgniter\HTTP\ResponseInterface;
 use Config\OSPOS;
 use Config\Services;
 use stdClass;
@@ -41,20 +40,19 @@ class Customers extends Persons
    }

    /**
-     * @return string
+     * @return void
     */
-    public function getIndex(): string
+    public function getIndex(): void
    {
        $data['table_headers'] = get_customer_manage_table_headers();

-        return view('people/manage', $data);
+        echo view('people/manage', $data);
    }

    /**
     * Gets one row for a customer manage table. This is called using AJAX to update one row.
-     * @return ResponseInterface
     */
-    public function getRow(int $row_id): ResponseInterface
+    public function getRow(int $row_id): void
    {
        $person = $this->customer->get_info($row_id);

@@ -74,7 +72,7 @@ class Customers extends Persons

        $data_row = get_customer_data_row($person, $stats);

-        return $this->response->setJSON($data_row);
+        echo json_encode($data_row);
    }


@@ -83,7 +81,7 @@ class Customers extends Persons
     *
     * @return void
     */
-    public function getSearch(): ResponseInterface
+    public function getSearch(): void
    {
        $search = $this->request->getGet('search');
        $limit = $this->request->getGet('limit', FILTER_SANITIZE_NUMBER_INT);
@@ -113,37 +111,35 @@ class Customers extends Persons
            $data_rows[] = get_customer_data_row($person, $stats);
        }

-        return $this->response->setJSON(['total' => $total_rows, 'rows' => $data_rows]);
+        echo json_encode(['total' => $total_rows, 'rows' => $data_rows]);
    }

    /**
     * Gives search suggestions based on what is being searched for
-     * @return ResponseInterface
     */
-    public function getSuggest(): ResponseInterface
+    public function getSuggest(): void
    {
        $search = $this->request->getGet('term');
        $suggestions = $this->customer->get_search_suggestions($search);

-        return $this->response->setJSON($suggestions);
+        echo json_encode($suggestions);
    }

    /**
-     * @return ResponseInterface
+     * @return void
     */
-    public function suggest_search(): ResponseInterface
+    public function suggest_search(): void
    {
        $search = $this->request->getGet('term');
        $suggestions = $this->customer->get_search_suggestions($search, 25, false);

-        return $this->response->setJSON($suggestions);
+        echo json_encode($suggestions);
    }

    /**
     * Loads the customer edit form
-     * @return string
     */
-    public function getView(int $customer_id = NEW_ENTRY): string
+    public function getView(int $customer_id = NEW_ENTRY): void
    {
        // Set default values
        if ($customer_id == null) $customer_id = NEW_ENTRY;
@@ -231,14 +227,13 @@ class Customers extends Persons
            }
        }

-        return view("customers/form", $data);
+        echo view("customers/form", $data);
    }

    /**
     * Inserts/updates a customer
-     * @return ResponseInterface
     */
-    public function postSave(int $customer_id = NEW_ENTRY): ResponseInterface
+    public function postSave(int $customer_id = NEW_ENTRY): void
    {
        $first_name = $this->request->getPost('first_name');
        $last_name = $this->request->getPost('last_name');
@@ -293,20 +288,20 @@ class Customers extends Persons

            // New customer
            if ($customer_id == NEW_ENTRY) {
-                return $this->response->setJSON([
+                echo json_encode([
                    'success' => true,
                    'message' => lang('Customers.successful_adding') . ' ' . $first_name . ' ' . $last_name,
                    'id'      => $customer_data['person_id']
                ]);
            } else { // Existing customer
-                return $this->response->setJSON([
+                echo json_encode([
                    'success' => true,
                    'message' => lang('Customers.successful_updating') . ' ' . $first_name . ' ' . $last_name,
                    'id'      => $customer_id
                ]);
            }
        } else { // Failure
-            return $this->response->setJSON([
+            echo json_encode([
                'success' => false,
                'message' => lang('Customers.error_adding_updating') . ' ' . $first_name . ' ' . $last_name,
                'id'      => NEW_ENTRY
@@ -317,37 +312,36 @@ class Customers extends Persons
    /**
     * Verifies if an email address already exists. Used in app/Views/customers/form.php
     *
-     * @return ResponseInterface
+     * @return void
     * @noinspection PhpUnused
     */
-    public function postCheckEmail(): ResponseInterface
+    public function postCheckEmail(): void
    {
        $email = strtolower($this->request->getPost('email', FILTER_SANITIZE_EMAIL));
        $person_id = $this->request->getPost('person_id', FILTER_SANITIZE_NUMBER_INT);

        $exists = $this->customer->check_email_exists($email, $person_id);

-        return $this->response->setJSON(!$exists ? 'true' : 'false');
+        echo !$exists ? 'true' : 'false';
    }

    /**
     * Verifies if an account number already exists. Used in app/Views/customers/form.php
     *
-     * @return ResponseInterface
+     * @return void
     * @noinspection PhpUnused
     */
-    public function postCheckAccountNumber(): ResponseInterface
+    public function postCheckAccountNumber(): void
    {
        $exists = $this->customer->check_account_number_exists($this->request->getPost('account_number'), $this->request->getPost('person_id', FILTER_SANITIZE_NUMBER_INT));

-        return $this->response->setJSON(!$exists ? 'true' : 'false');
+        echo !$exists ? 'true' : 'false';
    }

    /**
     * This deletes customers from the customers table
-     * @return ResponseInterface
     */
-    public function postDelete(): ResponseInterface
+    public function postDelete(): void
    {
        $customers_to_delete = $this->request->getPost('ids');
        $customers_info = $this->customer->get_multiple_info($customers_to_delete);
@@ -364,12 +358,12 @@ class Customers extends Persons
        }

        if ($count == count($customers_to_delete)) {
-            return $this->response->setJSON([
+            echo json_encode([
                'success' => true,
                'message' => lang('Customers.successful_deleted') . ' ' . $count . ' ' . lang('Customers.one_or_multiple')
            ]);
        } else {
-            return $this->response->setJSON(['success' => false, 'message' => lang('Customers.cannot_be_deleted')]);
+            echo json_encode(['success' => false, 'message' => lang('Customers.cannot_be_deleted')]);
        }
    }

@@ -389,24 +383,24 @@ class Customers extends Persons
    /**
     * Displays the customer CSV import modal. Used in app/Views/people/manage.php
     *
-     * @return string
+     * @return void
     * @noinspection PhpUnused
     */
-    public function getCsvImport(): string
+    public function getCsvImport(): void
    {
-        return view('customers/form_csv_import');
+        echo view('customers/form_csv_import');
    }

    /**
     * Imports a CSV file containing customers. Used in app/Views/customers/form_csv_import.php
     *
-     * @return ResponseInterface
+     * @return void
     * @noinspection PhpUnused
     */
-    public function postImportCsvFile(): ResponseInterface
+    public function postImportCsvFile(): void
    {
        if ($_FILES['file_path']['error'] != UPLOAD_ERR_OK) {
-            return $this->response->setJSON(['success' => false, 'message' => lang('Customers.csv_import_failed')]);
+            echo json_encode(['success' => false, 'message' => lang('Customers.csv_import_failed')]);
        } else {
            if (($handle = fopen($_FILES['file_path']['tmp_name'], 'r')) !== false) {
                // Skip the first row as it's the table description
@@ -473,12 +467,12 @@ class Customers extends Persons
                if (count($failCodes) > 0) {
                    $message = lang('Customers.csv_import_partially_failed', [count($failCodes), implode(', ', $failCodes)]);

-                    return $this->response->setJSON(['success' => false, 'message' => $message]);
+                    echo json_encode(['success' => false, 'message' => $message]);
                } else {
-                    return $this->response->setJSON(['success' => true, 'message' => lang('Customers.csv_import_success')]);
+                    echo json_encode(['success' => true, 'message' => lang('Customers.csv_import_success')]);
                }
            } else {
-                return $this->response->setJSON(['success' => false, 'message' => lang('Customers.csv_import_nodata_wrongformat')]);
+                echo json_encode(['success' => false, 'message' => lang('Customers.csv_import_nodata_wrongformat')]);
            }
        }
    }
--- a/app/Controllers/Employees.php
+++ b/app/Controllers/Employees.php
@@ -3,7 +3,6 @@
 namespace App\Controllers;

 use App\Models\Module;
-use CodeIgniter\HTTP\ResponseInterface;
 use Config\Services;

 /**
@@ -26,7 +25,7 @@ class Employees extends Persons
     *
     * @return void
     */
-    public function getSearch(): ResponseInterface
+    public function getSearch(): void
    {
        $search = $this->request->getGet('search');
        $limit  = $this->request->getGet('limit', FILTER_SANITIZE_NUMBER_INT);
@@ -42,47 +41,39 @@ class Employees extends Persons
            $data_rows[] = get_person_data_row($person);
        }

-        return $this->response->setJSON(['total' => $total_rows, 'rows' => $data_rows]);
+        echo json_encode(['total' => $total_rows, 'rows' => $data_rows]);
    }

    /**
     * AJAX called function gives search suggestions based on what is being searched for.
     *
-     * @return ResponseInterface
+     * @return void
     */
-    public function getSuggest(): ResponseInterface
+    public function getSuggest(): void
    {
        $search = $this->request->getGet('term');
        $suggestions = $this->employee->get_search_suggestions($search, 25, true);

-        return $this->response->setJSON($suggestions);
+        echo json_encode($suggestions);
    }

    /**
-     * @return ResponseInterface
+     * @return void
     */
-    public function suggest_search(): ResponseInterface
+    public function suggest_search(): void
    {
        $search = $this->request->getPost('term');
        $suggestions = $this->employee->get_search_suggestions($search);

-        return $this->response->setJSON($suggestions);
+        echo json_encode($suggestions);
    }

    /**
     * Loads the employee edit form
-     * @return string
     */
-    public function getView(int $employee_id = NEW_ENTRY): string
+    public function getView(int $employee_id = NEW_ENTRY): void
    {
        $person_info = $this->employee->get_info($employee_id);
-        $current_user = $this->employee->get_logged_in_employee_info();
-
-        if ($employee_id != NEW_ENTRY && !$this->employee->canModifyEmployee($person_info->person_id, $current_user->person_id)) {
-            header('Location: ' . base_url('no_access/employees/employees'));
-            exit();
-        }
-
        foreach (get_object_vars($person_info) as $property => $value) {
            $person_info->$property = $value;
        }
@@ -107,28 +98,14 @@ class Employees extends Persons
        }
        $data['all_subpermissions'] = $permissions;

-        return view('employees/form', $data);
+        echo view('employees/form', $data);
    }

    /**
     * Inserts/updates an employee
-     * @return ResponseInterface
     */
-    public function postSave(int $employee_id = NEW_ENTRY): ResponseInterface
+    public function postSave(int $employee_id = NEW_ENTRY): void
    {
-        $current_user = $this->employee->get_logged_in_employee_info();
-
-        if ($employee_id != NEW_ENTRY) {
-            $target_employee = $this->employee->get_info($employee_id);
-            if (!$this->employee->canModifyEmployee($target_employee->person_id, $current_user->person_id)) {
-                return $this->response->setJSON([
-                    'success' => false,
-                    'message' => lang('Employees.error_updating_admin'),
-                    'id'      => NEW_ENTRY
-                ]);
-            }
-        }
-
        $first_name = $this->request->getPost('first_name', FILTER_SANITIZE_FULL_SPECIAL_CHARS);    // TODO: duplicated code
        $last_name = $this->request->getPost('last_name', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
        $email = strtolower($this->request->getPost('email', FILTER_SANITIZE_EMAIL));
@@ -153,16 +130,11 @@ class Employees extends Persons
        ];

        $grants_array = [];
-        $isAdmin = $this->employee->isAdmin($current_user->person_id);
-
        foreach ($this->module->get_all_permissions()->getResult() as $permission) {
            $grants = [];
            $grant = $this->request->getPost('grant_' . $permission->permission_id) != null ? $this->request->getPost('grant_' . $permission->permission_id, FILTER_SANITIZE_FULL_SPECIAL_CHARS) : '';

            if ($grant == $permission->permission_id) {
-                if (!$isAdmin && !$this->employee->has_grant($permission->permission_id, $current_user->person_id)) {
-                    continue;
-                }
                $grants['permission_id'] = $permission->permission_id;
                $grants['menu_group'] = $this->request->getPost('menu_group_' . $permission->permission_id) != null ? $this->request->getPost('menu_group_' . $permission->permission_id, FILTER_SANITIZE_FULL_SPECIAL_CHARS) : '--';
                $grants_array[] = $grants;
@@ -191,25 +163,20 @@ class Employees extends Persons
        if ($this->employee->save_employee($person_data, $employee_data, $grants_array, $employee_id)) {
            // New employee
            if ($employee_id == NEW_ENTRY) {
-                return $this->response->setJSON([
+                echo json_encode([
                    'success' => true,
                    'message' => lang('Employees.successful_adding') . ' ' . $first_name . ' ' . $last_name,
                    'id'      => $employee_data['person_id']
                ]);
            } else { // Existing employee
-                $logged_in_employee_id = session()->get('person_id');
-                if ($employee_id == $logged_in_employee_id) {
-                    session()->set('language_code', $employee_data['language_code']);
-                    session()->set('language', $employee_data['language']);
-                }
-                return $this->response->setJSON([
+                echo json_encode([
                    'success' => true,
                    'message' => lang('Employees.successful_updating') . ' ' . $first_name . ' ' . $last_name,
                    'id'      => $employee_id
                ]);
            }
        } else { // Failure
-            return $this->response->setJSON([
+            echo json_encode([
                'success' => false,
                'message' => lang('Employees.error_adding_updating') . ' ' . $first_name . ' ' . $last_name,
                'id'      => NEW_ENTRY
@@ -219,28 +186,18 @@ class Employees extends Persons

    /**
     * This deletes employees from the employees table
-     * @return ResponseInterface
     */
-    public function postDelete(): ResponseInterface
+    public function postDelete(): void
    {
        $employees_to_delete = $this->request->getPost('ids', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
-        $current_user = $this->employee->get_logged_in_employee_info();
-
-        if (!$this->employee->isAdmin($current_user->person_id)) {
-            foreach ($employees_to_delete as $emp_id) {
-                if ($this->employee->isAdmin((int)$emp_id)) {
-                    return $this->response->setJSON(['success' => false, 'message' => lang('Employees.error_deleting_admin')]);
-                }
-            }
-        }

        if ($this->employee->delete_list($employees_to_delete)) {    // TODO: this is passing a string, but delete_list expects an array
-            return $this->response->setJSON([
+            echo json_encode([
                'success' => true,
                'message' => lang('Employees.successful_deleted') . ' ' . count($employees_to_delete) . ' ' . lang('Employees.one_or_multiple')
            ]);
        } else {
-            return $this->response->setJSON(['success' => false, 'message' => lang('Employees.cannot_be_deleted')]);
+            echo json_encode(['success' => false, 'message' => lang('Employees.cannot_be_deleted')]);
        }
    }

@@ -248,12 +205,12 @@ class Employees extends Persons
     * Checks an employee username against the database. Used in app\Views\employees\form.php
     *
     * @param $employee_id
-     * @return ResponseInterface
+     * @return void
     * @noinspection PhpUnused
     */
-    public function getCheckUsername($employee_id): ResponseInterface
+    public function getCheckUsername($employee_id): void
    {
        $exists = $this->employee->username_exists($employee_id, $this->request->getGet('username'));
-        return $this->response->setJSON(!$exists ? 'true' : 'false');
+        echo !$exists ? 'true' : 'false';
    }
 }
--- a/app/Controllers/Expenses.php
+++ b/app/Controllers/Expenses.php
@@ -4,7 +4,6 @@ namespace App\Controllers;

 use App\Models\Expense;
 use App\Models\Expense_category;
-use CodeIgniter\HTTP\ResponseInterface;
 use Config\OSPOS;
 use Config\Services;

@@ -24,7 +23,7 @@ class Expenses extends Secure_Controller
    /**
     * @return void
     */
-    public function getIndex(): string
+    public function getIndex(): void
    {
        $data['table_headers'] = get_expenses_manage_table_headers();

@@ -38,16 +37,13 @@ class Expenses extends Secure_Controller
            'is_deleted'  => lang('Expenses.is_deleted')
        ];

-        // Restore filters from URL
-        $data = array_merge($data, restoreTableFilters($this->request));
-
-        return view('expenses/manage', $data);
+        echo view('expenses/manage', $data);
    }

    /**
     * @return void
     */
-    public function getSearch(): ResponseInterface
+    public function getSearch(): void
    {
        $search   = $this->request->getGet('search');
        $limit    = $this->request->getGet('limit', FILTER_SANITIZE_NUMBER_INT);
@@ -82,34 +78,27 @@ class Expenses extends Secure_Controller
            $data_rows[] = get_expenses_data_last_row($expenses);
        }

-        return $this->response->setJSON(['total' => $total_rows, 'rows' => $data_rows, 'payment_summary' => $payment_summary]);
+        echo json_encode(['total' => $total_rows, 'rows' => $data_rows, 'payment_summary' => $payment_summary]);
    }

    /**
     * @param int $expense_id
     * @return void
     */
-    public function getView(int $expense_id = NEW_ENTRY): string
+    public function getView(int $expense_id = NEW_ENTRY): void
    {
        $data = [];    // TODO: Duplicated code

-        $data['expenses_info'] = $this->expense->get_info($expense_id);
-        $expense_id = $data['expenses_info']->expense_id;
-
-        $current_employee_id = $this->employee->get_logged_in_employee_info()->person_id;
-        $can_assign_employee = $this->employee->has_grant('employees', $current_employee_id);
-
        $data['employees'] = [];
-        if ($can_assign_employee) {
-            foreach ($this->employee->get_all()->getResult() as $employee) {
-                $data['employees'][$employee->person_id] = $employee->first_name . ' ' . $employee->last_name;
+        foreach ($this->employee->get_all()->getResult() as $employee) {
+            foreach (get_object_vars($employee) as $property => $value) {
+                $employee->$property = $value;
            }
-        } else {
-            $stored_employee_id = $expense_id == NEW_ENTRY ? $current_employee_id : $data['expenses_info']->employee_id;
-            $stored_employee = $this->employee->get_info($stored_employee_id);
-            $data['employees'][$stored_employee_id] = $stored_employee->first_name . ' ' . $stored_employee->last_name;
+
+            $data['employees'][$employee->person_id] = $employee->first_name . ' ' . $employee->last_name;
        }
-        $data['can_assign_employee'] = $can_assign_employee;
+
+        $data['expenses_info'] = $this->expense->get_info($expense_id);

        $expense_categories = [];
        foreach ($this->expense_category->get_all(0, 0, true)->getResultArray() as $row) {
@@ -117,9 +106,11 @@ class Expenses extends Secure_Controller
        }
        $data['expense_categories'] = $expense_categories;

+        $expense_id = $data['expenses_info']->expense_id;
+
        if ($expense_id == NEW_ENTRY) {
            $data['expenses_info']->date = date('Y-m-d H:i:s');
-            $data['expenses_info']->employee_id = $current_employee_id;
+            $data['expenses_info']->employee_id = $this->employee->get_logged_in_employee_info()->person_id;
        }

        $data['payments'] = [];
@@ -134,46 +125,32 @@ class Expenses extends Secure_Controller
        // Don't allow gift card to be a payment option in a sale transaction edit because it's a complex change
        $data['payment_options'] = $this->expense->get_payment_options();

-        return view("expenses/form", $data);
+        echo view("expenses/form", $data);
    }

    /**
     * @param int $row_id
-     * @return ResponseInterface
+     * @return void
     */
-    public function getRow(int $row_id): ResponseInterface
+    public function getRow(int $row_id): void
    {
        $expense_info = $this->expense->get_info($row_id);
        $data_row = get_expenses_data_row($expense_info);

-        return $this->response->setJSON($data_row);
+        echo json_encode($data_row);
    }

    /**
     * @param int $expense_id
-     * @return ResponseInterface
+     * @return void
     */
-    public function postSave(int $expense_id = NEW_ENTRY): ResponseInterface
+    public function postSave(int $expense_id = NEW_ENTRY): void
    {
        $config = config(OSPOS::class)->settings;
        $newdate = $this->request->getPost('date', FILTER_SANITIZE_FULL_SPECIAL_CHARS);

        $date_formatter = date_create_from_format($config['dateformat'] . ' ' . $config['timeformat'], $newdate);

-        $current_employee_id = $this->employee->get_logged_in_employee_info()->person_id;
-        $submitted_employee_id = $this->request->getPost('employee_id', FILTER_SANITIZE_NUMBER_INT);
-
-        if (!$this->employee->has_grant('employees', $current_employee_id)) {
-            if ($expense_id == NEW_ENTRY) {
-                $employee_id = $current_employee_id;
-            } else {
-                $existing_expense = $this->expense->get_info($expense_id);
-                $employee_id = $existing_expense->employee_id;
-            }
-        } else {
-            $employee_id = $submitted_employee_id;
-        }
-
        $expense_data = [
            'date'                => $date_formatter->format('Y-m-d H:i:s'),
            'supplier_id'         => $this->request->getPost('supplier_id') == '' ? null : $this->request->getPost('supplier_id', FILTER_SANITIZE_NUMBER_INT),
@@ -183,33 +160,33 @@ class Expenses extends Secure_Controller
            'payment_type'        => $this->request->getPost('payment_type', FILTER_SANITIZE_FULL_SPECIAL_CHARS),
            'expense_category_id' => $this->request->getPost('expense_category_id', FILTER_SANITIZE_NUMBER_INT),
            'description'         => $this->request->getPost('description', FILTER_SANITIZE_FULL_SPECIAL_CHARS),
-            'employee_id'         => $employee_id,
+            'employee_id'         => $this->request->getPost('employee_id', FILTER_SANITIZE_NUMBER_INT),
            'deleted'             => $this->request->getPost('deleted') != null
        ];

        if ($this->expense->save_value($expense_data, $expense_id)) {
            // New Expense
            if ($expense_id == NEW_ENTRY) {
-                return $this->response->setJSON(['success' => true, 'message' => lang('Expenses.successful_adding'), 'id' => $expense_data['expense_id']]);
+                echo json_encode(['success' => true, 'message' => lang('Expenses.successful_adding'), 'id' => $expense_data['expense_id']]);
            } else { // Existing Expense
-                return $this->response->setJSON(['success' => true, 'message' => lang('Expenses.successful_updating'), 'id' => $expense_id]);
+                echo json_encode(['success' => true, 'message' => lang('Expenses.successful_updating'), 'id' => $expense_id]);
            }
        } else { // Failure
-            return $this->response->setJSON(['success' => false, 'message' => lang('Expenses.error_adding_updating'), 'id' => NEW_ENTRY]);
+            echo json_encode(['success' => false, 'message' => lang('Expenses.error_adding_updating'), 'id' => NEW_ENTRY]);
        }
    }

    /**
-     * @return ResponseInterface
+     * @return void
     */
-    public function postDelete(): ResponseInterface
+    public function postDelete(): void
    {
        $expenses_to_delete = $this->request->getPost('ids', FILTER_SANITIZE_FULL_SPECIAL_CHARS);

        if ($this->expense->delete_list($expenses_to_delete)) {
-            return $this->response->setJSON(['success' => true, 'message' => lang('Expenses.successful_deleted') . ' ' . count($expenses_to_delete) . ' ' . lang('Expenses.one_or_multiple'), 'ids' => $expenses_to_delete]);
+            echo json_encode(['success' => true, 'message' => lang('Expenses.successful_deleted') . ' ' . count($expenses_to_delete) . ' ' . lang('Expenses.one_or_multiple'), 'ids' => $expenses_to_delete]);
        } else {
-            return $this->response->setJSON(['success' => false, 'message' => lang('Expenses.cannot_be_deleted'), 'ids' => $expenses_to_delete]);
+            echo json_encode(['success' => false, 'message' => lang('Expenses.cannot_be_deleted'), 'ids' => $expenses_to_delete]);
        }
    }
 }
--- a/app/Controllers/Expenses_categories.php
+++ b/app/Controllers/Expenses_categories.php
@@ -3,7 +3,6 @@
 namespace App\Controllers;

 use App\Models\Expense_category;
-use CodeIgniter\HTTP\ResponseInterface;
 use Config\Services;

 class Expenses_categories extends Secure_Controller    // TODO: Is this class ever used?
@@ -20,17 +19,17 @@ class Expenses_categories extends Secure_Controller    // TODO: Is this class ev
    /**
     * @return void
     */
-    public function getIndex(): string
+    public function getIndex(): void
    {
        $data['table_headers'] = get_expense_category_manage_table_headers();

-        return view('expenses_categories/manage', $data);
+        echo view('expenses_categories/manage', $data);
    }

    /**
     * Returns expense_category_manage table data rows. This will be called with AJAX.
     **/
-    public function getSearch(): ResponseInterface
+    public function getSearch(): void
    {
        $search = $this->request->getGet('search');
        $limit  = $this->request->getGet('limit', FILTER_SANITIZE_NUMBER_INT);
@@ -46,36 +45,36 @@ class Expenses_categories extends Secure_Controller    // TODO: Is this class ev
            $data_rows[] = get_expense_category_data_row($expense_category);
        }

-        return $this->response->setJSON(['total' => $total_rows, 'rows' => $data_rows]);
+        echo json_encode(['total' => $total_rows, 'rows' => $data_rows]);
    }

    /**
     * @param int $row_id
     * @return void
     */
-    public function getRow(int $row_id): ResponseInterface
+    public function getRow(int $row_id): void
    {
        $data_row = get_expense_category_data_row($this->expense_category->get_info($row_id));

-        return $this->response->setJSON($data_row);
+        echo json_encode($data_row);
    }

    /**
     * @param int $expense_category_id
     * @return void
     */
-    public function getView(int $expense_category_id = NEW_ENTRY): string
+    public function getView(int $expense_category_id = NEW_ENTRY): void
    {
        $data['category_info'] = $this->expense_category->get_info($expense_category_id);

-        return view("expenses_categories/form", $data);
+        echo view("expenses_categories/form", $data);
    }

    /**
     * @param int $expense_category_id
     * @return void
     */
-    public function postSave(int $expense_category_id = NEW_ENTRY): ResponseInterface
+    public function postSave(int $expense_category_id = NEW_ENTRY): void
    {
        $expense_category_data = [
            'category_name'        => $this->request->getPost('category_name', FILTER_SANITIZE_FULL_SPECIAL_CHARS),
@@ -85,20 +84,20 @@ class Expenses_categories extends Secure_Controller    // TODO: Is this class ev
        if ($this->expense_category->save_value($expense_category_data, $expense_category_id)) {
            // New expense_category
            if ($expense_category_id == NEW_ENTRY) {
-                return $this->response->setJSON([
+                echo json_encode([
                    'success' => true,
                    'message' => lang('Expenses_categories.successful_adding'),
                    'id'      => $expense_category_data['expense_category_id']
                ]);
            } else { // Existing Expense Category
-                return $this->response->setJSON([
+                echo json_encode([
                    'success' => true,
                    'message' => lang('Expenses_categories.successful_updating'),
                    'id'      => $expense_category_id
                ]);
            }
        } else { // Failure
-            return $this->response->setJSON([
+            echo json_encode([
                'success' => true,
                'message' => lang('Expenses_categories.error_adding_updating') . ' ' . $expense_category_data['category_name'],
                'id'      => NEW_ENTRY
@@ -109,17 +108,17 @@ class Expenses_categories extends Secure_Controller    // TODO: Is this class ev
    /**
     * @return void
     */
-    public function postDelete(): ResponseInterface
+    public function postDelete(): void
    {
        $expense_category_to_delete = $this->request->getPost('ids', FILTER_SANITIZE_FULL_SPECIAL_CHARS);

        if ($this->expense_category->delete_list($expense_category_to_delete)) {    // TODO: Convert to ternary notation.
-            return $this->response->setJSON([
+            echo json_encode([
                'success' => true,
                'message' => lang('Expenses_categories.successful_deleted') . ' ' . count($expense_category_to_delete) . ' ' . lang('Expenses_categories.one_or_multiple')
            ]);
        } else {
-            return $this->response->setJSON(['success' => false, 'message' => lang('Expenses_categories.cannot_be_deleted')]);
+            echo json_encode(['success' => false, 'message' => lang('Expenses_categories.cannot_be_deleted')]);
        }
    }
 }
--- a/app/Controllers/Giftcards.php
+++ b/app/Controllers/Giftcards.php
@@ -3,7 +3,6 @@
 namespace App\Controllers;

 use App\Models\Giftcard;
-use CodeIgniter\HTTP\ResponseInterface;
 use Config\OSPOS;
 use Config\Services;

@@ -19,19 +18,19 @@ class Giftcards extends Secure_Controller
    }

    /**
-     * @return string
+     * @return void
     */
-    public function getIndex(): string
+    public function getIndex(): void
    {
        $data['table_headers'] = get_giftcards_manage_table_headers();

-        return view('giftcards/manage', $data);
+        echo view('giftcards/manage', $data);
    }

    /**
     * Returns Giftcards table data rows. This will be called with AJAX.
     */
-    public function getSearch(): ResponseInterface
+    public function getSearch(): void
    {
        $search = $this->request->getGet('search');
        $limit  = $this->request->getGet('limit', FILTER_SANITIZE_NUMBER_INT);
@@ -47,50 +46,50 @@ class Giftcards extends Secure_Controller
            $data_rows[] = get_giftcard_data_row($giftcard);
        }

-        return $this->response->setJSON(['total' => $total_rows, 'rows' => $data_rows]);
+        echo json_encode(['total' => $total_rows, 'rows' => $data_rows]);
    }

    /**
     * Gets search suggestions for giftcards. Used in app\Views\sales\register.php
     *
-     * @return ResponseInterface
+     * @return void
     * @noinspection PhpUnused
     */
-    public function getSuggest(): ResponseInterface
+    public function getSuggest(): void
    {
        $search = $this->request->getGet('term');
        $suggestions = $this->giftcard->get_search_suggestions($search, true);

-        return $this->response->setJSON($suggestions);
+        echo json_encode($suggestions);
    }

    /**
-     * @return ResponseInterface
+     * @return void
     */
-    public function suggest_search(): ResponseInterface
+    public function suggest_search(): void
    {
        $search = $this->request->getPost('term');
        $suggestions = $this->giftcard->get_search_suggestions($search);

-        return $this->response->setJSON($suggestions);
+        echo json_encode($suggestions);
    }

    /**
     * @param int $row_id
-     * @return ResponseInterface
+     * @return void
     */
-    public function getRow(int $row_id): ResponseInterface
+    public function getRow(int $row_id): void
    {
        $data_row = get_giftcard_data_row($this->giftcard->get_info($row_id));

-        return $this->response->setJSON($data_row);
+        echo json_encode($data_row);
    }

    /**
     * @param int $giftcard_id
-     * @return string
+     * @return void
     */
-    public function getView(int $giftcard_id = NEW_ENTRY): string
+    public function getView(int $giftcard_id = NEW_ENTRY): void
    {
        $config = config(OSPOS::class)->settings;
        $giftcard_info = $this->giftcard->get_info($giftcard_id);
@@ -107,14 +106,14 @@ class Giftcards extends Secure_Controller
        $data['giftcard_id'] = $giftcard_id;
        $data['giftcard_value'] = $giftcard_info->value;

-        return view("giftcards/form", $data);
+        echo view("giftcards/form", $data);
    }

    /**
     * @param int $giftcard_id
-     * @return ResponseInterface
+     * @return void
     */
-    public function postSave(int $giftcard_id = NEW_ENTRY): ResponseInterface
+    public function postSave(int $giftcard_id = NEW_ENTRY): void
    {
        $giftcard_number = $this->request->getPost('giftcard_number', FILTER_SANITIZE_FULL_SPECIAL_CHARS);

@@ -126,26 +125,26 @@ class Giftcards extends Secure_Controller
            'record_time'     => date('Y-m-d H:i:s'),
            'giftcard_number' => $giftcard_number,
            'value'           => parse_decimals($this->request->getPost('giftcard_amount')),
-            'person_id'       => empty($this->request->getPost('person_id')) ? null : $this->request->getPost('person_id', FILTER_SANITIZE_NUMBER_INT)
+            'person_id'       => $this->request->getPost('person_id') == '' ? null : $this->request->getPost('person_id', FILTER_SANITIZE_NUMBER_INT)
        ];

        if ($this->giftcard->save_value($giftcard_data, $giftcard_id)) {
            // New giftcard
            if ($giftcard_id == NEW_ENTRY) {    // TODO: Constant needed
-                return $this->response->setJSON([
+                echo json_encode([
                    'success' => true,
                    'message' => lang('Giftcards.successful_adding') . ' ' . $giftcard_data['giftcard_number'],
                    'id'      => $giftcard_data['giftcard_id']
                ]);
            } else { // Existing giftcard
-                return $this->response->setJSON([
+                echo json_encode([
                    'success' => true,
                    'message' => lang('Giftcards.successful_updating') . ' ' . $giftcard_data['giftcard_number'],
                    'id'      => $giftcard_id
                ]);
            }
        } else { // Failure
-            return $this->response->setJSON([
+            echo json_encode([
                'success' => false,
                'message' => lang('Giftcards.error_adding_updating') . ' ' . $giftcard_data['giftcard_number'],
                'id'      => NEW_ENTRY
@@ -159,30 +158,27 @@ class Giftcards extends Secure_Controller
     * @return void
     * @noinspection PhpUnused
     */
-    public function postCheckNumberGiftcard(): ResponseInterface
+    public function postCheckNumberGiftcard(): void
    {
-        $existing_id = $this->request->getPost('giftcard_id', FILTER_SANITIZE_NUMBER_INT);
-        $giftcard_number = $this->request->getPost('giftcard_number', FILTER_SANITIZE_NUMBER_INT);
-        $giftcard_id = $this->giftcard->get_giftcard_id($giftcard_number);
-        $success = ($giftcard_id == (int) $existing_id || !$giftcard_id );
-
-        return $this->response->setJSON($success ? 'true' : 'false');
+        $giftcard_amount = parse_decimals($this->request->getPost('giftcard_amount'));
+        $parsed_value = filter_var($giftcard_amount, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
+        echo json_encode(['success' => $parsed_value !== false && $parsed_value > 0 && $giftcard_amount !== false, 'giftcard_amount' => to_currency_no_money($parsed_value)]);
    }

    /**
-     * @return ResponseInterface
+     * @return void
     */
-    public function postDelete(): ResponseInterface
+    public function postDelete(): void
    {
        $giftcards_to_delete = $this->request->getPost('ids', FILTER_SANITIZE_FULL_SPECIAL_CHARS);

        if ($this->giftcard->delete_list($giftcards_to_delete)) {
-            return $this->response->setJSON([
+            echo json_encode([
                'success' => true,
                'message' => lang('Giftcards.successful_deleted') . ' ' . count($giftcards_to_delete) . ' ' . lang('Giftcards.one_or_multiple')
            ]);
        } else {
-            return $this->response->setJSON(['success' => false, 'message' => lang('Giftcards.cannot_be_deleted')]);
+            echo json_encode(['success' => false, 'message' => lang('Giftcards.cannot_be_deleted')]);
        }
    }
 }
--- a/app/Controllers/Home.php
+++ b/app/Controllers/Home.php
@@ -2,9 +2,7 @@

 namespace App\Controllers;

-use App\Libraries\MY_Migration;
 use CodeIgniter\HTTP\RedirectResponse;
-use CodeIgniter\HTTP\ResponseInterface;

 class Home extends Secure_Controller
 {
@@ -14,12 +12,12 @@ class Home extends Secure_Controller
    }

    /**
-     * @return string
+     * @return void
     */
-    public function getIndex(): string
+    public function getIndex(): void
    {
        $logged_in = $this->employee->is_logged_in();
-        return view('home/home');
+        echo view('home/home');
    }

    /**
@@ -35,94 +33,59 @@ class Home extends Secure_Controller
    }

    /**
-     * Load the "change employee password" form
+     * Load "change employee password" form
     *
-     * @param int $employeeId
-     * @return ResponseInterface|string
+     * @noinspection PhpUnused
     */
-    public function getChangePassword(int $employeeId = NEW_ENTRY): ResponseInterface|string
+    public function getChangePassword(int $employee_id = -1): void    // TODO: Replace -1 with a constant
    {
-        $loggedInEmployee = $this->employee->get_logged_in_employee_info();
-        $currentPersonId = (int) $loggedInEmployee->person_id;
-
-        $employeeId = $employeeId === NEW_ENTRY ? $currentPersonId : $employeeId;
-
-        if (!$this->employee->isAdmin($currentPersonId) && $employeeId !== $currentPersonId) {
-            return $this->response->setStatusCode(403)->setBody(lang('Employees.unauthorized_modify'));
-        }
-
-        $person_info = $this->employee->get_info($employeeId);
+        $person_info = $this->employee->get_info($employee_id);
        foreach (get_object_vars($person_info) as $property => $value) {
            $person_info->$property = $value;
        }
        $data['person_info'] = $person_info;

-        return view('home/form_change_password', $data);
+        echo view('home/form_change_password', $data);
    }

    /**
     * Change employee password
-     *
-     * @return ResponseInterface
     */
-    public function postSave(int $employeeId = NEW_ENTRY): ResponseInterface
+    public function postSave(int $employee_id = -1): void    // TODO: Replace -1 with a constant
    {
-        $currentUser = $this->employee->get_logged_in_employee_info();
-        $currentPersonId = (int) $currentUser->person_id;
-
-        $employeeId = $employeeId === NEW_ENTRY ? $currentPersonId : $employeeId;
-
-        if (!$this->employee->isAdmin($currentPersonId) && $employeeId !== $currentPersonId) {
-            return $this->response->setStatusCode(403)->setJSON([
-                'success' => false,
-                'message' => lang('Employees.unauthorized_modify')
-            ]);
-        }
-
-        if (!empty($this->request->getPost('current_password')) && $employeeId != NEW_ENTRY) {
+        if (!empty($this->request->getPost('current_password')) && $employee_id != -1) {
            if ($this->employee->check_password($this->request->getPost('username', FILTER_SANITIZE_FULL_SPECIAL_CHARS), $this->request->getPost('current_password'))) {
-                // Validate password length BEFORE hashing
-                $new_password = $this->request->getPost('password');
-
-                if (strlen($new_password) < 8) {
-                    return $this->response->setJSON([
-                        'success' => false,
-                        'message' => lang('Employees.password_minlength'),
-                        'id'      => NEW_ENTRY
-                    ]);
-                }
-
                $employee_data = [
                    'username'     => $this->request->getPost('username', FILTER_SANITIZE_FULL_SPECIAL_CHARS),
-                    'password'     => password_hash($new_password, PASSWORD_DEFAULT),
+                    'password'     => password_hash($this->request->getPost('password'), PASSWORD_DEFAULT),
                    'hash_version' => 2
                ];

-                if ($this->employee->change_password($employee_data, $employeeId)) {
-                    return $this->response->setJSON([
+                if ($this->employee->change_password($employee_data, $employee_id) && strlen($employee_data['password']) >= 8) {
+                    echo json_encode([
                        'success' => true,
                        'message' => lang('Employees.successful_change_password'),
-                        'id'      => $employeeId
+                        'id'      => $employee_id
                    ]);
-                } else {
-                    return $this->response->setJSON([
+                } else { // Failure    // TODO: Replace -1 with constant
+                    echo json_encode([
                        'success' => false,
                        'message' => lang('Employees.unsuccessful_change_password'),
-                        'id'      => NEW_ENTRY
+                        'id'      => -1
                    ]);
                }
-            } else {
-                return $this->response->setJSON([
+            } else {    // TODO: Replace -1 with constant
+                echo json_encode([
                    'success' => false,
                    'message' => lang('Employees.current_password_invalid'),
-                    'id'      => NEW_ENTRY
+                    'id'      => -1
                ]);
            }
-        } else {
-            return $this->response->setJSON([
+        } else {    // TODO: Replace -1 with constant
+            echo json_encode([
                'success' => false,
                'message' => lang('Employees.current_password_invalid'),
-                'id'      => NEW_ENTRY
+                'id'      => -1
            ]);
        }
    }
--- a/app/Controllers/Item_kits.php
+++ b/app/Controllers/Item_kits.php
@@ -7,7 +7,6 @@ use App\Libraries\Barcode_lib;
 use App\Models\Item;
 use App\Models\Item_kit;
 use App\Models\Item_kit_items;
-use CodeIgniter\HTTP\ResponseInterface;
 use Config\Services;

 class Item_kits extends Secure_Controller
@@ -60,19 +59,19 @@ class Item_kits extends Secure_Controller
    }

    /**
-     * @return string
+     * @return void
     */
-    public function getIndex(): string
+    public function getIndex(): void
    {
        $data['table_headers'] = get_item_kits_manage_table_headers();

-        return view('item_kits/manage', $data);
+        echo view('item_kits/manage', $data);
    }

    /**
     * Returns Item_kit table data rows. This will be called with AJAX.
     */
-    public function getSearch(): ResponseInterface
+    public function getSearch(): void
    {
        $search = $this->request->getGet('search') ?? '';
        $limit  = $this->request->getGet('limit', FILTER_SANITIZE_NUMBER_INT);
@@ -90,37 +89,37 @@ class Item_kits extends Secure_Controller
            $data_rows[] = get_item_kit_data_row($item_kit);
        }

-        return $this->response->setJSON(['total' => $total_rows, 'rows' => $data_rows]);
+        echo json_encode(['total' => $total_rows, 'rows' => $data_rows]);
    }

    /**
-     * @return ResponseInterface
+     * @return void
     */
-    public function suggest_search(): ResponseInterface
+    public function suggest_search(): void
    {
        $search = $this->request->getPost('term');
        $suggestions = $this->item_kit->get_search_suggestions($search);

-        return $this->response->setJSON($suggestions);
+        echo json_encode($suggestions);
    }

    /**
     * @param int $row_id
-     * @return ResponseInterface
+     * @return void
     */
-    public function getRow(int $row_id): ResponseInterface
+    public function getRow(int $row_id): void
    {
        // Calculate the total cost and retail price of the Kit, so it can be added to the table refresh
        $item_kit = $this->_add_totals_to_item_kit($this->item_kit->get_info($row_id));

-        return $this->response->setJSON(get_item_kit_data_row($item_kit));
+        echo json_encode(get_item_kit_data_row($item_kit));
    }

    /**
     * @param int $item_kit_id
-     * @return string
+     * @return void
     */
-    public function getView(int $item_kit_id = NEW_ENTRY): string
+    public function getView(int $item_kit_id = NEW_ENTRY): void
    {
        $info = $this->item_kit->get_info($item_kit_id);

@@ -154,19 +153,19 @@ class Item_kits extends Secure_Controller
        $data['selected_kit_item_id'] = $info->kit_item_id;
        $data['selected_kit_item'] = ($item_kit_id > 0 && isset($info->kit_item_id)) ? $info->item_name : '';

-        return view("item_kits/form", $data);
+        echo view("item_kits/form", $data);
    }

    /**
     * @param int $item_kit_id
-     * @return ResponseInterface
+     * @return void
     */
-    public function postSave(int $item_kit_id = NEW_ENTRY): ResponseInterface
+    public function postSave(int $item_kit_id = NEW_ENTRY): void
    {
        $item_kit_data = [
            'name'              => $this->request->getPost('name'),
            'item_kit_number'   => $this->request->getPost('item_kit_number'),
-            'item_id'           => $this->request->getPost('kit_item_id'),
+            'item_id'           => $this->request->getPost('kit_item_id') ? intval($this->request->getPost('kit_item_id')) : null,
            'kit_discount'      => parse_decimals($this->request->getPost('kit_discount')),
            'kit_discount_type' => $this->request->getPost('kit_discount_type') === null ? PERCENT : intval($this->request->getPost('kit_discount_type')),
            'price_option'      => $this->request->getPost('price_option') === null ? PRICE_ALL : intval($this->request->getPost('price_option')),
@@ -202,20 +201,20 @@ class Item_kits extends Secure_Controller
            }

            if ($new_item) {
-                return $this->response->setJSON([
+                echo json_encode([
                    'success' => $success,
                    'message' => lang('Item_kits.successful_adding') . ' ' . $item_kit_data['name'],
                    'id'      => $item_kit_id
                ]);
            } else {
-                return $this->response->setJSON([
+                echo json_encode([
                    'success' => $success,
                    'message' => lang('Item_kits.successful_updating') . ' ' . $item_kit_data['name'],
                    'id'      => $item_kit_id
                ]);
            }
        } else { // Failure
-            return $this->response->setJSON([
+            echo json_encode([
                'success' => false,
                'message' => lang('Item_kits.error_adding_updating') . ' ' . $item_kit_data['name'],
                'id'      => NEW_ENTRY
@@ -224,42 +223,42 @@ class Item_kits extends Secure_Controller
    }

    /**
-     * @return ResponseInterface
+     * @return void
     */
-    public function postDelete(): ResponseInterface
+    public function postDelete(): void
    {
        $item_kits_to_delete = $this->request->getPost('ids', FILTER_SANITIZE_FULL_SPECIAL_CHARS);

        if ($this->item_kit->delete_list($item_kits_to_delete)) {
-            return $this->response->setJSON([
+            echo json_encode([
                'success' => true,
                'message' => lang('Item_kits.successful_deleted') . ' ' . count($item_kits_to_delete) . ' ' . lang('Item_kits.one_or_multiple')
            ]);
        } else {
-            return $this->response->setJSON(['success' => false, 'message' => lang('Item_kits.cannot_be_deleted')]);
+            echo json_encode(['success' => false, 'message' => lang('Item_kits.cannot_be_deleted')]);
        }
    }

    /**
     * Checks the validity of the item kit number. Used in app/Views/item_kits/form.php
     *
-     * @return ResponseInterface
+     * @return void
     * @noinspection PhpUnused
     */
-    public function postCheckItemNumber(): ResponseInterface
+    public function postCheckItemNumber(): void
    {
        $exists = $this->item_kit->item_number_exists($this->request->getPost('item_kit_number', FILTER_SANITIZE_FULL_SPECIAL_CHARS), $this->request->getPost('item_kit_id', FILTER_SANITIZE_NUMBER_INT));
-        return $this->response->setJSON(!$exists ? 'true' : 'false');
+        echo !$exists ? 'true' : 'false';
    }

    /**
     * AJAX called function that generates barcodes for selected item_kits.
     *
     * @param string $item_kit_ids Colon separated list of item_kit_id values to generate barcodes for.
-     * @return string
+     * @return void
     * @noinspection PhpUnused
     */
-    public function getGenerateBarcodes(string $item_kit_ids): string
+    public function getGenerateBarcodes(string $item_kit_ids): void
    {
        $barcode_lib = new Barcode_lib();
        $result = [];
@@ -290,6 +289,6 @@ class Item_kits extends Secure_Controller
        $data['barcode_config'] = $barcode_config;

        // Display barcodes
-        return view("barcodes/barcode_sheet", $data);
+        echo view("barcodes/barcode_sheet", $data);
    }
 }
--- a/app/Controllers/Items.php
+++ b/app/Controllers/Items.php
--- a/app/Controllers/Login.php
+++ b/app/Controllers/Login.php
@@ -5,7 +5,6 @@ namespace App\Controllers;
 use App\Libraries\MY_Migration;
 use App\Models\Employee;
 use CodeIgniter\HTTP\RedirectResponse;
-use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\Model;
 use Config\OSPOS;
 use Config\Services;
@@ -37,7 +36,6 @@ class Login extends BaseController

            $data = [
                'has_errors'       => false,
-                'is_new_install'   => !(MY_Migration::get_current_version()),
                'is_latest'        => $migration->is_latest(),
                'latest_version'   => $migration->get_latest_migration(),
                'gcaptcha_enabled' => $gcaptcha_enabled,
@@ -73,28 +71,4 @@ class Login extends BaseController

        return redirect()->to('home');
    }
-
-    public function migrate(): ResponseInterface
-    {
-        try {
-            $migration = new MY_Migration(config('Migrations'));
-            $migration->migrate_to_ci4();
-            
-            set_time_limit(3600);
-            $migration->setNamespace('App')->latest();
-            
-            return $this->response->setJSON([
-                'success' => true,
-                'message' => 'Migration completed successfully'
-            ]);
-            
-        } catch (\Exception $e) {
-            log_message('error', 'Migration failed: ' . $e->getMessage());
-            
-            return $this->response->setJSON([
-                'success' => false,
-                'message' => 'Migration failed: ' . $e->getMessage()
-            ])->setStatusCode(500);
-        }
-    }
 }
--- a/app/Controllers/Messages.php
+++ b/app/Controllers/Messages.php
@@ -5,7 +5,6 @@ namespace App\Controllers;
 use App\Libraries\Sms_lib;

 use App\Models\Person;
-use CodeIgniter\HTTP\ResponseInterface;

 class Messages extends Secure_Controller
 {
@@ -19,18 +18,18 @@ class Messages extends Secure_Controller
    }

    /**
-     * @return string
+     * @return void
     */
-    public function getIndex(): string
+    public function getIndex(): void
    {
-        return view('messages/sms');
+        echo view('messages/sms');
    }

    /**
     * @param int $person_id
-     * @return string
+     * @return void
     */
-    public function getView(int $person_id = NEW_ENTRY): string
+    public function getView(int $person_id = NEW_ENTRY): void
    {
        $person = model(Person::class);
        $info = $person->get_info($person_id);
@@ -40,13 +39,13 @@ class Messages extends Secure_Controller
        }
        $data['person_info'] = $info;

-        return view('messages/form_sms', $data);
+        echo view('messages/form_sms', $data);
    }

    /**
-     * @return ResponseInterface
+     * @return void
     */
-    public function send(): ResponseInterface
+    public function send(): void
    {
        $phone   = $this->request->getPost('phone', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
        $message = $this->request->getPost('message', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
@@ -54,9 +53,9 @@ class Messages extends Secure_Controller
        $response = $this->sms_lib->sendSMS($phone, $message);

        if ($response) {
-            return $this->response->setJSON(['success' => true, 'message' => lang('Messages.successfully_sent') . ' ' . esc($phone)]);
+            echo json_encode(['success' => true, 'message' => lang('Messages.successfully_sent') . ' ' . esc($phone)]);
        } else {
-            return $this->response->setJSON(['success' => false, 'message' => lang('Messages.unsuccessfully_sent') . ' ' . esc($phone)]);
+            echo json_encode(['success' => false, 'message' => lang('Messages.unsuccessfully_sent') . ' ' . esc($phone)]);
        }
    }

@@ -64,10 +63,10 @@ class Messages extends Secure_Controller
     * Sends an SMS message to a user. Used in app/Views/messages/form_sms.php.
     *
     * @param int $person_id
-     * @return ResponseInterface
+     * @return void
     * @noinspection PhpUnused
     */
-    public function send_form(int $person_id = NEW_ENTRY): ResponseInterface
+    public function send_form(int $person_id = NEW_ENTRY): void
    {
        $phone   = $this->request->getPost('phone', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
        $message = $this->request->getPost('message', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
@@ -75,13 +74,13 @@ class Messages extends Secure_Controller
        $response = $this->sms_lib->sendSMS($phone, $message);

        if ($response) {
-            return $this->response->setJSON([
+            echo json_encode([
                'success'   => true,
                'message'   => lang('Messages.successfully_sent') . ' ' . esc($phone),
                'person_id' => $person_id
            ]);
        } else {
-            return $this->response->setJSON([
+            echo json_encode([
                'success'   => false,
                'message'   => lang('Messages.unsuccessfully_sent') . ' ' . esc($phone),
                'person_id' => NEW_ENTRY
--- a/app/Controllers/No_access.php
+++ b/app/Controllers/No_access.php
@@ -3,7 +3,6 @@
 namespace App\Controllers;

 use App\Models\Module;
-use CodeIgniter\HTTP\ResponseInterface;

 /**
 * Part of the grants mechanism to restrict access to modules that the user doesn't have permission for.
@@ -23,13 +22,13 @@ class No_access extends BaseController
    /**
     * @param string $module_id
     * @param string $permission_id
-     * @return string
+     * @return void
     */
-    public function getIndex(string $module_id = '', string $permission_id = ''): string
+    public function getIndex(string $module_id = '', string $permission_id = ''): void
    {
        $data['module_name']   = $this->module->get_module_name($module_id);
        $data['permission_id'] = $permission_id;

-        return view('no_access', $data);
+        echo view('no_access', $data);
    }
 }
--- a/app/Controllers/Office.php
+++ b/app/Controllers/Office.php
@@ -3,7 +3,6 @@
 namespace App\Controllers;

 use App\Models\Employee;
-use CodeIgniter\HTTP\ResponseInterface;

 /**
 * @property Employee employee
@@ -18,11 +17,11 @@ class Office extends Secure_Controller
    }

    /**
-     * @return string
+     * @return void
     */
-    public function getIndex(): string
+    public function getIndex(): void
    {
-        return view('home/office');
+        echo view('home/office');
    }

    /**
--- a/app/Controllers/Persons.php
+++ b/app/Controllers/Persons.php
@@ -3,7 +3,6 @@
 namespace App\Controllers;

 use App\Models\Person;
-use CodeIgniter\HTTP\ResponseInterface;
 use Config\Services;
 use function Tamtamchik\NameCase\str_name_case;

@@ -22,36 +21,34 @@ abstract class Persons extends Secure_Controller
    }

    /**
-     * @return string
+     * @return void
     */
-    public function getIndex(): string
+    public function getIndex(): void
    {
        $data['table_headers'] = get_people_manage_table_headers();

-        return view('people/manage', $data);
+        echo view('people/manage', $data);
    }

    /**
     * Gives search suggestions based on what is being searched for
-     * @return ResponseInterface
     */
-    public function getSuggest(): ResponseInterface
+    public function getSuggest(): void
    {
        $search = $this->request->getGet('term');
        $suggestions = $this->person->get_search_suggestions($search);

-        return $this->response->setJSON($suggestions);
+        echo json_encode($suggestions);
    }

    /**
     * Gets one row for a person manage table. This is called using AJAX to update one row.
-     * @return ResponseInterface
     */
-    public function getRow(int $row_id): ResponseInterface
+    public function getRow(int $row_id): void
    {
        $data_row = get_person_data_row($this->person->get_info($row_id));

-        return $this->response->setJSON($data_row);
+        echo json_encode($data_row);
    }

    /**
--- a/app/Controllers/Receivings.php
+++ b/app/Controllers/Receivings.php
@@ -11,7 +11,6 @@ use App\Models\Item_kit;
 use App\Models\Receiving;
 use App\Models\Stock_location;
 use App\Models\Supplier;
-use CodeIgniter\HTTP\ResponseInterface;
 use Config\OSPOS;
 use Config\Services;
 use ReflectionException;
@@ -47,66 +46,66 @@ class Receivings extends Secure_Controller
    }

    /**
-     * @return string
+     * @return void
     */
-    public function getIndex(): string
+    public function getIndex(): void
    {
-        return $this->_reload();
+        $this->_reload();
    }

    /**
     * Returns search suggestions for an item. Used in app/Views/sales/register.php
     *
-     * @return ResponseInterface
+     * @return void
     * @noinspection PhpUnused
     */
-    public function getItemSearch(): ResponseInterface
+    public function getItemSearch(): void
    {
        $search = $this->request->getGet('term');
        $suggestions = $this->item->get_search_suggestions($search, ['search_custom' => false, 'is_deleted' => false], true);
        $suggestions = array_merge($suggestions, $this->item_kit->get_search_suggestions($search));

-        return $this->response->setJSON($suggestions);
+        echo json_encode($suggestions);
    }

    /**
     * Gets search suggestions for a stock item. Used in app/Views/receivings/receiving.php
     *
-     * @return ResponseInterface
+     * @return void
     * @noinspection PhpUnused
     */
-    public function getStockItemSearch(): ResponseInterface
+    public function getStockItemSearch(): void
    {
        $search = $this->request->getGet('term');
        $suggestions = $this->item->get_stock_search_suggestions($search, ['search_custom' => false, 'is_deleted' => false], true);
        $suggestions = array_merge($suggestions, $this->item_kit->get_search_suggestions($search));

-        return $this->response->setJSON($suggestions);
+        echo json_encode($suggestions);
    }

    /**
     * Set supplier if it exists in the database. Used in app/Views/receivings/receiving.php
     *
-     * @return string
+     * @return void
     * @noinspection PhpUnused
     */
-    public function postSelectSupplier(): string
+    public function postSelectSupplier(): void
    {
        $supplier_id = $this->request->getPost('supplier', FILTER_SANITIZE_NUMBER_INT);
        if ($this->supplier->exists($supplier_id)) {
            $this->receiving_lib->set_supplier($supplier_id);
        }

-        return $this->_reload();    // TODO: Hungarian notation
+        $this->_reload();    // TODO: Hungarian notation
    }

    /**
     * Change receiving mode for current receiving. Used in app/Views/receivings/receiving.php
     *
-     * @return string
+     * @return void
     * @noinspection PhpUnused
     */
-    public function postChangeMode(): string
+    public function postChangeMode(): void
    {
        $stock_destination = $this->request->getPost('stock_destination', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
        $stock_source = $this->request->getPost('stock_source', FILTER_SANITIZE_NUMBER_INT);
@@ -122,49 +121,49 @@ class Receivings extends Secure_Controller
            $this->receiving_lib->set_stock_destination($stock_destination);
        }

-        return $this->_reload();    // TODO: Hungarian notation
+        $this->_reload();    // TODO: Hungarian notation
    }

    /**
     * Sets receiving comment. Used in app/Views/receivings/receiving.php
-     * @return ResponseInterface
+     *
+     * @return void
     * @noinspection PhpUnused
     */
-    public function postSetComment(): ResponseInterface
+    public function postSetComment(): void
    {
        $this->receiving_lib->set_comment($this->request->getPost('comment', FILTER_SANITIZE_FULL_SPECIAL_CHARS));
-        return $this->response->setJSON(['success' => true]);
    }

    /**
     * Sets the print after sale flag for the receiving. Used in app/Views/receivings/receiving.php
-     * @return ResponseInterface
+     *
+     * @return void
     * @noinspection PhpUnused
     */
-    public function postSetPrintAfterSale(): ResponseInterface
+    public function postSetPrintAfterSale(): void
    {
        $this->receiving_lib->set_print_after_sale($this->request->getPost('recv_print_after_sale') != null);
-        return $this->response->setJSON(['success' => true]);
    }

    /**
     * Sets the reference number for the receiving.  Used in app/Views/receivings/receiving.php
-     * @return ResponseInterface
+     *
+     * @return void
     * @noinspection PhpUnused
     */
-    public function postSetReference(): ResponseInterface
+    public function postSetReference(): void
    {
        $this->receiving_lib->set_reference($this->request->getPost('recv_reference', FILTER_SANITIZE_FULL_SPECIAL_CHARS));
-        return $this->response->setJSON(['success' => true]);
    }

    /**
     * Add an item to the receiving. Used in app/Views/receivings/receiving.php
     *
-     * @return string
+     * @return void
     * @noinspection PhpUnused
     */
-    public function postAdd(): string
+    public function postAdd(): void
    {
        $data = [];

@@ -184,17 +183,17 @@ class Receivings extends Secure_Controller
            $data['error'] = lang('Receivings.unable_to_add_item');
        }

-        return $this->_reload($data);    // TODO: Hungarian notation
+        $this->_reload($data);    // TODO: Hungarian notation
    }

    /**
     * Edit line item in current receiving. Used in app/Views/receivings/receiving.php
     *
-     * @param int|string|null $item_id
-     * @return string
+     * @param $item_id
+     * @return void
     * @noinspection PhpUnused
     */
-    public function postEditItem(int|string|null $item_id): string
+    public function postEditItem($item_id): void
    {
        $data = [];

@@ -223,16 +222,17 @@ class Receivings extends Secure_Controller
            $data['error'] = lang('Receivings.error_editing_item');
        }

-        return $this->_reload($data);    // TODO: Hungarian notation
+        $this->_reload($data);    // TODO: Hungarian notation
    }

    /**
     * Edit a receiving. Used in app/Controllers/Receivings.php
+     *
     * @param $receiving_id
-     * @return string
+     * @return void
     * @noinspection PhpUnused
     */
-    public function getEdit($receiving_id): string
+    public function getEdit($receiving_id): void
    {
        $data = [];

@@ -241,88 +241,73 @@ class Receivings extends Secure_Controller
            $data['suppliers'][$supplier->person_id] = $supplier->first_name . ' ' . $supplier->last_name;
        }

-        $receiving_info = $this->receiving->get_info($receiving_id)->getRowArray();
-
-        $current_employee_id = $this->employee->get_logged_in_employee_info()->person_id;
-        $can_assign_employee = $this->employee->has_grant('employees', $current_employee_id);
-
        $data['employees'] = [];
-        if ($can_assign_employee) {
-            foreach ($this->employee->get_all()->getResult() as $employee) {
-                $data['employees'][$employee->person_id] = $employee->first_name . ' ' . $employee->last_name;
-            }
-        } else {
-            $stored_employee_id = $receiving_info['employee_id'];
-            $stored_employee = $this->employee->get_info($stored_employee_id);
-            $data['employees'][$stored_employee_id] = $stored_employee->first_name . ' ' . $stored_employee->last_name;
+        foreach ($this->employee->get_all()->getResult() as $employee) {
+            $data['employees'][$employee->person_id] = $employee->first_name . ' ' . $employee->last_name;
        }

+        $receiving_info = $this->receiving->get_info($receiving_id)->getRowArray();
        $data['selected_supplier_name'] = !empty($receiving_info['supplier_id']) ? $receiving_info['company_name'] : '';
        $data['selected_supplier_id'] = $receiving_info['supplier_id'];
        $data['receiving_info'] = $receiving_info;
-        $data['can_assign_employee'] = $can_assign_employee;

-        return view('receivings/form', $data);
+        echo view('receivings/form', $data);
    }

    /**
     * Deletes an item from the current receiving. Used in app/Views/receivings/receiving.php
     *
     * @param $item_number
-     * @return string
+     * @return void
     * @noinspection PhpUnused
     */
-    public function getDeleteItem($item_number): string
+    public function getDeleteItem($item_number): void
    {
        $this->receiving_lib->delete_item($item_number);

-        return $this->_reload();    // TODO: Hungarian notation
+        $this->_reload();    // TODO: Hungarian notation
    }

    /**
-     * @param int $receiving_id
-     * @param bool $update_inventory
-     * @return ResponseInterface
     * @throws ReflectionException
     */
-    public function postDelete(int $receiving_id = -1, bool $update_inventory = true): ResponseInterface
+    public function postDelete(int $receiving_id = -1, bool $update_inventory = true): void
    {
        $employee_id = $this->employee->get_logged_in_employee_info()->person_id;
        $receiving_ids = $receiving_id == -1 ? $this->request->getPost('ids', FILTER_SANITIZE_NUMBER_INT) : [$receiving_id];    // TODO: Replace -1 with constant

        if ($this->receiving->delete_list($receiving_ids, $employee_id, $update_inventory)) {    // TODO: Likely need to surround this block of code in a try-catch to catch the ReflectionException
-            return $this->response->setJSON([
+            echo json_encode([
                'success' => true,
                'message' => lang('Receivings.successfully_deleted') . ' ' . count($receiving_ids) . ' ' . lang('Receivings.one_or_multiple'),
                'ids'     => $receiving_ids
            ]);
        } else {
-            return $this->response->setJSON(['success' => false, 'message' => lang('Receivings.cannot_be_deleted')]);
+            echo json_encode(['success' => false, 'message' => lang('Receivings.cannot_be_deleted')]);
        }
    }

    /**
     * Removes a supplier from a receiving. Used in app/Views/receivings/receiving.php
     *
-     * @return string
+     * @return void
     * @noinspection PhpUnused
     */
-    public function getRemoveSupplier(): string
+    public function getRemoveSupplier(): void
    {
        $this->receiving_lib->clear_reference();
        $this->receiving_lib->remove_supplier();

-        return $this->_reload();    // TODO: Hungarian notation
+        $this->_reload();    // TODO: Hungarian notation
    }

    /**
     * Complete and finalize receiving.  Used in app/Views/receivings/receiving.php
     *
-     * @return string
     * @throws ReflectionException
     * @noinspection PhpUnused
     */
-    public function postComplete(): string
+    public function postComplete(): void
    {

        $data = [];
@@ -371,21 +356,18 @@ class Receivings extends Secure_Controller

        $data['print_after_sale'] = $this->receiving_lib->is_print_after_sale();

-        $view = view("receivings/receipt", $data);
+        echo view("receivings/receipt", $data);

        $this->receiving_lib->clear_all();
-
-        return $view;
    }

    /**
     * Complete a receiving requisition. Used in app/Views/receivings/receiving.php.
     *
-     * @return string
     * @throws ReflectionException
     * @noinspection PhpUnused
     */
-    public function postRequisitionComplete(): string
+    public function postRequisitionComplete(): void
    {
        if ($this->receiving_lib->get_stock_source() != $this->receiving_lib->get_stock_destination()) {
            foreach ($this->receiving_lib->get_cart() as $item) {
@@ -394,11 +376,11 @@ class Receivings extends Secure_Controller
                $this->receiving_lib->add_item($item['item_id'], -$item['quantity'], $this->receiving_lib->get_stock_source(), $item['discount_type']);
            }

-            return $this->postComplete();
+            $this->postComplete();
        } else {
            $data['error'] = lang('Receivings.error_requisition');

-            return $this->_reload($data);    // TODO: Hungarian notation
+            $this->_reload($data);    // TODO: Hungarian notation
        }
    }

@@ -406,10 +388,10 @@ class Receivings extends Secure_Controller
     * Gets the receipt for a receiving. Used in app/Views/receivings/form.php
     *
     * @param $receiving_id
-     * @return string
+     * @return void
     * @noinspection PhpUnused
     */
-    public function getReceipt($receiving_id): string
+    public function getReceipt($receiving_id): void
    {
        $receiving_info = $this->receiving->get_info($receiving_id)->getRowArray();
        $this->receiving_lib->copy_entire_receiving($receiving_id);
@@ -442,18 +424,16 @@ class Receivings extends Secure_Controller

        $data['print_after_sale'] = false;

-        $view = view("receivings/receipt", $data);
+        echo view("receivings/receipt", $data);

        $this->receiving_lib->clear_all();
-
-        return $view;
    }

    /**
     * @param array $data
-     * @return string
+     * @return void
     */
-    private function _reload(array $data = []): string    // TODO: Hungarian notation
+    private function _reload(array $data = []): void    // TODO: Hungarian notation
    {
        $data['cart'] = $this->receiving_lib->get_cart();
        $data['modes'] = ['receive' => lang('Receivings.receiving'), 'return' => lang('Receivings.return')];
@@ -490,47 +470,36 @@ class Receivings extends Secure_Controller

        $data['print_after_sale'] = $this->receiving_lib->is_print_after_sale();

-        return view("receivings/receiving", $data);
+        echo view("receivings/receiving", $data);
    }

    /**
-     * @return ResponseInterface
     * @throws ReflectionException
     */
-    public function postSave(int $receiving_id = -1): ResponseInterface    // TODO: Replace -1 with a constant
+    public function postSave(int $receiving_id = -1): void    // TODO: Replace -1 with a constant
    {
        $newdate = $this->request->getPost('date', FILTER_SANITIZE_FULL_SPECIAL_CHARS);    // TODO: newdate does not follow naming conventions

        $date_formatter = date_create_from_format($this->config['dateformat'] . ' ' . $this->config['timeformat'], $newdate);
        $receiving_time = $date_formatter->format('Y-m-d H:i:s');

-        $current_employee_id = $this->employee->get_logged_in_employee_info()->person_id;
-        $submitted_employee_id = $this->request->getPost('employee_id', FILTER_SANITIZE_NUMBER_INT);
-
-        if (!$this->employee->has_grant('employees', $current_employee_id)) {
-            $existing_receiving = $this->receiving->get_info($receiving_id)->getRowArray();
-            $employee_id = $existing_receiving['employee_id'];
-        } else {
-            $employee_id = $submitted_employee_id;
-        }
-
        $receiving_data = [
            'receiving_time' => $receiving_time,
            'supplier_id'    => $this->request->getPost('supplier_id') ? $this->request->getPost('supplier_id', FILTER_SANITIZE_NUMBER_INT) : null,
-            'employee_id'    => $employee_id,
+            'employee_id'    => $this->request->getPost('employee_id', FILTER_SANITIZE_NUMBER_INT),
            'comment'        => $this->request->getPost('comment', FILTER_SANITIZE_FULL_SPECIAL_CHARS),
            'reference'      => $this->request->getPost('reference') != '' ? $this->request->getPost('reference', FILTER_SANITIZE_FULL_SPECIAL_CHARS) : null
        ];

        $this->inventory->update('RECV ' . $receiving_id, ['trans_date' => $receiving_time]);
        if ($this->receiving->update($receiving_id, $receiving_data)) {
-            return $this->response->setJSON([
+            echo json_encode([
                'success' => true,
                'message' => lang('Receivings.successfully_updated'),
                'id'      => $receiving_id
            ]);
        } else {
-            return $this->response->setJSON([
+            echo json_encode([
                'success' => false,
                'message' => lang('Receivings.unsuccessfully_updated'),
                'id'      => $receiving_id
@@ -541,13 +510,13 @@ class Receivings extends Secure_Controller
    /**
     * Cancel an in-process receiving. Used in app/Views/receivings/receiving.php
     *
-     * @return string
+     * @return void
     * @noinspection PhpUnused
     */
-    public function postCancelReceiving(): string
+    public function postCancelReceiving(): void
    {
        $this->receiving_lib->clear_all();

-        return $this->_reload();    // TODO: Hungarian Notation
+        $this->_reload();    // TODO: Hungarian Notation
    }
 }
--- a/app/Controllers/Reports.php
+++ b/app/Controllers/Reports.php
@@ -25,7 +25,6 @@ use App\Models\Reports\Summary_sales;
 use App\Models\Reports\Summary_sales_taxes;
 use App\Models\Reports\Summary_suppliers;
 use App\Models\Reports\Summary_taxes;
-use CodeIgniter\HTTP\ResponseInterface;
 use Config\OSPOS;
 use Config\Services;

@@ -85,8 +84,7 @@ class Reports extends Secure_Controller

            // Check access to report submodule
            if (!$this->employee->has_grant('reports_' . $submodule_id, $this->employee->get_logged_in_employee_info()->person_id)) {
-                header('Location: ' . base_url('no_access/reports/reports_' . $submodule_id));
-                exit();
+                redirect('no_access/reports/reports_' . $submodule_id);
            }
        }

@@ -103,9 +101,8 @@ class Reports extends Secure_Controller

    /**
     * Initial Report listing screen
-     * @return string
     */
-    public function getIndex(): string
+    public function getIndex(): void
    {
        $person_id = $this->session->get('person_id');
        $grants = $this->employee->get_employee_grants($this->session->get('person_id'));
@@ -117,7 +114,7 @@ class Reports extends Secure_Controller
            'permission_ids' => $permissions_ids,
        ];

-        return view('reports/listing', $data);
+        echo view('reports/listing', $data);
    }

    /**
@@ -126,9 +123,9 @@ class Reports extends Secure_Controller
     * @param string $end_date
     * @param string $sale_type
     * @param string $location_id
-     * @return string
+     * @return void
     */
-    public function summary_sales(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): string    // TODO: Perhaps these need to be passed as an array?  Too many parameters in the signature.
+    public function summary_sales(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): void    // TODO: Perhaps these need to be passed as an array?  Too many parameters in the signature.
    {   // TODO: Duplicated code
        $this->clearCache();

@@ -164,7 +161,7 @@ class Reports extends Secure_Controller
            'summary_data' => $summary
        ];

-        return view('reports/tabular', $data);
+        echo view('reports/tabular', $data);
    }

    /**
@@ -173,9 +170,9 @@ class Reports extends Secure_Controller
     * @param string $end_date
     * @param string $sale_type
     * @param string $location_id
-     * @return string
+     * @return void
     */
-    public function summary_categories(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): string
+    public function summary_categories(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): void
    {   // TODO: Duplicated code
        $this->clearCache();

@@ -210,7 +207,7 @@ class Reports extends Secure_Controller
            'summary_data' => $summary
        ];

-        return view('reports/tabular', $data);
+        echo view('reports/tabular', $data);
    }

    /**
@@ -218,9 +215,9 @@ class Reports extends Secure_Controller
     * @param string $start_date
     * @param string $end_date
     * @param string $sale_type
-     * @return string
+     * @return void
     */
-    public function summary_expenses_categories(string $start_date, string $end_date, string $sale_type): string
+    public function summary_expenses_categories(string $start_date, string $end_date, string $sale_type): void
    {
        $this->clearCache();

@@ -247,7 +244,7 @@ class Reports extends Secure_Controller
            'summary_data' => $summary
        ];

-        return view('reports/tabular', $data);
+        echo view('reports/tabular', $data);
    }

    /**
@@ -256,9 +253,9 @@ class Reports extends Secure_Controller
     * @param string $end_date
     * @param string $sale_type
     * @param string $location_id
-     * @return string
+     * @return void
     */
-    public function summary_customers(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): string
+    public function summary_customers(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): void
    {
        $this->clearCache();

@@ -295,7 +292,7 @@ class Reports extends Secure_Controller
            'summary_data' => $summary
        ];

-        return view('reports/tabular', $data);
+        echo view('reports/tabular', $data);
    }

    /**
@@ -304,9 +301,9 @@ class Reports extends Secure_Controller
     * @param string $end_date
     * @param string $sale_type
     * @param string $location_id
-     * @return string
+     * @return void
     */
-    public function summary_suppliers(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): string
+    public function summary_suppliers(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): void
    {   // TODO: Duplicated Code
        $this->clearCache();

@@ -341,7 +338,7 @@ class Reports extends Secure_Controller
            'summary_data' => $summary
        ];

-        return view('reports/tabular', $data);
+        echo view('reports/tabular', $data);
    }

    /**
@@ -350,9 +347,9 @@ class Reports extends Secure_Controller
     * @param string $end_date
     * @param string $sale_type
     * @param string $location_id
-     * @return string
+     * @return void
     */
-    public function summary_items(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): string
+    public function summary_items(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): void
    {
        $this->clearCache();

@@ -391,7 +388,7 @@ class Reports extends Secure_Controller
            'summary_data' => $summary
        ];

-        return view('reports/tabular', $data);
+        echo view('reports/tabular', $data);
    }

    /**
@@ -400,9 +397,9 @@ class Reports extends Secure_Controller
     * @param string $end_date
     * @param string $sale_type
     * @param string $location_id
-     * @return string
+     * @return void
     */
-    public function summary_employees(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): string
+    public function summary_employees(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): void
    {
        $this->clearCache();

@@ -439,7 +436,7 @@ class Reports extends Secure_Controller
            'summary_data' => $summary
        ];

-        return view('reports/tabular', $data);
+        echo view('reports/tabular', $data);
    }

    /**
@@ -448,9 +445,9 @@ class Reports extends Secure_Controller
     * @param string $end_date
     * @param string $sale_type
     * @param string $location_id
-     * @return string
+     * @return void
     */
-    public function summary_taxes(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): string
+    public function summary_taxes(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): void
    {   // TODO: Duplicate Code
        $this->clearCache();

@@ -485,14 +482,13 @@ class Reports extends Secure_Controller
            'summary_data' => $summary
        ];

-        return view('reports/tabular', $data);
+        echo view('reports/tabular', $data);
    }

    /**
     * Summary Sales Taxes report
-     * @return string
     */
-    public function summary_sales_taxes(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): string
+    public function summary_sales_taxes(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): void
    {   // TODO: Duplicated code
        $this->clearCache();

@@ -525,16 +521,16 @@ class Reports extends Secure_Controller
            'summary_data' => $summary
        ];

-        return view('reports/tabular', $data);
+        echo view('reports/tabular', $data);
    }

    /**
     * Summary Discounts report input. Used in app/Config/Routes.php
     *
-     * @return string
+     * @return void
     * @noinspection PhpUnused
     */
-    public function summary_discounts_input(): string
+    public function summary_discounts_input(): void
    {
        $this->clearCache();

@@ -545,14 +541,13 @@ class Reports extends Secure_Controller
        $data['discount_type_options'] = ['0' => lang('Reports.discount_percent'), '1' => lang('Reports.discount_fixed')];
        $data['sale_type_options'] = $this->get_sale_type_options();

-        return view('reports/date_input', $data);
+        echo view('reports/date_input', $data);
    }

    /**
     * Summary Discounts report
-     * @return string
     **/
-    public function summary_discounts(string $start_date, string $end_date, string $sale_type, string $location_id = 'all', int $discount_type = 0): string
+    public function summary_discounts(string $start_date, string $end_date, string $sale_type, string $location_id = 'all', int $discount_type = 0): void
    {   // TODO: Duplicated Code
        $this->clearCache();

@@ -584,14 +579,13 @@ class Reports extends Secure_Controller
            'summary_data' => $summary
        ];

-        return view('reports/tabular', $data);
+        echo view('reports/tabular', $data);
    }

    /**
     * Summary Payments report
-     * @return string
     */
-    public function summary_payments(string $start_date, string $end_date): string
+    public function summary_payments(string $start_date, string $end_date): void
    {
        $this->clearCache();

@@ -643,16 +637,16 @@ class Reports extends Secure_Controller
            'summary_data' => $summary
        ];

-        return view('reports/tabular', $data);
+        echo view('reports/tabular', $data);
    }

    /**
     * Input for reports that require only a date range. Used in app/Config/Routes.php
     *
-     * @return string
+     * @return void
     * @noinspection PhpUnused
     */
-    public function date_input(): string
+    public function date_input(): void
    {   // TODO: Duplicated Code
        $this->clearCache();

@@ -662,30 +656,30 @@ class Reports extends Secure_Controller
        $data['mode'] = 'sale';
        $data['sale_type_options'] = $this->get_sale_type_options();

-        return view('reports/date_input', $data);
+        echo view('reports/date_input', $data);
    }

    /**
     * Input for reports that require only a date range. Used in app/Config/Routes.php
     *
-     * @return string
+     * @return void
     * @noinspection PhpUnused
     */
-    public function date_input_only(): string
+    public function date_input_only(): void
    {
        $this->clearCache();

        $data = [];
-        return view('reports/date_input', $data);
+        echo view('reports/date_input', $data);
    }

    /**
     * Input for reports that require only a date range. Used in app/Config/Routes.php
     *
-     * @return string
+     * @return void
     * @noinspection PhpUnused
     */
-    public function date_input_sales(): string
+    public function date_input_sales(): void
    {   // TODO: Duplicated Code
        $this->clearCache();

@@ -695,23 +689,23 @@ class Reports extends Secure_Controller
        $data['mode'] = 'sale';
        $data['sale_type_options'] = $this->get_sale_type_options();

-        return view('reports/date_input', $data);
+        echo view('reports/date_input', $data);
    }

    /**
     * Receivings date input. Used in app/Config/Routes.php
     *
-     * @return string
+     * @return void
     * @noinspection PhpUnused
     */
-    public function date_input_recv(): string
+    public function date_input_recv(): void
    {
        $stock_locations = $data = $this->stock_location->get_allowed_locations('receivings');
        $stock_locations['all'] =  lang('Reports.all');
        $data['stock_locations'] = array_reverse($stock_locations, true);
        $data['mode'] = 'receiving';

-        return view('reports/date_input', $data);
+        echo view('reports/date_input', $data);
    }

    /**
@@ -720,10 +714,10 @@ class Reports extends Secure_Controller
     * @param string $start_date
     * @param string $end_date
     * @param string $sale_type
-     * @return string
+     * @return void
     * @noinspection PhpUnused
     */
-    public function graphical_summary_expenses_categories(string $start_date, string $end_date, string $sale_type): string
+    public function graphical_summary_expenses_categories(string $start_date, string $end_date, string $sale_type): void
    {
        $this->clearCache();

@@ -756,7 +750,7 @@ class Reports extends Secure_Controller
            'show_currency'  => true
        ];

-        return view('reports/graphical', $data);
+        echo view('reports/graphical', $data);
    }

    /**
@@ -766,9 +760,9 @@ class Reports extends Secure_Controller
     * @param string $end_date
     * @param string $sale_type
     * @param string $location_id
-     * @return string
+     * @return void
     */
-    public function graphical_summary_sales(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): string
+    public function graphical_summary_sales(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): void
    {
        $this->clearCache();

@@ -802,7 +796,7 @@ class Reports extends Secure_Controller
            'show_currency'  => true
        ];

-        return view('reports/graphical', $data);
+        echo view('reports/graphical', $data);
    }

    /**
@@ -812,9 +806,9 @@ class Reports extends Secure_Controller
     * @param string $end_date
     * @param string $sale_type
     * @param string $location_id
-     * @return string
+     * @return void
     */
-    public function graphical_summary_items(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): string
+    public function graphical_summary_items(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): void
    {
        $this->clearCache();

@@ -849,7 +843,7 @@ class Reports extends Secure_Controller
            'show_currency'  => true
        ];

-        return view('reports/graphical', $data);
+        echo view('reports/graphical', $data);
    }

    /**
@@ -859,9 +853,9 @@ class Reports extends Secure_Controller
     * @param string $end_date
     * @param string $sale_type
     * @param string $location_id
-     * @return string
+     * @return void
     */
-    public function graphical_summary_categories(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): string
+    public function graphical_summary_categories(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): void
    {   // TODO: Duplicated Code
        $this->clearCache();

@@ -892,7 +886,7 @@ class Reports extends Secure_Controller
            'show_currency'  => true
        ];

-        return view('reports/graphical', $data);
+        echo view('reports/graphical', $data);
    }

    /**
@@ -902,9 +896,9 @@ class Reports extends Secure_Controller
     * @param string $end_date
     * @param string $sale_type
     * @param string $location_id
-     * @return string
+     * @return void
     */
-    public function graphical_summary_suppliers(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): string
+    public function graphical_summary_suppliers(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): void
    {   // TODO: Duplicated Code
        $this->clearCache();

@@ -937,7 +931,7 @@ class Reports extends Secure_Controller
            'show_currency'  => true
        ];

-        return view('reports/graphical', $data);
+        echo view('reports/graphical', $data);
    }

    /**
@@ -947,9 +941,9 @@ class Reports extends Secure_Controller
     * @param string $end_date
     * @param string $sale_type
     * @param string $location_id
-     * @return string
+     * @return void
     */
-    public function graphical_summary_employees(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): string
+    public function graphical_summary_employees(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): void
    {
        $this->clearCache();

@@ -981,7 +975,7 @@ class Reports extends Secure_Controller
            'show_currency'  => true
        ];

-        return view('reports/graphical', $data);
+        echo view('reports/graphical', $data);
    }

    /**
@@ -991,9 +985,9 @@ class Reports extends Secure_Controller
     * @param string $end_date
     * @param string $sale_type
     * @param string $location_id
-     * @return string
+     * @return void
     */
-    public function graphical_summary_taxes(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): string
+    public function graphical_summary_taxes(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): void
    {   // TODO: Duplicated Code
        $this->clearCache();

@@ -1025,7 +1019,7 @@ class Reports extends Secure_Controller
            'show_currency'  => true
        ];

-        return view('reports/graphical', $data);
+        echo view('reports/graphical', $data);
    }

    /**
@@ -1035,9 +1029,9 @@ class Reports extends Secure_Controller
     * @param string $end_date
     * @param string $sale_type
     * @param string $location_id
-     * @return string
+     * @return void
     */
-    public function graphical_summary_sales_taxes(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): string
+    public function graphical_summary_sales_taxes(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): void
    {   // TODO: Duplicated Code
        $this->clearCache();

@@ -1069,7 +1063,7 @@ class Reports extends Secure_Controller
            'show_currency'  => true
        ];

-        return view('reports/graphical', $data);
+        echo view('reports/graphical', $data);
    }

    /**
@@ -1079,9 +1073,9 @@ class Reports extends Secure_Controller
     * @param string $end_date
     * @param string $sale_type
     * @param string $location_id
-     * @return string
+     * @return void
     */
-    public function graphical_summary_customers(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): string
+    public function graphical_summary_customers(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): void
    {   // TODO: Duplicated Code
        $this->clearCache();

@@ -1115,7 +1109,7 @@ class Reports extends Secure_Controller
            'show_currency'  => true
        ];

-        return view('reports/graphical', $data);
+        echo view('reports/graphical', $data);
    }

    /**
@@ -1126,10 +1120,9 @@ class Reports extends Secure_Controller
     * @param string $sale_type
     * @param string $location_id ID of the location to be reported or 'all' if none is specified
     * @param int $discount_type
-     * @return string
     * @noinspection PhpUnused
     */
-    public function graphical_summary_discounts(string $start_date, string $end_date, string $sale_type, string $location_id = 'all', int $discount_type = 0): string
+    public function graphical_summary_discounts(string $start_date, string $end_date, string $sale_type, string $location_id = 'all', int $discount_type = 0): void
    {   // TODO: Duplicated Code
        $this->clearCache();

@@ -1164,7 +1157,7 @@ class Reports extends Secure_Controller
            'show_currency'  => false
        ];

-        return view('reports/graphical', $data);
+        echo view('reports/graphical', $data);
    }

    /**
@@ -1174,9 +1167,9 @@ class Reports extends Secure_Controller
     * @param string $end_date
     * @param string $sale_type
     * @param string $location_id
-     * @return string
+     * @return void
     */
-    public function graphical_summary_payments(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): string
+    public function graphical_summary_payments(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): void
    {
        $this->clearCache();

@@ -1210,16 +1203,16 @@ class Reports extends Secure_Controller
            'show_currency'  => true
        ];

-        return view('reports/graphical', $data);
+        echo view('reports/graphical', $data);
    }

    /**
     * Gets the specific customer input view. Used in app/Config/Routes.php
     *
-     * @return string
+     * @return void
     * @noinspection PhpUnused
     */
-    public function specific_customer_input(): string
+    public function specific_customer_input(): void
    {
        $this->clearCache();

@@ -1237,7 +1230,7 @@ class Reports extends Secure_Controller
        $data['sale_type_options'] = $this->get_sale_type_options();

        $data['payment_type'] = $this->get_payment_type();
-        return view('reports/specific_customer_input', $data);
+        echo view('reports/specific_customer_input', $data);
    }

    /**
@@ -1246,15 +1239,13 @@ class Reports extends Secure_Controller
    public function get_payment_type(): array
    {
        return [
-            'all'           => lang('Common.none_selected_text'),
-            'cash'          => lang('Sales.cash'),
-            'due'           => lang('Sales.due'),
-            'check'         => lang('Sales.check'),
-            'credit'        => lang('Sales.credit'),
-            'debit'         => lang('Sales.debit'),
-            'bank_transfer' => lang('Sales.bank_transfer'),
-            'wallet'        => lang('Sales.wallet'),
-            'invoices'      => lang('Sales.invoice')
+            'all'      => lang('Common.none_selected_text'),
+            'cash'     => lang('Sales.cash'),
+            'due'      => lang('Sales.due'),
+            'check'    => lang('Sales.check'),
+            'credit'   => lang('Sales.credit'),
+            'debit'    => lang('Sales.debit'),
+            'invoices' => lang('Sales.invoice')
        ];
    }

@@ -1266,10 +1257,10 @@ class Reports extends Secure_Controller
     * @param string $customer_id
     * @param string $sale_type
     * @param string $payment_type
-     * @return string
+     * @return void
     * @noinspection PhpUnused
     */
-    public function specific_customers(string $start_date, string $end_date, string $customer_id, string $sale_type, string $payment_type): string
+    public function specific_customers(string $start_date, string $end_date, string $customer_id, string $sale_type, string $payment_type): void
    {
        $this->clearCache();

@@ -1360,16 +1351,16 @@ class Reports extends Secure_Controller
            'overall_summary_data' => $specific_customer->getSummaryData($inputs)
        ];

-        return view('reports/tabular_details', $data);
+        echo view('reports/tabular_details', $data);
    }

    /**
     * Detailed employee report input form. Used in app/Config/Routes.php
     *
-     * @return string
+     * @return void
     * @noinspection PhpUnused
     */
-    public function specific_employee_input(): string
+    public function specific_employee_input(): void
    {
        $this->clearCache();

@@ -1383,7 +1374,7 @@ class Reports extends Secure_Controller
        $data['specific_input_data'] = $employees;
        $data['sale_type_options'] = $this->get_sale_type_options();

-        return view('reports/specific_input', $data);
+        echo view('reports/specific_input', $data);
    }

    /**
@@ -1393,10 +1384,10 @@ class Reports extends Secure_Controller
     * @param string $end_date
     * @param string $employee_id
     * @param string $sale_type
-     * @return string
+     * @return void
     * @noinspection PhpUnused
     */
-    public function specific_employees(string $start_date, string $end_date, string $employee_id, string $sale_type): string
+    public function specific_employees(string $start_date, string $end_date, string $employee_id, string $sale_type): void
    {
        $this->clearCache();

@@ -1483,16 +1474,16 @@ class Reports extends Secure_Controller
            'overall_summary_data' => $specific_employee->getSummaryData($inputs)
        ];

-        return view('reports/tabular_details', $data);
+        echo view('reports/tabular_details', $data);
    }

    /**
     * Detailed discount report. Used in app/Config/Routes.php
     *
-     * @return string
+     * @return void
     * @noinspection PhpUnused
     */
-    public function specific_discount_input(): string
+    public function specific_discount_input(): void
    {
        $this->clearCache();

@@ -1507,7 +1498,7 @@ class Reports extends Secure_Controller
        $data['discount_type_options'] = ['0' => lang('Reports.discount_percent'), '1' => lang('Reports.discount_fixed')];
        $data['sale_type_options'] = $this->get_sale_type_options();

-        return view('reports/specific_input', $data);
+        echo view('reports/specific_input', $data);
    }

    /**
@@ -1518,10 +1509,10 @@ class Reports extends Secure_Controller
     * @param string $discount
     * @param string $sale_type
     * @param string $discount_type
-     * @return string
+     * @return void
     * @noinspection PhpUnused
     */
-    public function specific_discounts(string $start_date, string $end_date, string $discount, string $sale_type, string $discount_type): string
+    public function specific_discounts(string $start_date, string $end_date, string $discount, string $sale_type, string $discount_type): void
    {
        $this->clearCache();

@@ -1614,17 +1605,17 @@ class Reports extends Secure_Controller
            'overall_summary_data' => $specific_discount->getSummaryData($inputs)
        ];

-        return view('reports/tabular_details', $data);
+        echo view('reports/tabular_details', $data);
    }

    /**
     * Gets the detailed sales data row for given sale_id. Used in app/Views/reports/tabular_details.php
     *
     * @param string $sale_id
-     * @return ResponseInterface
+     * @return void
     * @noinspection PhpUnused
     */
-    public function getGet_detailed_sales_row(string $sale_id): ResponseInterface
+    public function getGet_detailed_sales_row(string $sale_id): void
    {
        $this->clearCache();

@@ -1667,16 +1658,16 @@ class Reports extends Secure_Controller
            )
        ];

-        return $this->response->setJSON([$sale_id => $summary_data]);
+        echo json_encode([$sale_id => $summary_data]);
    }

    /**
     * Detailed Supplier report input form. Used in app/Config/Routes.php
     *
-     * @return string
+     * @return void
     * @noinspection PhpUnused
     */
-    public function specific_supplier_input(): string
+    public function specific_supplier_input(): void
    {
        $this->clearCache();

@@ -1690,7 +1681,7 @@ class Reports extends Secure_Controller
        $data['specific_input_data'] = $suppliers;
        $data['sale_type_options'] = $this->get_sale_type_options();

-        return view('reports/specific_input', $data);
+        echo view('reports/specific_input', $data);
    }

    /**
@@ -1700,9 +1691,9 @@ class Reports extends Secure_Controller
     * @param string $end_date
     * @param string $supplier_id
     * @param string $sale_type
-     * @return string
+     * @return void
     */
-    public function specific_suppliers(string $start_date, string $end_date, string $supplier_id, string $sale_type): string
+    public function specific_suppliers(string $start_date, string $end_date, string $supplier_id, string $sale_type): void
    {
        $inputs = [
            'start_date'  => $start_date,
@@ -1736,7 +1727,7 @@ class Reports extends Secure_Controller
            ];
        }

-        $supplier_info = $this->supplier->get_info((int) $supplier_id);
+        $supplier_info = $this->supplier->get_info($supplier_id);
        $data = [
            'title'        => $supplier_info->company_name . ' (' . $supplier_info->first_name . ' ' . $supplier_info->last_name . ') ' . lang('Reports.report'),
            'subtitle'     => $this->_get_subtitle_report(['start_date' => $start_date, 'end_date' => $end_date]),
@@ -1745,7 +1736,7 @@ class Reports extends Secure_Controller
            'summary_data' => $specific_supplier->getSummaryData($inputs)
        ];

-        return view('reports/tabular', $data);
+        echo view('reports/tabular', $data);
    }

    /**
@@ -1772,13 +1763,13 @@ class Reports extends Secure_Controller
     * @param string $end_date
     * @param string $sale_type
     * @param string $location_id
-     * @return string
+     * @return void
     */
-    public function detailed_sales(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): string
+    public function detailed_sales(string $start_date, string $end_date, string $sale_type, string $location_id = 'all'): void
    {
        $this->clearCache();

-        $definition_names = $this->attribute->get_definitions_by_flags(attribute::SHOW_IN_SALES, true);
+        $definition_names = $this->attribute->get_definitions_by_flags(attribute::SHOW_IN_SALES);

        $inputs = [
            'start_date'     => $start_date,
@@ -1791,12 +1782,7 @@ class Reports extends Secure_Controller
        $this->detailed_sales->create($inputs);

        $columns = $this->detailed_sales->getDataColumns();
-        // Extract just names for column headers
-        $definitionHeaders = [];
-        foreach ($definition_names as $definition_id => $definitionInfo) {
-            $definitionHeaders[$definition_id] = $definitionInfo['name'];
-        }
-        $columns['details'] = array_merge($columns['details'], $definitionHeaders);
+        $columns['details'] = array_merge($columns['details'], $definition_names);

        $headers = $columns;

@@ -1883,17 +1869,17 @@ class Reports extends Secure_Controller
            'details_data_rewards' => $details_data_rewards,
            'overall_summary_data' => $this->detailed_sales->getSummaryData($inputs)
        ];
-        return view('reports/tabular_details', $data);
+        echo view('reports/tabular_details', $data);
    }

    /**
     * Returns detailed receivings row for given receiving_id. Used in app/Views/reports/tabular_details.php
     *
     * @param string $receiving_id
-     * @return ResponseInterface
+     * @return void
     * @noinspection PhpUnused
     */
-    public function getGet_detailed_receivings_row(string $receiving_id): ResponseInterface
+    public function getGet_detailed_receivings_row(string $receiving_id): void
    {
        $inputs = ['receiving_id' => $receiving_id];

@@ -1923,7 +1909,7 @@ class Reports extends Secure_Controller
            )
        ];

-        return $this->response->setJSON([$receiving_id => $summary_data]);
+        echo json_encode([$receiving_id => $summary_data]);
    }

    /**
@@ -1931,25 +1917,20 @@ class Reports extends Secure_Controller
     * @param string $end_date
     * @param string $receiving_type
     * @param string $location_id
-     * @return string
+     * @return void
     */
-    public function detailed_receivings(string $start_date, string $end_date, string $receiving_type, string $location_id = 'all'): string
+    public function detailed_receivings(string $start_date, string $end_date, string $receiving_type, string $location_id = 'all'): void
    {
        $this->clearCache();

-        $definition_names = $this->attribute->get_definitions_by_flags(attribute::SHOW_IN_RECEIVINGS, true);
+        $definition_names = $this->attribute->get_definitions_by_flags(attribute::SHOW_IN_RECEIVINGS);

        $inputs = ['start_date' => $start_date, 'end_date' => $end_date, 'receiving_type' => $receiving_type, 'location_id' => $location_id, 'definition_ids' => array_keys($definition_names)];

        $this->detailed_receivings->create($inputs);

        $columns = $this->detailed_receivings->getDataColumns();
-        // Extract just names for column headers
-        $definitionHeaders = [];
-        foreach ($definition_names as $definition_id => $definitionInfo) {
-            $definitionHeaders[$definition_id] = $definitionInfo['name'];
-        }
-        $columns['details'] = array_merge($columns['details'], $definitionHeaders);
+        $columns['details'] = array_merge($columns['details'], $definition_names);

        $headers = $columns;
        $report_data = $this->detailed_receivings->getData($inputs);
@@ -2012,13 +1993,13 @@ class Reports extends Secure_Controller
            'overall_summary_data' => $this->detailed_receivings->getSummaryData($inputs)
        ];

-        return view('reports/tabular_details', $data);
+        echo view('reports/tabular_details', $data);
    }

    /**
-     * @return string
+     * @return void
     */
-    public function inventory_low(): string
+    public function inventory_low(): void
    {
        $this->clearCache();

@@ -2047,16 +2028,16 @@ class Reports extends Secure_Controller
            'summary_data' => $inventory_low->getSummaryData($inputs)
        ];

-        return view('reports/tabular', $data);
+        echo view('reports/tabular', $data);
    }

    /**
     * Gets the inventory summary input view. Used in app/Config/Routes.php
     *
-     * @return string
+     * @return void
     * @noinspection PhpUnused
     */
-    public function inventory_summary_input(): string
+    public function inventory_summary_input(): void
    {
        $this->clearCache();

@@ -2067,15 +2048,15 @@ class Reports extends Secure_Controller
        $stock_locations['all'] = lang('Reports.all');
        $data['stock_locations'] = array_reverse($stock_locations, true);

-        return view('reports/inventory_summary_input', $data);
+        echo view('reports/inventory_summary_input', $data);
    }

    /**
     * @param string $location_id
     * @param string $item_count
-     * @return string
+     * @return void
     */
-    public function inventory_summary(string $location_id = 'all', string $item_count = 'all'): string
+    public function inventory_summary(string $location_id = 'all', string $item_count = 'all'): void
    {
        $this->clearCache();

@@ -2107,7 +2088,7 @@ class Reports extends Secure_Controller
            'summary_data' => $this->inventory_summary->getSummaryData($report_data)
        ];

-        return view('reports/tabular', $data);
+        echo view('reports/tabular', $data);
    }

    /**
--- a/app/Controllers/Sales.php
+++ b/app/Controllers/Sales.php
--- a/app/Controllers/Secure_Controller.php
+++ b/app/Controllers/Secure_Controller.php
@@ -4,7 +4,7 @@ namespace App\Controllers;

 use App\Models\Employee;
 use App\Models\Module;
-use CodeIgniter\HTTP\ResponseInterface;
+
 use CodeIgniter\Model;
 use CodeIgniter\Session\Session;
 use Config\OSPOS;
@@ -85,17 +85,18 @@ class Secure_Controller extends BaseController

    /**
     * AJAX function used to confirm whether values sent in the request are numeric
-     * @return ResponseInterface
+     * @return void
     * @noinspection PhpUnused
     */
-    public function getCheckNumeric(): ResponseInterface
+    public function getCheckNumeric(): void
    {
        foreach ($this->request->getGet() as $value) {
            if (parse_decimals($value) === false) {
-                return $this->response->setJSON('false');
+                echo 'false';
+                return;
            }
        }
-        return $this->response->setJSON('true');
+        echo 'true';
    }

    /**
--- a/app/Controllers/Suppliers.php
+++ b/app/Controllers/Suppliers.php
@@ -3,7 +3,6 @@
 namespace App\Controllers;

 use App\Models\Supplier;
-use CodeIgniter\HTTP\ResponseInterface;
 use Config\Services;

 class Suppliers extends Persons
@@ -18,33 +17,33 @@ class Suppliers extends Persons
    }

    /**
-     * @return string
+     * @return void
     */
-    public function getIndex(): string
+    public function getIndex(): void
    {
        $data['table_headers'] = get_suppliers_manage_table_headers();

-        return view('people/manage', $data);
+        echo view('people/manage', $data);
    }

    /**
     * Gets one row for a supplier manage table. This is called using AJAX to update one row.
     * @param $row_id
-     * @return ResponseInterface
+     * @return void
     */
-    public function getRow($row_id): ResponseInterface
+    public function getRow($row_id): void
    {
        $data_row = get_supplier_data_row($this->supplier->get_info($row_id));
        $data_row['category'] = $this->supplier->get_category_name($data_row['category']);

-        return $this->response->setJSON($data_row);
+        echo json_encode($data_row);
    }

    /**
     * Returns Supplier table data rows. This will be called with AJAX.
     * @return void
     **/
-    public function getSearch(): ResponseInterface
+    public function getSearch(): void
    {
        $search = $this->request->getGet('search');
        $limit = $this->request->getGet('limit', FILTER_SANITIZE_NUMBER_INT);
@@ -63,39 +62,38 @@ class Suppliers extends Persons
            $data_rows[] = $row;
        }

-        return $this->response->setJSON(['total' => $total_rows, 'rows' => $data_rows]);
+        echo json_encode(['total' => $total_rows, 'rows' => $data_rows]);
    }

    /**
     * Gives search suggestions based on what is being searched for
-     * @return ResponseInterface
     **/
-    public function getSuggest(): ResponseInterface
+    public function getSuggest(): void
    {
        $search = $this->request->getGet('term');
        $suggestions = $this->supplier->get_search_suggestions($search, true);

-        return $this->response->setJSON($suggestions);
+        echo json_encode($suggestions);
    }

    /**
-     * @return ResponseInterface
+     * @return void
     */
-    public function suggest_search(): ResponseInterface
+    public function suggest_search(): void
    {
        $search = $this->request->getPost('term');
        $suggestions = $this->supplier->get_search_suggestions($search, false);

-        return $this->response->setJSON($suggestions);
+        echo json_encode($suggestions);
    }

    /**
     * Loads the supplier edit form
     *
     * @param int $supplier_id
-     * @return string
+     * @return void
     */
-    public function getView(int $supplier_id = NEW_ENTRY): string
+    public function getView(int $supplier_id = NEW_ENTRY): void
    {
        $info = $this->supplier->get_info($supplier_id);
        foreach (get_object_vars($info) as $property => $value) {
@@ -104,16 +102,16 @@ class Suppliers extends Persons
        $data['person_info'] = $info;
        $data['categories'] = $this->supplier->get_categories();

-        return view("suppliers/form", $data);
+        echo view("suppliers/form", $data);
    }

    /**
     * Inserts/updates a supplier
     *
     * @param int $supplier_id
-     * @return ResponseInterface
+     * @return void
     */
-    public function postSave(int $supplier_id = NEW_ENTRY): ResponseInterface
+    public function postSave(int $supplier_id = NEW_ENTRY): void
    {
        $first_name = $this->request->getPost('first_name', FILTER_SANITIZE_FULL_SPECIAL_CHARS);    // TODO: Duplicate code
        $last_name = $this->request->getPost('last_name', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
@@ -149,21 +147,21 @@ class Suppliers extends Persons
        if ($this->supplier->save_supplier($person_data, $supplier_data, $supplier_id)) {
            // New supplier
            if ($supplier_id == NEW_ENTRY) {
-                return $this->response->setJSON([
+                echo json_encode([
                    'success' => true,
                    'message' => lang('Suppliers.successful_adding') . ' ' . $supplier_data['company_name'],
                    'id'      => $supplier_data['person_id']
                ]);
            } else { // Existing supplier

-                return $this->response->setJSON([
+                echo json_encode([
                    'success' => true,
                    'message' => lang('Suppliers.successful_updating') . ' ' . $supplier_data['company_name'],
                    'id'      => $supplier_id
                ]);
            }
        } else { // Failure
-            return $this->response->setJSON([
+            echo json_encode([
                'success' => false,
                'message' => lang('Suppliers.error_adding_updating') . ' ' .     $supplier_data['company_name'],
                'id'      => NEW_ENTRY
@@ -174,19 +172,19 @@ class Suppliers extends Persons
    /**
     * This deletes suppliers from the suppliers table
     *
-     * @return ResponseInterface
+     * @return void
     */
-    public function postDelete(): ResponseInterface
+    public function postDelete(): void
    {
        $suppliers_to_delete = $this->request->getPost('ids', FILTER_SANITIZE_NUMBER_INT);

        if ($this->supplier->delete_list($suppliers_to_delete)) {
-            return $this->response->setJSON([
+            echo json_encode([
                'success' => true,
                'message' => lang('Suppliers.successful_deleted') . ' ' . count($suppliers_to_delete) . ' ' . lang('Suppliers.one_or_multiple')
            ]);
        } else {
-            return $this->response->setJSON(['success' => false, 'message' => lang('Suppliers.cannot_be_deleted')]);
+            echo json_encode(['success' => false, 'message' => lang('Suppliers.cannot_be_deleted')]);
        }
    }
 }
--- a/app/Controllers/Tax_categories.php
+++ b/app/Controllers/Tax_categories.php
@@ -3,7 +3,6 @@
 namespace App\Controllers;

 use App\Models\Tax_category;
-use CodeIgniter\HTTP\ResponseInterface;
 use Config\Services;

 /**
@@ -21,13 +20,13 @@ class Tax_categories extends Secure_Controller
    }

    /**
-     * @return string
+     * @return void
     */
-    public function getIndex(): string
+    public function getIndex(): void
    {
        $data['tax_categories_table_headers'] = get_tax_categories_table_headers();

-        return view('taxes/tax_categories', $data);
+        echo view('taxes/tax_categories', $data);
    }

    /**
@@ -35,12 +34,12 @@ class Tax_categories extends Secure_Controller
     *
     * @return void
     */
-    public function getSearch(): ResponseInterface
+    public function getSearch(): void
    {
        $search = $this->request->getGet('search');
        $limit  = $this->request->getGet('limit', FILTER_SANITIZE_NUMBER_INT);
        $offset = $this->request->getGet('offset', FILTER_SANITIZE_NUMBER_INT);
-        $sort   = $this->sanitizeSortColumn(get_tax_categories_table_headers(), $this->request->getGet('sort', FILTER_SANITIZE_FULL_SPECIAL_CHARS), 'tax_category_id');
+        $sort   = $this->request->getGet('sort', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
        $order  = $this->request->getGet('order', FILTER_SANITIZE_FULL_SPECIAL_CHARS);

        $tax_categories = $this->tax_category->search($search, $limit, $offset, $sort, $order);
@@ -51,37 +50,37 @@ class Tax_categories extends Secure_Controller
            $data_rows[] = get_tax_categories_data_row($tax_category);
        }

-        return $this->response->setJSON(['total' => $total_rows, 'rows' => $data_rows]);
+        echo json_encode(['total' => $total_rows, 'rows' => $data_rows]);
    }

    /**
     * @param $row_id
-     * @return ResponseInterface
+     * @return void
     */
-    public function getRow($row_id): ResponseInterface
+    public function getRow($row_id): void
    {
        $data_row = get_tax_categories_data_row($this->tax_category->get_info($row_id));

-        return $this->response->setJSON($data_row);
+        echo json_encode($data_row);
    }

    /**
     * @param int $tax_category_id
-     * @return string
+     * @return void
     */
-    public function getView(int $tax_category_id = NEW_ENTRY): string
+    public function getView(int $tax_category_id = NEW_ENTRY): void
    {
        $data['tax_category_info'] = $this->tax_category->get_info($tax_category_id);

-        return view("taxes/tax_category_form", $data);
+        echo view("taxes/tax_category_form", $data);
    }


    /**
     * @param int $tax_category_id
-     * @return ResponseInterface
+     * @return void
     */
-    public function postSave(int $tax_category_id = NEW_ENTRY): ResponseInterface
+    public function postSave(int $tax_category_id = NEW_ENTRY): void
    {
        $tax_category_data = [
            'tax_category'       => $this->request->getPost('tax_category', FILTER_SANITIZE_FULL_SPECIAL_CHARS),
@@ -92,20 +91,20 @@ class Tax_categories extends Secure_Controller
        if ($this->tax_category->save_value($tax_category_data, $tax_category_id)) {
            // New tax_category_id
            if ($tax_category_id == NEW_ENTRY) {
-                return $this->response->setJSON([
+                echo json_encode([
                    'success' => true,
                    'message' => lang('Tax_categories.successful_adding'),
                    'id'      => $tax_category_data['tax_category_id']
                ]);
            } else {
-                return $this->response->setJSON([
+                echo json_encode([
                    'success' => true,
                    'message' => lang('Tax_categories.successful_updating'),
                    'id'      => $tax_category_id
                ]);
            }
        } else {
-            return $this->response->setJSON([
+            echo json_encode([
                'success' => false,
                'message' => lang('Tax_categories.error_adding_updating') . ' ' . $tax_category_data['tax_category'],
                'id'      => NEW_ENTRY
@@ -114,19 +113,19 @@ class Tax_categories extends Secure_Controller
    }

    /**
-     * @return ResponseInterface
+     * @return void
     */
-    public function postDelete(): ResponseInterface
+    public function postDelete(): void
    {
        $tax_categories_to_delete = $this->request->getPost('ids', FILTER_SANITIZE_NUMBER_INT);

        if ($this->tax_category->delete_list($tax_categories_to_delete)) {
-            return $this->response->setJSON([
+            echo json_encode([
                'success' => true,
                'message' => lang('Tax_categories.successful_deleted') . ' ' . count($tax_categories_to_delete) . ' ' . lang('Tax_categories.one_or_multiple')
            ]);
        } else {
-            return $this->response->setJSON(['success' => false, 'message' => lang('Tax_categories.cannot_be_deleted')]);
+            echo json_encode(['success' => false, 'message' => lang('Tax_categories.cannot_be_deleted')]);
        }
    }
 }
--- a/app/Controllers/Tax_codes.php
+++ b/app/Controllers/Tax_codes.php
@@ -3,7 +3,6 @@
 namespace App\Controllers;

 use App\Models\Tax_code;
-use CodeIgniter\HTTP\ResponseInterface;
 use Config\Services;

 /**
@@ -23,11 +22,11 @@ class Tax_codes extends Secure_Controller


    /**
-     * @return string
+     * @return void
     */
-    public function getIndex(): string
+    public function getIndex(): void
    {
-        return view('taxes/tax_codes', $this->get_data());
+        echo view('taxes/tax_codes', $this->get_data());
    }

    /**
@@ -45,12 +44,12 @@ class Tax_codes extends Secure_Controller
     *
     * @return void
     */
-    public function getSearch(): ResponseInterface
+    public function getSearch(): void
    {
        $search = $this->request->getGet('search');
        $limit  = $this->request->getGet('limit', FILTER_SANITIZE_NUMBER_INT);
        $offset = $this->request->getGet('offset', FILTER_SANITIZE_NUMBER_INT);
-        $sort   = $this->sanitizeSortColumn(get_tax_code_table_headers(), $this->request->getGet('sort', FILTER_SANITIZE_FULL_SPECIAL_CHARS), 'tax_code');
+        $sort   = $this->request->getGet('sort', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
        $order  = $this->request->getGet('order', FILTER_SANITIZE_FULL_SPECIAL_CHARS);

        $tax_codes = $this->tax_code->search($search, $limit, $offset, $sort, $order);
@@ -62,37 +61,37 @@ class Tax_codes extends Secure_Controller
            $data_rows[] = get_tax_code_data_row($tax_code);
        }

-        return $this->response->setJSON(['total' => $total_rows, 'rows' => $data_rows]);
+        echo json_encode(['total' => $total_rows, 'rows' => $data_rows]);
    }

    /**
     * @param int $row_id
-     * @return ResponseInterface
+     * @return void
     */
-    public function getRow(int $row_id): ResponseInterface
+    public function getRow(int $row_id): void
    {
        $data_row = get_tax_code_data_row($this->tax_code->get_info($row_id));

-        return $this->response->setJSON($data_row);
+        echo json_encode($data_row);
    }

    /**
     * @param int $tax_code_id
-     * @return string
+     * @return void
     */
-    public function getView(int $tax_code_id = NEW_ENTRY): string
+    public function getView(int $tax_code_id = NEW_ENTRY): void
    {
        $data['tax_code_info'] = $this->tax_code->get_info($tax_code_id);

-        return view("taxes/tax_code_form", $data);
+        echo view("taxes/tax_code_form", $data);
    }


    /**
     * @param int $tax_code_id
-     * @return ResponseInterface
+     * @return void
     */
-    public function postSave(int $tax_code_id = NEW_ENTRY): ResponseInterface
+    public function postSave(int $tax_code_id = NEW_ENTRY): void
    {
        $tax_code_data = [
            'tax_code'      => $this->request->getPost('tax_code', FILTER_SANITIZE_FULL_SPECIAL_CHARS),
@@ -103,20 +102,20 @@ class Tax_codes extends Secure_Controller

        if ($this->tax_code->save($tax_code_data)) {
            if ($tax_code_id == NEW_ENTRY) {
-                return $this->response->setJSON([
+                echo json_encode([
                    'success' => true,
                    'message' => lang('Tax_codes.successful_adding'),
                    'id'      => $tax_code_data['tax_code_id']
                ]);
            } else {
-                return $this->response->setJSON([
+                echo json_encode([
                    'success' => true,
                    'message' => lang('Tax_codes.successful_updating'),
                    'id'      => $tax_code_id
                ]);
            }
        } else {
-            return $this->response->setJSON([
+            echo json_encode([
                'success' => false,
                'message' => lang('Tax_codes.error_adding_updating') . ' ' . $tax_code_data['tax_code_id'],
                'id'      => NEW_ENTRY
@@ -125,19 +124,19 @@ class Tax_codes extends Secure_Controller
    }

    /**
-     * @return ResponseInterface
+     * @return void
     */
-    public function postDelete(): ResponseInterface
+    public function postDelete(): void
    {
        $tax_codes_to_delete = $this->request->getPost('ids', FILTER_SANITIZE_NUMBER_INT);

        if ($this->tax_code->delete_list($tax_codes_to_delete)) {
-            return $this->response->setJSON([
+            echo json_encode([
                'success' => true,
                'message' => lang('Tax_codes.successful_deleted') . ' ' . count($tax_codes_to_delete) . ' ' . lang('Tax_codes.one_or_multiple')
            ]);
        } else {
-            return $this->response->setJSON(['success' => false, 'message' => lang('Tax_codes.cannot_be_deleted')]);
+            echo json_encode(['success' => false, 'message' => lang('Tax_codes.cannot_be_deleted')]);
        }
    }
 }
--- a/app/Controllers/Tax_jurisdictions.php
+++ b/app/Controllers/Tax_jurisdictions.php
@@ -3,7 +3,6 @@
 namespace App\Controllers;

 use App\Models\Tax_jurisdiction;
-use CodeIgniter\HTTP\ResponseInterface;
 use Config\Services;

 /**
@@ -24,13 +23,13 @@ class Tax_jurisdictions extends Secure_Controller


    /**
-     * @return string
+     * @return void
     */
-    public function getIndex(): string
+    public function getIndex(): void
    {
        $data['table_headers'] = get_tax_jurisdictions_table_headers();

-        return view('taxes/tax_jurisdictions', $data);
+        echo view('taxes/tax_jurisdictions', $data);
    }

    /**
@@ -38,12 +37,12 @@ class Tax_jurisdictions extends Secure_Controller
     *
     * @return void
     */
-    public function getSearch(): ResponseInterface
+    public function getSearch(): void
    {
        $search = $this->request->getGet('search');
        $limit  = $this->request->getGet('limit', FILTER_SANITIZE_NUMBER_INT);
        $offset = $this->request->getGet('offset', FILTER_SANITIZE_NUMBER_INT);
-        $sort   = $this->sanitizeSortColumn(get_tax_jurisdictions_table_headers(), $this->request->getGet('sort', FILTER_SANITIZE_FULL_SPECIAL_CHARS), 'jurisdiction_id');
+        $sort   = $this->request->getGet('sort', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
        $order  = $this->request->getGet('order', FILTER_SANITIZE_FULL_SPECIAL_CHARS);

        $tax_jurisdictions = $this->tax_jurisdiction->search($search, $limit, $offset, $sort, $order);
@@ -54,37 +53,37 @@ class Tax_jurisdictions extends Secure_Controller
            $data_rows[] = get_tax_jurisdictions_data_row($tax_jurisdiction);
        }

-        return $this->response->setJSON(['total' => $total_rows, 'rows' => $data_rows]);
+        echo json_encode(['total' => $total_rows, 'rows' => $data_rows]);
    }

    /**
     * @param int $row_id
-     * @return ResponseInterface
+     * @return void
     */
-    public function getRow(int $row_id): ResponseInterface
+    public function getRow(int $row_id): void
    {
        $data_row = get_tax_jurisdictions_data_row($this->tax_jurisdiction->get_info($row_id));

-        return $this->response->setJSON($data_row);
+        echo json_encode($data_row);
    }

    /**
     * @param int $tax_jurisdiction_id
-     * @return string
+     * @return void
     */
-    public function getView(int $tax_jurisdiction_id = NEW_ENTRY): string
+    public function getView(int $tax_jurisdiction_id = NEW_ENTRY): void
    {
        $data['tax_jurisdiction_info'] = $this->tax_jurisdiction->get_info($tax_jurisdiction_id);

-        return view("taxes/tax_jurisdiction_form", $data);
+        echo view("taxes/tax_jurisdiction_form", $data);
    }


    /**
     * @param int $jurisdiction_id
-     * @return ResponseInterface
+     * @return void
     */
-    public function postSave(int $jurisdiction_id = NEW_ENTRY): ResponseInterface
+    public function postSave(int $jurisdiction_id = NEW_ENTRY): void
    {
        $tax_jurisdiction_data = [
            'jurisdiction_name'   => $this->request->getPost('jurisdiction_name', FILTER_SANITIZE_FULL_SPECIAL_CHARS),
@@ -93,20 +92,20 @@ class Tax_jurisdictions extends Secure_Controller

        if ($this->tax_jurisdiction->save_value($tax_jurisdiction_data)) {
            if ($jurisdiction_id == NEW_ENTRY) {
-                return $this->response->setJSON([
+                echo json_encode([
                    'success' => true,
                    'message' => lang('Tax_jurisdictions.successful_adding'),
                    'id'      => $tax_jurisdiction_data['jurisdiction_id']
                ]);
            } else {
-                return $this->response->setJSON([
+                echo json_encode([
                    'success' => true,
                    'message' => lang('Tax_jurisdictions.successful_updating'),
                    'id'      => $jurisdiction_id
                ]);
            }
        } else {
-            return $this->response->setJSON([
+            echo json_encode([
                'success' => false,
                'message' => lang('Tax_jurisdictions.error_adding_updating') . ' ' . $tax_jurisdiction_data['jurisdiction_name'],
                'id'      => NEW_ENTRY
@@ -115,19 +114,19 @@ class Tax_jurisdictions extends Secure_Controller
    }

    /**
-     * @return ResponseInterface
+     * @return void
     */
-    public function postDelete(): ResponseInterface
+    public function postDelete(): void
    {
        $tax_jurisdictions_to_delete = $this->request->getPost('ids', FILTER_SANITIZE_NUMBER_INT);

        if ($this->tax_jurisdiction->delete_list($tax_jurisdictions_to_delete)) {
-            return $this->response->setJSON([
+            echo json_encode([
                'success' => true,
                'message' => lang('Tax_jurisdictions.successful_deleted') . ' ' . count($tax_jurisdictions_to_delete) . ' ' . lang('Tax_jurisdictions.one_or_multiple')
            ]);
        } else {
-            return $this->response->setJSON(['success' => false, 'message' => lang('Tax_jurisdictions.cannot_be_deleted')]);
+            echo json_encode(['success' => false, 'message' => lang('Tax_jurisdictions.cannot_be_deleted')]);
        }
    }
 }
--- a/app/Controllers/Taxes.php
+++ b/app/Controllers/Taxes.php
@@ -8,7 +8,6 @@ use App\Models\Tax;
 use App\Models\Tax_category;
 use App\Models\Tax_code;
 use App\Models\Tax_jurisdiction;
-use CodeIgniter\HTTP\ResponseInterface;
 use Config\OSPOS;
 use Config\Services;

@@ -37,9 +36,9 @@ class Taxes extends Secure_Controller
    }

    /**
-     * @return string
+     * @return void
     */
-    public function getIndex(): string
+    public function getIndex(): void
    {
        $data['tax_codes'] = $this->tax_code->get_all()->getResultArray();
        if (count($data['tax_codes']) == 0) {
@@ -68,7 +67,7 @@ class Taxes extends Secure_Controller

        $data['tax_type_options'] = $this->tax_lib->get_tax_type_options($data['default_tax_type']);

-        return view('taxes/manage', $data);
+        echo view('taxes/manage', $data);
    }

    /**
@@ -76,12 +75,12 @@ class Taxes extends Secure_Controller
     *
     * @return void
     */
-    public function getSearch(): ResponseInterface
+    public function getSearch(): void
    {
        $search = $this->request->getGet('search');
        $limit = $this->request->getGet('limit', FILTER_SANITIZE_NUMBER_INT);
        $offset = $this->request->getGet('offset', FILTER_SANITIZE_NUMBER_INT);
-        $sort = $this->sanitizeSortColumn(get_tax_rates_manage_table_headers(), $this->request->getGet('sort', FILTER_SANITIZE_FULL_SPECIAL_CHARS), 'tax_rate_id');
+        $sort = $this->request->getGet('sort', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
        $order = $this->request->getGet('order', FILTER_SANITIZE_FULL_SPECIAL_CHARS);

        $tax_rates = $this->tax->search($search, $limit, $offset, $sort, $order);
@@ -93,50 +92,50 @@ class Taxes extends Secure_Controller
            $data_rows[] = get_tax_rates_data_row($tax_rate_row);
        }

-        return $this->response->setJSON(['total' => $total_rows, 'rows' => $data_rows]);
+        echo json_encode(['total' => $total_rows, 'rows' => $data_rows]);
    }

    /**
     * Gives search suggestions based on what is being searched for
-     * @return ResponseInterface
     */
-    public function suggest_search(): ResponseInterface
+    public function suggest_search(): void
    {
        $search = $this->request->getPost('term');
        $suggestions = $this->tax->get_search_suggestions($search);    // TODO: There is no get_search_suggestions function in the tax model

-        return $this->response->setJSON($suggestions);
+        echo json_encode($suggestions);
    }

    /**
     * Provides list of tax categories to select from
-     * @return ResponseInterface
+     *
+     * @return void
     */
-    public function suggest_tax_categories(): ResponseInterface
+    public function suggest_tax_categories(): void
    {
        $search = $this->request->getPost('term');
        $suggestions = $this->tax_category->get_tax_category_suggestions($search);

-        return $this->response->setJSON($suggestions);
+        echo json_encode($suggestions);
    }


    /**
     * @param int $row_id
-     * @return ResponseInterface
+     * @return void
     */
-    public function getRow(int $row_id): ResponseInterface
+    public function getRow(int $row_id): void
    {
        $data_row = get_tax_rates_data_row($this->tax->get_info($row_id));

-        return $this->response->setJSON($data_row);
+        echo json_encode($data_row);
    }

    /**
     * @param int $tax_code
-     * @return string
+     * @return void
     */
-    public function getView_tax_codes(int $tax_code = NEW_ENTRY): string
+    public function getView_tax_codes(int $tax_code = NEW_ENTRY): void
    {
        $tax_code_info = $this->tax->get_info($tax_code);

@@ -193,15 +192,15 @@ class Taxes extends Secure_Controller

        $data['tax_rates'] = $tax_rates;

-        return view('taxes/tax_code_form', $data);
+        echo view('taxes/tax_code_form', $data);
    }


    /**
     * @param int $tax_rate_id
-     * @return string
+     * @return void
     */
-    public function getView(int $tax_rate_id = NEW_ENTRY): string
+    public function getView(int $tax_rate_id = NEW_ENTRY): void
    {
        $tax_rate_info = $this->tax->get_info($tax_rate_id);

@@ -227,14 +226,14 @@ class Taxes extends Secure_Controller
            $data['tax_rate'] = $tax_rate_info->tax_rate;
        }

-        return view('taxes/tax_rates_form', $data);
+        echo view('taxes/tax_rates_form', $data);
    }

    /**
     * @param int $tax_code
-     * @return string
+     * @return void
     */
-    public function getView_tax_categories(int $tax_code = NEW_ENTRY): string    // TODO: This appears to be called no where in the code.
+    public function getView_tax_categories(int $tax_code = NEW_ENTRY): void    // TODO: This appears to be called no where in the code.
    {
        $tax_code_info = $this->tax->get_info($tax_code);    // TODO: Duplicated Code

@@ -291,14 +290,14 @@ class Taxes extends Secure_Controller

        $data['tax_rates'] = $tax_rates;

-        return view('taxes/tax_category_form', $data);
+        echo view('taxes/tax_category_form', $data);
    }

    /**
     * @param int $tax_code
-     * @return string
+     * @return void
     */
-    public function getView_tax_jurisdictions(int $tax_code = NEW_ENTRY): string // TODO: This appears to be called no where in the code.
+    public function getView_tax_jurisdictions(int $tax_code = NEW_ENTRY): void // TODO: This appears to be called no where in the code.
    {
        $tax_code_info = $this->tax->get_info($tax_code);    // TODO: Duplicated code

@@ -355,7 +354,7 @@ class Taxes extends Secure_Controller

        $data['tax_rates'] = $tax_rates;

-        return view('taxes/tax_jurisdiction_form', $data);
+        echo view('taxes/tax_jurisdiction_form', $data);
    }

    /**
@@ -368,9 +367,9 @@ class Taxes extends Secure_Controller

    /**
     * @param int $tax_rate_id
-     * @return ResponseInterface
+     * @return void
     */
-    public function postSave(int $tax_rate_id = NEW_ENTRY): ResponseInterface
+    public function postSave(int $tax_rate_id = NEW_ENTRY): void
    {
        $tax_category_id = $this->request->getPost('rate_tax_category_id', FILTER_SANITIZE_NUMBER_INT);
        $tax_rate = parse_tax($this->request->getPost('tax_rate'));
@@ -389,50 +388,50 @@ class Taxes extends Secure_Controller

        if ($this->tax->save_value($tax_rate_data, $tax_rate_id)) {
            if ($tax_rate_id == NEW_ENTRY) {    // TODO: this needs to be replaced with ternary notation
-                return $this->response->setJSON(['success' => true, 'message' => lang('Taxes.tax_rate_successfully_added')]);
+                echo json_encode(['success' => true, 'message' => lang('Taxes.tax_rate_successfully_added')]);
            } else { // Existing tax_code
-                return $this->response->setJSON(['success' => true, 'message' => lang('Taxes.tax_rate_successful_updated')]);
+                echo json_encode(['success' => true, 'message' => lang('Taxes.tax_rate_successful_updated')]);
            }
        } else {
-            return $this->response->setJSON(['success' => false, 'message' => lang('Taxes.tax_rate_error_adding_updating')]);
+            echo json_encode(['success' => false, 'message' => lang('Taxes.tax_rate_error_adding_updating')]);
        }
    }

    /**
-     * @return ResponseInterface
+     * @return void
     */
-    public function postDelete(): ResponseInterface
+    public function postDelete(): void
    {
        $tax_codes_to_delete = $this->request->getPost('ids', FILTER_SANITIZE_NUMBER_INT);

        if ($this->tax->delete_list($tax_codes_to_delete)) {    // TODO: this needs to be replaced with ternary notation
-            return $this->response->setJSON(['success' => true, 'message' => lang('Taxes.tax_code_successful_deleted')]);
+            echo json_encode(['success' => true, 'message' => lang('Taxes.tax_code_successful_deleted')]);
        } else {
-            return $this->response->setJSON(['success' => false, 'message' => lang('Taxes.tax_code_cannot_be_deleted')]);
+            echo json_encode(['success' => false, 'message' => lang('Taxes.tax_code_cannot_be_deleted')]);
        }
    }

    /**
     * Get search suggestions for tax codes. Used in app/Views/customers/form.php
     *
-     * @return ResponseInterface
+     * @return void
     * @noinspection PhpUnused
     */
-    public function getSuggestTaxCodes(): ResponseInterface
+    public function getSuggestTaxCodes(): void
    {
        $search = $this->request->getPostGet('term');
        $suggestions = $this->tax_code->get_tax_codes_search_suggestions($search);

-        return $this->response->setJSON($suggestions);
+        echo json_encode($suggestions);
    }

    /**
     * Saves Tax Codes. Used in app/Views/taxes/tax_codes.php
     *
-     * @return ResponseInterface
+     * @return void
     * @noinspection PhpUnused
     */
-    public function postSave_tax_codes(): ResponseInterface
+    public function postSave_tax_codes(): void
    {
        $tax_code_id = $this->request->getPost('tax_code_id', FILTER_SANITIZE_NUMBER_INT);
        $tax_code = $this->request->getPost('tax_code', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
@@ -453,7 +452,7 @@ class Taxes extends Secure_Controller

        $success = $this->tax_code->save_tax_codes($array_save);

-        return $this->response->setJSON([
+        echo json_encode([
            'success' => $success,
            'message' => lang('Taxes.tax_codes_saved_' . ($success ? '' : 'un') . 'successfully')
        ]);
@@ -462,10 +461,10 @@ class Taxes extends Secure_Controller
    /**
     * Saves given tax jurisdiction. Used in app/Views/taxes/tax_jurisdictions.php.
     *
-     * @return ResponseInterface
+     * @return void
     * @noinspection PhpUnused
     */
-    public function postSave_tax_jurisdictions(): ResponseInterface
+    public function postSave_tax_jurisdictions(): void
    {
        $jurisdiction_id = $this->request->getPost('jurisdiction_id', FILTER_SANITIZE_NUMBER_INT);
        $jurisdiction_name = $this->request->getPost('jurisdiction_name', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
@@ -490,10 +489,11 @@ class Taxes extends Secure_Controller
            ];

            if (in_array($tax_group[$key], $unique_tax_groups)) {    // TODO: This can be replaced with `in_array($tax_group[$key], $unique_tax_groups)`
-                return $this->response->setJSON([
+                echo json_encode([
                    'success' => false,
                    'message' => lang('Taxes.tax_group_not_unique', [$tax_group[$key]])
                ]);
+                return;
            } else {
                $unique_tax_groups[] = $tax_group[$key];
            }
@@ -501,7 +501,7 @@ class Taxes extends Secure_Controller

        $success = $this->tax_jurisdiction->save_jurisdictions($array_save);

-        return $this->response->setJSON([
+        echo json_encode([
            'success' => $success,
            'message' => lang('Taxes.tax_jurisdictions_saved_' . ($success ? '' : 'un') . 'successfully')
        ]);
@@ -510,10 +510,10 @@ class Taxes extends Secure_Controller
    /**
     * Saves tax categories. Used in app/Views/taxes/tax_categories.php
     *
-     * @return ResponseInterface
+     * @return void
     * @noinspection PhpUnused
     */
-    public function postSave_tax_categories(): ResponseInterface
+    public function postSave_tax_categories(): void
    {
        $tax_category_id = $this->request->getPost('tax_category_id', FILTER_SANITIZE_NUMBER_INT);
        $tax_category = $this->request->getPost('tax_category', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
@@ -531,7 +531,7 @@ class Taxes extends Secure_Controller

        $success = $this->tax_category->save_categories($array_save);

-        return $this->response->setJSON([
+        echo json_encode([
            'success' => $success,
            'message' => lang('Taxes.tax_categories_saved_' . ($success ? '' : 'un') . 'successfully')
        ]);
@@ -540,36 +540,36 @@ class Taxes extends Secure_Controller
    /**
     * Gets tax codes partial view. Used in app/Views/taxes/tax_codes.php.
     *
-     * @return string
+     * @return void
     * @noinspection PhpUnused
     */
-    public function getAjax_tax_codes(): string
+    public function getAjax_tax_codes(): void
    {
        $tax_codes = $this->tax_code->get_all()->getResultArray();

-        return view('partial/tax_codes', ['tax_codes' => $tax_codes]);
+        echo view('partial/tax_codes', ['tax_codes' => $tax_codes]);
    }

    /**
     * Gets current tax categories. Used in app/Views/taxes/tax_categories.php
     *
-     * @return string
+     * @return void
     * @noinspection PhpUnused
     */
-    public function getAjax_tax_categories(): string
+    public function getAjax_tax_categories(): void
    {
        $tax_categories = $this->tax_category->get_all()->getResultArray();

-        return view('partial/tax_categories', ['tax_categories' => $tax_categories]);
+        echo view('partial/tax_categories', ['tax_categories' => $tax_categories]);
    }

    /**
     * Gets the tax jurisdiction partial view.  Used in app/Views/taxes/tax_jurisdictions.php.
     *
-     * @return string
+     * @return void
     * @noinspection PhpUnused
     */
-    public function getAjax_tax_jurisdictions(): string
+    public function getAjax_tax_jurisdictions(): void
    {
        $tax_jurisdictions = $this->tax_jurisdiction->get_all()->getResultArray();

@@ -581,7 +581,7 @@ class Taxes extends Secure_Controller

        $tax_types = $this->tax_lib->get_tax_types();

-        return view('partial/tax_jurisdictions', [
+        echo view('partial/tax_jurisdictions', [
            'tax_jurisdictions' => $tax_jurisdictions,
            'tax_types'         => $tax_types,
            'default_tax_type'  => $default_tax_type
--- a/app/Database/Dockerfile
+++ b/app/Database/Dockerfile
@@ -1,5 +1,5 @@
 FROM alpine:3.14
-LABEL maintainer="jekkos"
+MAINTAINER jekkos

 ADD database.sql /docker-entrypoint-initdb.d/database.sql
 VOLUME /docker-entrypoint-initdb.d
--- a/app/Database/Migrations/20170501000000_initial_schema.php
+++ b/app/Database/Migrations/20170501000000_initial_schema.php
@@ -1,60 +0,0 @@
-<?php
-
-namespace App\Database\Migrations;
-
-use CodeIgniter\Database\Migration;
-
-class Migration_Initial_Schema extends Migration
-{
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Perform a migration step.
-     * Only runs on fresh installs - skips if database already has tables.
-     *
-     * For testing: CI4's DatabaseTestTrait with $refresh=true handles table
-     * cleanup/creation automatically. This migration only loads initial schema
-     * on fresh databases where no application tables exist.
-     */
-    public function up(): void
-    {
-        // Check if core application tables exist (existing install)
-        // Note: migrations table may exist even on fresh DB due to migration tracking
-        $tables = $this->db->listTables();
-        
-        // Check for a core application table, not just migrations table
-        foreach ($tables as $table) {
-            // Strip prefix if present for comparison
-            $tableName = str_replace($this->db->getPrefix(), '', $table);
-            if (in_array($tableName, ['app_config', 'items', 'employees', 'people'])) {
-                // Database already populated - skip initial schema
-                // This is an existing installation upgrading from older version
-                return;
-            }
-        }
-        
-        // Fresh install - load initial schema
-        helper('migration');
-        execute_script(APPPATH . 'Database/Migrations/sqlscripts/initial_schema.sql');
-    }
-
-    /**
-     * Revert a migration step.
-     * Cannot revert initial schema - would lose all data.
-     */
-    public function down(): void
-    {
-        // Cannot safely revert initial schema
-        // Would require dropping all tables which would lose all data
-        $this->db->query('SET FOREIGN_KEY_CHECKS = 0');
-        
-        foreach ($this->db->listTables() as $table) {
-            $this->db->query('DROP TABLE IF EXISTS `' . $table . '`');
-        }
-        
-        $this->db->query('SET FOREIGN_KEY_CHECKS = 1');
-    }
-}
--- a/app/Database/Migrations/20170502221506_sales_tax_data.php
+++ b/app/Database/Migrations/20170502221506_sales_tax_data.php
@@ -267,8 +267,6 @@ class Migration_Sales_Tax_Data extends Migration
     */
    public function round_number(int $rounding_mode, string $amount, int $decimals): float
    {
-        $amount = (float)$amount;
-
        if ($rounding_mode == Migration_Sales_Tax_Data::ROUND_UP) {
            $fig = pow(10, $decimals);
            $rounded_total = (ceil($fig * $amount) + ceil($fig * $amount - ceil($fig * $amount))) / $fig;
@@ -378,7 +376,7 @@ class Migration_Sales_Tax_Data extends Migration
        $decimals = totals_decimals();

        foreach ($sales_taxes as $row_number => $sales_tax) {
-            $sale_tax_amount = (float)$sales_tax['sale_tax_amount'];
+            $sale_tax_amount = $sales_tax['sale_tax_amount'];
            $rounding_code = $sales_tax['rounding_code'];
            $rounded_sale_tax_amount = $sale_tax_amount;

--- a/app/Database/Migrations/20191008100000_receipttaxindicator.php
+++ b/app/Database/Migrations/20191008100000_receipttaxindicator.php
@@ -21,6 +21,6 @@ class Migration_receipttaxindicator extends Migration
     */
    public function down(): void
    {
-        $this->db->query('DELETE FROM ' . $this->db->prefixTable('app_config') . ' WHERE `key` = \'receipt_show_tax_ind\'');
+        $this->db->query('DELETE FROM ' . $this->db->prefixTable('app_config') . ' WHERE key = \'receipt_show_tax_ind\'');
    }
 }
--- a/app/Database/Migrations/20200202000000_taxamount.php
+++ b/app/Database/Migrations/20200202000000_taxamount.php
@@ -243,8 +243,6 @@ class Migration_TaxAmount extends Migration
     */
    public function round_number(int $rounding_mode, string $amount, int $decimals): float    // TODO: is this currency safe?
    {   // TODO: This needs to be converted to a switch
-        $amount = (float)$amount;
-
        if ($rounding_mode == Migration_TaxAmount::ROUND_UP) {    // TODO: === ?
            $fig = pow(10, $decimals);
            $rounded_total = (ceil($fig * $amount) + ceil($fig * $amount - ceil($fig * $amount))) / $fig;
@@ -356,7 +354,7 @@ class Migration_TaxAmount extends Migration
        $decimals = totals_decimals();

        foreach ($sales_taxes as $row_number => $sales_tax) {
-            $sale_tax_amount = (float)$sales_tax['sale_tax_amount'];
+            $sale_tax_amount = $sales_tax['sale_tax_amount'];
            $rounding_code = $sales_tax['rounding_code'];
            $rounded_sale_tax_amount = $sale_tax_amount;

--- a/app/Database/Migrations/20210422000000_database_optimizations.php
+++ b/app/Database/Migrations/20210422000000_database_optimizations.php
@@ -20,7 +20,7 @@ class Migration_database_optimizations extends Migration

        $attribute = model(Attribute::class);

-        $attribute->deleteOrphanedValues();
+        $attribute->delete_orphaned_values();

        $this->migrate_duplicate_attribute_values(DECIMAL);
        $this->migrate_duplicate_attribute_values(DATE);
--- a/app/Database/Migrations/20250521000000_FixImageFilenameSpaces.php
+++ b/app/Database/Migrations/20250521000000_FixImageFilenameSpaces.php
@@ -1,65 +0,0 @@
-<?php
-
-namespace App\Database\Migrations;
-
-use CodeIgniter\Database\Migration;
-
-/**
- * Migration to sanitize existing image filenames by replacing spaces with underscores
- * This fixes issue #4372 where thumbnails failed to load for images with spaces in filenames
- */
-class FixImageFilenameSpaces extends Migration
-{
-    /**
-     * Perform a migration.
-     */
-    public function up(): void
-    {
-        $db = \Config\Database::connect();
-        $builder = $db->table('ospos_items');
-        
-        // Get all items with pic_filename containing spaces
-        $query = $builder->like('pic_filename', ' ', 'both')->get();
-        $items = $query->getResult();
-        
-        foreach ($items as $item) {
-            $old_filename = $item->pic_filename;
-            $ext = pathinfo($old_filename, PATHINFO_EXTENSION);
-            $base_name = pathinfo($old_filename, PATHINFO_FILENAME);
-            
-            // Sanitize the filename by replacing spaces and special characters
-            $sanitized_name = preg_replace('/[^a-zA-Z0-9_\-\.]/', '_', $base_name);
-            $new_filename = $sanitized_name . '.' . $ext;
-            
-            // Rename the file on the filesystem
-            $old_path = FCPATH . 'uploads/item_pics/' . $old_filename;
-            $new_path = FCPATH . 'uploads/item_pics/' . $new_filename;
-            
-            if (file_exists($old_path)) {
-                // Rename the original file
-                if (rename($old_path, $new_path)) {
-                    // Check if thumbnail exists and rename it too
-                    $old_thumb = FCPATH . 'uploads/item_pics/' . $base_name . '_thumb.' . $ext;
-                    $new_thumb = FCPATH . 'uploads/item_pics/' . $sanitized_name . '_thumb.' . $ext;
-                    if (file_exists($old_thumb)) {
-                        rename($old_thumb, $new_thumb);
-                    }
-                    
-                    // Update database record
-                    $builder->where('item_id', $item->item_id)
-                        ->update(['pic_filename' => $new_filename]);
-                }
-            }
-        }
-    }
-
-    /**
-     * Revert a migration.
-     * Note: This migration does not support rollback as the original filenames are lost
-     */
-    public function down(): void
-    {
-        // This migration cannot be safely reversed as the original filenames are lost
-        // after sanitization.
-    }
-}
--- a/app/Database/Migrations/20250729170000_NullableTaxCategoryId.php
+++ b/app/Database/Migrations/20250729170000_NullableTaxCategoryId.php
@@ -12,7 +12,7 @@ class Migration_NullableTaxCategoryId extends Migration
    public function up(): void
    {
        helper('migration');
-        execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.4.2_nullable_tax_category_id.sql');
+        execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.4.2_missing_config_keys.sql');
    }

    /**
--- a/app/Database/Migrations/20260506000000_AddShortcutKeys.php
+++ b/app/Database/Migrations/20260506000000_AddShortcutKeys.php
@@ -1,46 +0,0 @@
-<?php
-
-namespace App\Database\Migrations;
-
-use CodeIgniter\Database\Migration;
-
-class AddShortcutKeys extends Migration
-{
-    public function up(): void
-    {
-        $shortcutValues = [
-            ['key' => 'key_cancel', 'value' => '27 | ESC'],
-            ['key' => 'key_items', 'value' => '49 | ALT + 1'],
-            ['key' => 'key_customers', 'value' => '50 | ALT + 2'],
-            ['key' => 'key_suspend', 'value' => '51 | ALT + 3'],
-            ['key' => 'key_suspended', 'value' => '52 | ALT + 4'],
-            ['key' => 'key_amount', 'value' => '53 | ALT + 5'],
-            ['key' => 'key_payment', 'value' => '54 | ALT + 6'],
-            ['key' => 'key_complete', 'value' => '55 | ALT + 7'],
-            ['key' => 'key_finish', 'value' => '56 | ALT + 8'],
-            ['key' => 'key_help', 'value' => '57 | ALT + 9'],
-        ];
-
-        $this->db->table('app_config')->ignore(true)->insertBatch($shortcutValues);
-    }
-
-    public function down(): void
-    {
-        $shortcutKeys = [
-            'key_cancel',
-            'key_items',
-            'key_customers',
-            'key_suspend',
-            'key_suspended',
-            'key_amount',
-            'key_payment',
-            'key_complete',
-            'key_finish',
-            'key_help',
-        ];
-
-        $this->db->table('app_config')
-            ->whereIn('key', $shortcutKeys)
-            ->delete();
-    }
-}
--- a/app/Database/Seeds/TestDatabaseBootstrapSeeder.php
+++ b/app/Database/Seeds/TestDatabaseBootstrapSeeder.php
@@ -1,37 +0,0 @@
-<?php
-
-namespace App\Database\Seeds;
-
-use CodeIgniter\Database\Seeder;
-use Config\Database;
-
-class TestDatabaseBootstrapSeeder extends Seeder
-{
-    public function run(): void
-    {
-        if (ENVIRONMENT !== 'testing') {
-            throw new \RuntimeException('TestDatabaseBootstrapSeeder can only run in the testing environment.');
-        }
-
-        $config = config('Database');
-        $group  = $config->tests;
-        $dbName = $group['database'];
-
-        if ($dbName === '' || !str_contains(strtolower($dbName), 'test')) {
-            throw new \RuntimeException("Refusing to reset non-test database: {$dbName}");
-        }
-
-        $serverConn = Database::connect([
-            'hostname' => $group['hostname'],
-            'username' => $group['username'],
-            'password' => $group['password'],
-            'DBDriver' => $group['DBDriver'],
-            'database' => null,
-            'charset'  => $group['charset'] ?? 'utf8mb4',
-            'DBCollat' => $group['DBCollat'] ?? 'utf8mb4_general_ci',
-        ], false);
-
-        $serverConn->query("DROP DATABASE IF EXISTS `{$dbName}`");
-        $serverConn->query("CREATE DATABASE IF NOT EXISTS `{$dbName}`");
-    }
-}
--- a/app/Database/constraints.sql
+++ b/app/Database/constraints.sql
@@ -0,0 +1,145 @@
+--
+-- Constraints for dumped tables
+--
+
+--
+-- Constraints for table `ospos_customers`
+--
+ALTER TABLE `ospos_customers`
+    ADD CONSTRAINT `ospos_customers_ibfk_1` FOREIGN KEY (`person_id`) REFERENCES `ospos_people` (`person_id`);
+
+--
+-- Constraints for table `ospos_employees`
+--
+ALTER TABLE `ospos_employees`
+    ADD CONSTRAINT `ospos_employees_ibfk_1` FOREIGN KEY (`person_id`) REFERENCES `ospos_people` (`person_id`);
+
+--
+-- Constraints for table `ospos_inventory`
+--
+ALTER TABLE `ospos_inventory`
+    ADD CONSTRAINT `ospos_inventory_ibfk_1` FOREIGN KEY (`trans_items`) REFERENCES `ospos_items` (`item_id`),
+    ADD CONSTRAINT `ospos_inventory_ibfk_2` FOREIGN KEY (`trans_user`) REFERENCES `ospos_employees` (`person_id`),
+    ADD CONSTRAINT `ospos_inventory_ibfk_3` FOREIGN KEY (`trans_location`) REFERENCES `ospos_stock_locations` (`location_id`);
+
+--
+-- Constraints for table `ospos_items`
+--
+ALTER TABLE `ospos_items`
+    ADD CONSTRAINT `ospos_items_ibfk_1` FOREIGN KEY (`supplier_id`) REFERENCES `ospos_suppliers` (`person_id`);
+
+--
+-- Constraints for table `ospos_items_taxes`
+--
+ALTER TABLE `ospos_items_taxes`
+    ADD CONSTRAINT `ospos_items_taxes_ibfk_1` FOREIGN KEY (`item_id`) REFERENCES `ospos_items` (`item_id`) ON DELETE CASCADE;
+
+--
+-- Constraints for table `ospos_item_kit_items`
+--
+ALTER TABLE `ospos_item_kit_items`
+    ADD CONSTRAINT `ospos_item_kit_items_ibfk_1` FOREIGN KEY (`item_kit_id`) REFERENCES `ospos_item_kits` (`item_kit_id`) ON DELETE CASCADE,
+    ADD CONSTRAINT `ospos_item_kit_items_ibfk_2` FOREIGN KEY (`item_id`) REFERENCES `ospos_items` (`item_id`)  ON DELETE CASCADE;
+
+--
+-- Constraints for table `ospos_permissions`
+--
+ALTER TABLE `ospos_permissions`
+    ADD CONSTRAINT `ospos_permissions_ibfk_1` FOREIGN KEY (`module_id`) REFERENCES `ospos_modules` (`module_id`) ON DELETE CASCADE,
+    ADD CONSTRAINT `ospos_permissions_ibfk_2` FOREIGN KEY (`location_id`) REFERENCES `ospos_stock_locations` (`location_id`) ON DELETE CASCADE;
+
+--
+-- Constraints for table `ospos_grants`
+--
+ALTER TABLE `ospos_grants`
+    ADD CONSTRAINT `ospos_grants_ibfk_1` foreign key (`permission_id`) references `ospos_permissions` (`permission_id`) ON DELETE CASCADE,
+    ADD CONSTRAINT `ospos_grants_ibfk_2` foreign key (`person_id`) references `ospos_employees` (`person_id`) ON DELETE CASCADE;
+
+--
+-- Constraints for table `ospos_receivings`
+--
+ALTER TABLE `ospos_receivings`
+    ADD CONSTRAINT `ospos_receivings_ibfk_1` FOREIGN KEY (`employee_id`) REFERENCES `ospos_employees` (`person_id`),
+    ADD CONSTRAINT `ospos_receivings_ibfk_2` FOREIGN KEY (`supplier_id`) REFERENCES `ospos_suppliers` (`person_id`);
+
+--
+-- Constraints for table `ospos_receivings_items`
+--
+ALTER TABLE `ospos_receivings_items`
+    ADD CONSTRAINT `ospos_receivings_items_ibfk_1` FOREIGN KEY (`item_id`) REFERENCES `ospos_items` (`item_id`),
+    ADD CONSTRAINT `ospos_receivings_items_ibfk_2` FOREIGN KEY (`receiving_id`) REFERENCES `ospos_receivings` (`receiving_id`);
+
+--
+-- Constraints for table `ospos_sales`
+--
+ALTER TABLE `ospos_sales`
+    ADD CONSTRAINT `ospos_sales_ibfk_1` FOREIGN KEY (`employee_id`) REFERENCES `ospos_employees` (`person_id`),
+    ADD CONSTRAINT `ospos_sales_ibfk_2` FOREIGN KEY (`customer_id`) REFERENCES `ospos_customers` (`person_id`);
+
+--
+-- Constraints for table `ospos_sales_items`
+--
+ALTER TABLE `ospos_sales_items`
+    ADD CONSTRAINT `ospos_sales_items_ibfk_1` FOREIGN KEY (`item_id`) REFERENCES `ospos_items` (`item_id`),
+    ADD CONSTRAINT `ospos_sales_items_ibfk_2` FOREIGN KEY (`sale_id`) REFERENCES `ospos_sales` (`sale_id`),
+    ADD CONSTRAINT `ospos_sales_items_ibfk_3` FOREIGN KEY (`item_location`) REFERENCES `ospos_stock_locations` (`location_id`);
+
+--
+-- Constraints for table `ospos_sales_items_taxes`
+--
+ALTER TABLE `ospos_sales_items_taxes`
+    ADD CONSTRAINT `ospos_sales_items_taxes_ibfk_1` FOREIGN KEY (`sale_id`,`item_id`,`line`) REFERENCES `ospos_sales_items` (`sale_id`,`item_id`,`line`),
+    ADD CONSTRAINT `ospos_sales_items_taxes_ibfk_2` FOREIGN KEY (`item_id`) REFERENCES `ospos_items` (`item_id`);
+
+--
+-- Constraints for table `ospos_sales_payments`
+--
+ALTER TABLE `ospos_sales_payments`
+    ADD CONSTRAINT `ospos_sales_payments_ibfk_1` FOREIGN KEY (`sale_id`) REFERENCES `ospos_sales` (`sale_id`);
+
+--
+-- Constraints for table `ospos_sales_suspended`
+--
+ALTER TABLE `ospos_sales_suspended`
+    ADD CONSTRAINT `ospos_sales_suspended_ibfk_1` FOREIGN KEY (`employee_id`) REFERENCES `ospos_employees` (`person_id`),
+    ADD CONSTRAINT `ospos_sales_suspended_ibfk_2` FOREIGN KEY (`customer_id`) REFERENCES `ospos_customers` (`person_id`);
+
+--
+-- Constraints for table `ospos_sales_suspended_items`
+--
+ALTER TABLE `ospos_sales_suspended_items`
+    ADD CONSTRAINT `ospos_sales_suspended_items_ibfk_1` FOREIGN KEY (`item_id`) REFERENCES `ospos_items` (`item_id`),
+    ADD CONSTRAINT `ospos_sales_suspended_items_ibfk_2` FOREIGN KEY (`sale_id`) REFERENCES `ospos_sales_suspended` (`sale_id`),
+    ADD CONSTRAINT `ospos_sales_suspended_items_ibfk_3` FOREIGN KEY (`item_location`) REFERENCES `ospos_stock_locations` (`location_id`);
+
+--
+-- Constraints for table `ospos_sales_suspended_items_taxes`
+--
+ALTER TABLE `ospos_sales_suspended_items_taxes`
+    ADD CONSTRAINT `ospos_sales_suspended_items_taxes_ibfk_1` FOREIGN KEY (`sale_id`,`item_id`,`line`) REFERENCES `ospos_sales_suspended_items` (`sale_id`,`item_id`,`line`),
+    ADD CONSTRAINT `ospos_sales_suspended_items_taxes_ibfk_2` FOREIGN KEY (`item_id`) REFERENCES `ospos_items` (`item_id`);
+
+--
+-- Constraints for table `ospos_sales_suspended_payments`
+--
+ALTER TABLE `ospos_sales_suspended_payments`
+    ADD CONSTRAINT `ospos_sales_suspended_payments_ibfk_1` FOREIGN KEY (`sale_id`) REFERENCES `ospos_sales_suspended` (`sale_id`);
+
+--
+-- Constraints for table `ospos_item_quantities`
+--
+ALTER TABLE `ospos_item_quantities`
+    ADD CONSTRAINT `ospos_item_quantities_ibfk_1` FOREIGN KEY (`item_id`) REFERENCES `ospos_items` (`item_id`),
+    ADD CONSTRAINT `ospos_item_quantities_ibfk_2` FOREIGN KEY (`location_id`) REFERENCES `ospos_stock_locations` (`location_id`);
+
+--
+-- Constraints for table `ospos_suppliers`
+--
+ALTER TABLE `ospos_suppliers`
+    ADD CONSTRAINT `ospos_suppliers_ibfk_1` FOREIGN KEY (`person_id`) REFERENCES `ospos_people` (`person_id`);
+
+--
+-- Constraints for table `ospos_giftcards`
+--
+ALTER TABLE `ospos_giftcards`
+    ADD CONSTRAINT `ospos_giftcards_ibfk_1` FOREIGN KEY (`person_id`) REFERENCES `ospos_people` (`person_id`);
--- a/app/Database/docker_mysql.cnf
+++ b/app/Database/docker_mysql.cnf
@@ -1,5 +1,5 @@
 [mysqld]
-sql_mode = "STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION"
+sql_mode = "STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION"

 key_buffer        = 16M
 max_allowed_packet = 1M
--- a/app/Database/Migrations/sqlscripts/initial_schema.sql
+++ b/app/Database/Migrations/sqlscripts/initial_schema.sql
@@ -730,148 +730,3 @@ CREATE TABLE `ospos_suppliers` (
 --
 -- Dumping data for table `ospos_suppliers`
 --
--
-- Constraints for dumped tables
--
-
--
-- Constraints for table `ospos_customers`
--
-ALTER TABLE `ospos_customers`
-    ADD CONSTRAINT `ospos_customers_ibfk_1` FOREIGN KEY (`person_id`) REFERENCES `ospos_people` (`person_id`);
-
--
-- Constraints for table `ospos_employees`
--
-ALTER TABLE `ospos_employees`
-    ADD CONSTRAINT `ospos_employees_ibfk_1` FOREIGN KEY (`person_id`) REFERENCES `ospos_people` (`person_id`);
-
--
-- Constraints for table `ospos_inventory`
--
-ALTER TABLE `ospos_inventory`
-    ADD CONSTRAINT `ospos_inventory_ibfk_1` FOREIGN KEY (`trans_items`) REFERENCES `ospos_items` (`item_id`),
-    ADD CONSTRAINT `ospos_inventory_ibfk_2` FOREIGN KEY (`trans_user`) REFERENCES `ospos_employees` (`person_id`),
-    ADD CONSTRAINT `ospos_inventory_ibfk_3` FOREIGN KEY (`trans_location`) REFERENCES `ospos_stock_locations` (`location_id`);
-
--
-- Constraints for table `ospos_items`
--
-ALTER TABLE `ospos_items`
-    ADD CONSTRAINT `ospos_items_ibfk_1` FOREIGN KEY (`supplier_id`) REFERENCES `ospos_suppliers` (`person_id`);
-
--
-- Constraints for table `ospos_items_taxes`
--
-ALTER TABLE `ospos_items_taxes`
-    ADD CONSTRAINT `ospos_items_taxes_ibfk_1` FOREIGN KEY (`item_id`) REFERENCES `ospos_items` (`item_id`) ON DELETE CASCADE;
-
--
-- Constraints for table `ospos_item_kit_items`
--
-ALTER TABLE `ospos_item_kit_items`
-    ADD CONSTRAINT `ospos_item_kit_items_ibfk_1` FOREIGN KEY (`item_kit_id`) REFERENCES `ospos_item_kits` (`item_kit_id`) ON DELETE CASCADE,
-    ADD CONSTRAINT `ospos_item_kit_items_ibfk_2` FOREIGN KEY (`item_id`) REFERENCES `ospos_items` (`item_id`)  ON DELETE CASCADE;
-
--
-- Constraints for table `ospos_permissions`
--
-ALTER TABLE `ospos_permissions`
-    ADD CONSTRAINT `ospos_permissions_ibfk_1` FOREIGN KEY (`module_id`) REFERENCES `ospos_modules` (`module_id`) ON DELETE CASCADE,
-    ADD CONSTRAINT `ospos_permissions_ibfk_2` FOREIGN KEY (`location_id`) REFERENCES `ospos_stock_locations` (`location_id`) ON DELETE CASCADE;
-
--
-- Constraints for table `ospos_grants`
--
-ALTER TABLE `ospos_grants`
-    ADD CONSTRAINT `ospos_grants_ibfk_1` foreign key (`permission_id`) references `ospos_permissions` (`permission_id`) ON DELETE CASCADE,
-    ADD CONSTRAINT `ospos_grants_ibfk_2` foreign key (`person_id`) references `ospos_employees` (`person_id`) ON DELETE CASCADE;
-
--
-- Constraints for table `ospos_receivings`
--
-ALTER TABLE `ospos_receivings`
-    ADD CONSTRAINT `ospos_receivings_ibfk_1` FOREIGN KEY (`employee_id`) REFERENCES `ospos_employees` (`person_id`),
-    ADD CONSTRAINT `ospos_receivings_ibfk_2` FOREIGN KEY (`supplier_id`) REFERENCES `ospos_suppliers` (`person_id`);
-
--
-- Constraints for table `ospos_receivings_items`
--
-ALTER TABLE `ospos_receivings_items`
-    ADD CONSTRAINT `ospos_receivings_items_ibfk_1` FOREIGN KEY (`item_id`) REFERENCES `ospos_items` (`item_id`),
-    ADD CONSTRAINT `ospos_receivings_items_ibfk_2` FOREIGN KEY (`receiving_id`) REFERENCES `ospos_receivings` (`receiving_id`);
-
--
-- Constraints for table `ospos_sales`
--
-ALTER TABLE `ospos_sales`
-    ADD CONSTRAINT `ospos_sales_ibfk_1` FOREIGN KEY (`employee_id`) REFERENCES `ospos_employees` (`person_id`),
-    ADD CONSTRAINT `ospos_sales_ibfk_2` FOREIGN KEY (`customer_id`) REFERENCES `ospos_customers` (`person_id`);
-
--
-- Constraints for table `ospos_sales_items`
--
-ALTER TABLE `ospos_sales_items`
-    ADD CONSTRAINT `ospos_sales_items_ibfk_1` FOREIGN KEY (`item_id`) REFERENCES `ospos_items` (`item_id`),
-    ADD CONSTRAINT `ospos_sales_items_ibfk_2` FOREIGN KEY (`sale_id`) REFERENCES `ospos_sales` (`sale_id`),
-    ADD CONSTRAINT `ospos_sales_items_ibfk_3` FOREIGN KEY (`item_location`) REFERENCES `ospos_stock_locations` (`location_id`);
-
--
-- Constraints for table `ospos_sales_items_taxes`
--
-ALTER TABLE `ospos_sales_items_taxes`
-    ADD CONSTRAINT `ospos_sales_items_taxes_ibfk_1` FOREIGN KEY (`sale_id`,`item_id`,`line`) REFERENCES `ospos_sales_items` (`sale_id`,`item_id`,`line`),
-    ADD CONSTRAINT `ospos_sales_items_taxes_ibfk_2` FOREIGN KEY (`item_id`) REFERENCES `ospos_items` (`item_id`);
-
--
-- Constraints for table `ospos_sales_payments`
--
-ALTER TABLE `ospos_sales_payments`
-    ADD CONSTRAINT `ospos_sales_payments_ibfk_1` FOREIGN KEY (`sale_id`) REFERENCES `ospos_sales` (`sale_id`);
-
--
-- Constraints for table `ospos_sales_suspended`
--
-ALTER TABLE `ospos_sales_suspended`
-    ADD CONSTRAINT `ospos_sales_suspended_ibfk_1` FOREIGN KEY (`employee_id`) REFERENCES `ospos_employees` (`person_id`),
-    ADD CONSTRAINT `ospos_sales_suspended_ibfk_2` FOREIGN KEY (`customer_id`) REFERENCES `ospos_customers` (`person_id`);
-
--
-- Constraints for table `ospos_sales_suspended_items`
--
-ALTER TABLE `ospos_sales_suspended_items`
-    ADD CONSTRAINT `ospos_sales_suspended_items_ibfk_1` FOREIGN KEY (`item_id`) REFERENCES `ospos_items` (`item_id`),
-    ADD CONSTRAINT `ospos_sales_suspended_items_ibfk_2` FOREIGN KEY (`sale_id`) REFERENCES `ospos_sales_suspended` (`sale_id`),
-    ADD CONSTRAINT `ospos_sales_suspended_items_ibfk_3` FOREIGN KEY (`item_location`) REFERENCES `ospos_stock_locations` (`location_id`);
-
--
-- Constraints for table `ospos_sales_suspended_items_taxes`
--
-ALTER TABLE `ospos_sales_suspended_items_taxes`
-    ADD CONSTRAINT `ospos_sales_suspended_items_taxes_ibfk_1` FOREIGN KEY (`sale_id`,`item_id`,`line`) REFERENCES `ospos_sales_suspended_items` (`sale_id`,`item_id`,`line`),
-    ADD CONSTRAINT `ospos_sales_suspended_items_taxes_ibfk_2` FOREIGN KEY (`item_id`) REFERENCES `ospos_items` (`item_id`);
-
--
-- Constraints for table `ospos_sales_suspended_payments`
--
-ALTER TABLE `ospos_sales_suspended_payments`
-    ADD CONSTRAINT `ospos_sales_suspended_payments_ibfk_1` FOREIGN KEY (`sale_id`) REFERENCES `ospos_sales_suspended` (`sale_id`);
-
--
-- Constraints for table `ospos_item_quantities`
--
-ALTER TABLE `ospos_item_quantities`
-    ADD CONSTRAINT `ospos_item_quantities_ibfk_1` FOREIGN KEY (`item_id`) REFERENCES `ospos_items` (`item_id`),
-    ADD CONSTRAINT `ospos_item_quantities_ibfk_2` FOREIGN KEY (`location_id`) REFERENCES `ospos_stock_locations` (`location_id`);
-
--
-- Constraints for table `ospos_suppliers`
--
-ALTER TABLE `ospos_suppliers`
-    ADD CONSTRAINT `ospos_suppliers_ibfk_1` FOREIGN KEY (`person_id`) REFERENCES `ospos_people` (`person_id`);
-
--
-- Constraints for table `ospos_giftcards`
--
-ALTER TABLE `ospos_giftcards`
-    ADD CONSTRAINT `ospos_giftcards_ibfk_1` FOREIGN KEY (`person_id`) REFERENCES `ospos_people` (`person_id`);
--- a/app/Events/Db_log.php
+++ b/app/Events/Db_log.php
@@ -36,26 +36,21 @@ class Db_log
    private function generate_message(): string
    {
        $db = Database::connect();
-        $lastQuery = $db->getLastQuery();
-
-        if ($lastQuery === null) {
-            return '';
-        }
-
-        $affectedRows = $db->affectedRows();
-        $executionTime = $this->convert_time($lastQuery->getDuration());
+        $last_query = $db->getLastQuery();
+        $affected_rows = $db->affectedRows();
+        $execution_time = $this->convert_time($last_query->getDuration());

        $message = '*** Query: ' . date('Y-m-d H:i:s T') . ' *******************'
-            . "\n" . $lastQuery->getQuery()
-            . "\n Affected rows: $affectedRows"
-            . "\n Execution Time: " . $executionTime['time'] . ' ' . $executionTime['unit'];
+            . "\n" . $last_query->getQuery()
+            . "\n Affected rows: $affected_rows"
+            . "\n Execution Time: " . $execution_time['time'] . ' ' . $execution_time['unit'];

-        $longQuery = ($executionTime['unit'] === 's') && ($executionTime['time'] > 0.5);
-        if ($longQuery) {
+        $long_query = ($execution_time['unit'] === 's') && ($execution_time['time'] > 0.5);
+        if ($long_query) {
            $message .= ' [LONG RUNNING QUERY]';
        }

-        return $this->config->db_log_only_long && !$longQuery ? '' : $message;
+        return $this->config->db_log_only_long && !$long_query ? '' : $message;
    }

    /**
--- a/app/Events/Load_config.php
+++ b/app/Events/Load_config.php
@@ -4,8 +4,6 @@ namespace App\Events;

 use App\Libraries\MY_Migration;
 use App\Models\Appconfig;
-use CodeIgniter\Session\Handlers\DatabaseHandler;
-use CodeIgniter\Session\Handlers\FileHandler;
 use CodeIgniter\Session\Session;
 use Config\OSPOS;
 use Config\Services;
@@ -21,47 +19,38 @@ class Load_config
 {
    public Session $session;

+    /**
+     * Loads configuration from database into App CI config and then applies those settings
+     */
    public function load_config(): void
    {
+        // Migrations
        $migration_config = config('Migrations');
        $migration = new MY_Migration($migration_config);

        $this->session = session();

+        // Database Configuration
        $config = config(OSPOS::class);

        if (!$migration->is_latest()) {
            $this->session->destroy();
        }

-        $this->setDefaultLanguage($config);
+        // Language
+        $language_exists = file_exists('../app/Language/' . current_language_code());
+
+        if (current_language_code() == null || current_language() == null || !$language_exists) {    // TODO: current_language() is undefined
+            $config->settings['language'] = 'english';
+            $config->settings['language_code'] = 'en';
+        }

        $language = Services::language();
-        $language->setLocale(current_language_code());
+        $language->setLocale($config->settings['language_code']);

+        // Time Zone
        date_default_timezone_set($config->settings['timezone'] ?? ini_get('date.timezone'));

        bcscale(max(2, totals_decimals() + tax_decimals()));
    }
-
-    private function setDefaultLanguage(OSPOS $config): void
-    {
-        $languageCode = $config->settings['language_code'] ?? null;
-
-        if (empty($config->settings) || $languageCode === null) {
-            $config->settings['language'] = 'english';
-            $config->settings['language_code'] = 'en';
-            return;
-        }
-
-        if (!$this->languageExists($languageCode)) {
-            $config->settings['language'] = 'english';
-            $config->settings['language_code'] = 'en';
-        }
-    }
-
-    private function languageExists(string $languageCode): bool
-    {
-        return file_exists(APPPATH . 'Language/' . $languageCode);
-    }
 }
--- a/app/Helpers/attribute_helper.php
+++ b/app/Helpers/attribute_helper.php
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * Translates the attribute type to the corresponding database column name.
- *
- * Maps attribute type constants to their corresponding attribute_values table columns.
- * Defaults to 'attribute_value' for TEXT, DROPDOWN and CHECKBOX attribute types.
- *
- * @param string $input The attribute type constant (DATE, DECIMAL, etc.)
- * @return string The database column name for storing this attribute type
- */
-function getAttributeDataType(string $input): string
-{
-    $columnMap = [
-        DATE => 'attribute_date',
-        DECIMAL => 'attribute_decimal',
-    ];
-
-    return $columnMap[$input] ?? 'attribute_value';
-}
-
-/**
- * Validates that the provided data type is an allowed attribute value type.
- *
- * @param string $dataType
- * @return void
- */
-function validateAttributeValueType(string $dataType): void
-{
-    $attributeValueTypes = ['attribute_value', 'attribute_decimal', 'attribute_date'];
-
-    if (!in_array($dataType, $attributeValueTypes, true)) {
-        throw new InvalidArgumentException('Invalid data type');
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ollama	d71b69f6d8	Fix review issues: CSS syntax, accessibility, colspan values, and avatar toggle state persistence - Fixed invalid CSS syntax (padding:10px; !important -> padding:10px;) - Added type="button" to avatar toggle buttons to prevent form submission - Fixed colspan values for avatar column in receivings/receiving.php and receivings/receipt.php - Added summary_colspan for tax indicator in sales/receipt_default.php - Changed avatar toggle from <a><div> to proper <button> elements - Fixed persisted avatar state to also hide header columns - Fixed column widths to total 100% in sales/register.php - Fixed no-items-in-cart colspan from 8 to 9 in sales/register.php - Unified localStorage key to 'avatarColumnVisible' across all views	2026-03-17 15:42:17 +00:00
Ollama	46185a6d44	Address review feedback: use ternary, camelCase, remove test file - Use ternary notation for $images assignment in getPicThumb - Refactor local variables to camelCase for PSR-12 compliance - Remove test_avatar_toggle.html from repository	2026-03-12 19:44:38 +00:00
Ollama	50fd9d5da0	Fix indentation in serveImage and getPicThumb methods	2026-03-08 22:03:34 +00:00
jekkos	22e3548fea	Fix issues in PR #4305 : Add missing toggle buttons, fix colspan bug, cleanup - Remove empty migration file (no actual migration code) - Add avatar toggle button to sales/register.php view - Add avatar toggle button to receivings/receiving.php view - Fix colspan bug (9 -> 10) when cart is empty - Fix code formatting issues in JavaScript - Add toggle button text update (Show/Hide Avatar) - Add toggle functionality in receivings/receiving.php	2026-03-05 12:50:09 +00:00
Sahand-Jaza	fe6601b351	Refactor database credentials and enhance image handling in item management Add avatar toggle functionality to receipt views and styles Fix receipt alignment issue when avatar column is visible - Fixed black line alignment problem where total columns extended beyond borders - Added dynamic colspan calculation to handle avatar column visibility - Updated all colspan values from hardcoded '3' to dynamic '' - Ensured proper alignment regardless of avatar column show/hide state - Standardized border styling from '#000000' to 'black' for consistency style: Adjust receipt layout and spacing for improved readability Update avatar toggle test functionality	2025-11-24 22:57:24 +01:00