Fix technical issues from PR review

Image_lib.php fixes:
- Remove incorrect 'GPS' => PelTag::GPS_OFFSET mapping (GPS handled separately)
- Fix PNG transparency: change imagealphablending to false
- Add animated GIF detection: skip processing for animations
- Add logging in stripExifFallback to show which APP markers are removed

Migration optimization:
- Use get()->getRow() instead of countAllResults() for lighter query
- More efficient existence check before insert

All changes address CodeRabbit technical review comments while maintaining
the simplified multiselect-only UI (no toggle needed).

.env.example

@@ -16,9 +16,6 @@ CI_ENVIRONMENT = production
 # 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'
 #

.github/ISSUE_TEMPLATE/bug report.yml

@@ -12,11 +12,11 @@ body:
     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.
 
   # ─────────────────────────────────────────────────────────────────────────────
@@ -28,7 +28,7 @@ body:
       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
+        Example: When I try to print a receipt, the application crashes 
         with an error message saying "Unable to connect to printer".
     validations:
       required: true
@@ -86,7 +86,8 @@ body:
         - PHP 8.2
         - PHP 8.1
         - PHP 7.4
-        - Other
+        - PHP 7.3
+        - PHP 7.2
       default: 0
     validations:
       required: true
@@ -140,7 +141,7 @@ body:
       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...
@@ -154,7 +155,7 @@ body:
       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/`
@@ -184,4 +185,4 @@ body:
         - 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
+          required: true

.github/workflows/build-release.yml

@@ -123,7 +123,6 @@ jobs:
             .
             !.git
             !node_modules
-          include-hidden-files: true
           retention-days: 1
 
   docker:
@@ -156,7 +155,7 @@ jobs:
         run: |
           BRANCH=$(echo "${GITHUB_REF#refs/heads/}" | tr '/' '_')
           if [ "$BRANCH" = "master" ]; then
-            echo "tags=${{ secrets.DOCKER_USERNAME }}/opensourcepos:${{ needs.build.outputs.version-tag }},${{ secrets.DOCKER_USERNAME }}/opensourcepos:master" >> $GITHUB_OUTPUT
+            echo "tags=${{ secrets.DOCKER_USERNAME }}/opensourcepos:${{ needs.build.outputs.version-tag }},${{ secrets.DOCKER_USERNAME }}/opensourcepos:latest" >> $GITHUB_OUTPUT
           else
             echo "tags=${{ secrets.DOCKER_USERNAME }}/opensourcepos:${{ needs.build.outputs.version-tag }}" >> $GITHUB_OUTPUT
           fi

.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

.github/workflows/deploy-pr.yml

@@ -1,79 +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
-        env:
-          PR_NUMBER: ${{ github.event.pull_request.number }}
-          PR_SHA: ${{ github.event.pull_request.head.sha }}
-        run: |
-          IMAGE_TAG="pr-${PR_NUMBER}-${PR_SHA:0:7}"
-          echo "tag=$IMAGE_TAG" >> "$GITHUB_OUTPUT"
-
-  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"

.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

.github/workflows/main.yml

@@ -28,6 +28,7 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
+          - '8.1'
           - '8.2'
           - '8.3'
           - '8.4'

.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:

.github/workflows/phpunit.yml

@@ -34,6 +34,7 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
+          - '8.1'
           - '8.2'
           - '8.3'
           - '8.4'
@@ -118,4 +119,4 @@ jobs:
 
       - name: Stop MariaDB
         if: always()
-        run: docker stop mysql && docker rm mysql
+        run: docker stop mysql && docker rm mysql

.gitignore

@@ -87,5 +87,3 @@ auth.json
 /app/Database/database.sql
 /writable/cache/settings
 /.env.bak
-/.php-cs-fixer.cache
-/build

AGENTS.md

@@ -1,125 +1,40 @@
 # Agent Instructions
 
-This document is the single source of truth for all AI agents working on the Open Source Point of Sale (OSPOS) codebase. Read it fully before making any changes.
-
-## Project Overview
-
-OpenSourcePOS is a web-based Point of Sale system built on **CodeIgniter 4** (PHP 8.2+) with MySQL/MariaDB. Frontend uses Bootstrap 3 (Bootstrap 5 migration in progress) and jQuery, with assets built via Gulp.
-
-## Common Commands
-
-```bash
-# PHP dependencies
-composer install
-
-# Frontend dependencies and asset build
-npm install
-npm run build          # Runs Gulp: compiles and copies all CSS/JS to public/resources/
-
-# Run full test suite
-composer test
-
-# Run a single test file
-vendor/bin/phpunit tests/unit/AppTest.php
-
-# Lint / code style check
-vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.no-header.php --dry-run
-
-# Apply code style fixes
-vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.no-header.php
-```
-
-Tests require a MariaDB/MySQL database (see CI config in `.github/workflows/phpunit.yml`).
-
-## Architecture
-
-### Framework & Entry Point
-
-- **Framework**: CodeIgniter 4 — MVC with QueryBuilder ORM, no Eloquent
-- **Web root**: `public/` — `public/index.php` is the only entry point
-- **Routes**: `app/Config/Routes.php`
-- **App config**: `app/Config/App.php` (version, session, security settings)
-- **Environment**: `.env` file (copy from `.env.example`); `CI_ENVIRONMENT` controls dev/prod/test mode
-
-### Directory Layout
-
-```text
-app/
-├── Config/         # CI4 config classes
-├── Controllers/    # ~27 controllers (Sales, Items, Reports, Customers, etc.)
-├── Models/         # ~28 models (Sale, Item, Customer, Supplier, etc.)
-├── Views/          # PHP view templates
-├── Libraries/      # Business logic (Sale_lib, Tax_lib, Receiving_lib, etc.)
-├── Plugins/        # Plugin system — each plugin is a subdirectory here
-├── Database/       # Migrations (ospos_ prefix) and seeds
-├── Language/       # i18n files (IETF BCP 47 locale names)
-├── Filters/        # Request/response filters (auth, HTTPS, etc.)
-└── Events/         # CI4 event subscribers
-public/
-└── resources/      # Built CSS/JS (do not edit directly — generated by npm run build)
-tests/              # PHPUnit test suite
-```
-
-### Key Libraries
-
-`app/Libraries/` holds core business logic:
-- `Sale_lib.php` — sale cart state, pricing, discounts, tax calculation
-- `Tax_lib.php` — multi-tier tax engine
-- `Receiving_lib.php` — purchase orders / receivings
-- `Barcode_lib.php` — barcode generation
-- `Email_lib.php` — email delivery
-- `Token_lib.php` — CSRF/session token management
-
-### Database
-
-- Table prefix: `ospos_` (defined in `app/Config/Database.php`)
-- Migrations live in `app/Database/Migrations/` and run automatically on first access
-- CodeIgniter QueryBuilder throughout — no raw SQL unless necessary
-
-### Plugin System
-
-Plugins live in `app/Plugins/<PluginName>/` and are auto-discovered by `PluginManager`. Each plugin:
-- Extends `BasePlugin` or implements `PluginInterface`
-- Registers event hooks (e.g., `item_sale`, `customer_saved`, view hooks like `customer_tabs`)
-- Can include its own `Views/`, `Models/`, `Controllers/`, and `Language/` subdirectories
-- Configuration stored in `ospos_plugin_config` table
-- See `app/Plugins/README.md` for plugin structure, event hooks, and LICENSE requirements
-
-### Frontend Build
-
-`gulpfile.js` (Gulp 5) copies vendor CSS/JS from `node_modules/` into `public/resources/`. Run `npm run build` after installing npm packages or changing gulp tasks. Do not manually edit files under `public/resources/`.
+This document provides guidance for AI agents working on the Open Source Point of Sale (OSPOS) codebase.
 
 ## Code Style
 
-- **PSR-12** enforced via PHP-CS-Fixer (config: `.php-cs-fixer.no-header.php`)
-- `camelCase` for variables and methods; `PascalCase` for classes; `UPPER_CASE` for constants
-- PHP 8.2+ features acceptable (named arguments, enums, readonly properties)
-- Views in `app/Views/errors/html/` are excluded from the fixer
-- Run fixer before committing: `vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.no-header.php`
+- 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 Workflow
+## 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
-- Tests must pass before submitting changes (`composer test`)
-- Minimum PHPUnit version: 10.5.16+. Default config: `phpunit.xml.dist`
+
+## 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 → `app/Controllers/`
-- Models → `app/Models/`
-- Views → `app/Views/`
-- Migrations → `app/Database/Migrations/`
-- Plugins → `app/Plugins/` (see `app/Plugins/README.md` for plugin structure, event hooks, and LICENSE requirements)
+- 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
 
-- `app.allowedHostnames` **must** be set in production (host header injection protection)
-- HTMLPurifier for HTML sanitization; Laminas Escaper for output escaping
-- CSRF tokens managed via `Token_lib` — do not bypass CI4's CSRF filter
-- Session storage is database-backed (`ospos_sessions` table) for multi-instance support
 - Never commit secrets, credentials, or `.env` files
 - Use parameterized queries to prevent SQL injection
-- Validate and sanitize all user input
+- Validate and sanitize all user input

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

CLAUDE.md

@@ -1,3 +0,0 @@
-# CLAUDE.md
-
-> **MANDATORY INSTRUCTION**: You MUST read `AGENTS.md` in this directory before doing anything else. `AGENTS.md` is the single source of truth for this project — architecture, commands, conventions, security rules, and workflow are all defined there. Do not proceed with any task until you have read and internalized its contents.

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

Dockerfile

@@ -13,8 +13,7 @@ RUN echo "date.timezone = \"\${PHP_TIMEZONE}\"" > /usr/local/etc/php/conf.d/time
 
 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 \
+RUN chmod 770 /app/writable/uploads /app/writable/logs /app/writable/cache \
     && ln -s /app/*[^public] /var/www \
     && rm -rf /var/www/html \
     && ln -nsf /app/public /var/www/html

INSTALL.md

@@ -1,6 +1,6 @@
 ## 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)>).

README.md

@@ -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.

SECURITY.md

@@ -5,9 +5,8 @@
   - [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
 
@@ -22,116 +21,26 @@ We release patches for security vulnerabilities.
 
 ## 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).
+The following security vulnerabilities have been published:
+
+### High Severity
+
+| CVE | Vulnerability | CVSS | Published | Fixed In | Credit |
+|-----|--------------|------|-----------|----------|--------|
+| [CVE-2025-68434](https://github.com/opensourcepos/opensourcepos/security/advisories/GHSA-wjm4-hfwg-5w5r) | CSRF leading to Admin Creation | 8.8 | 2025-12-17 | 3.4.2 | @Nixon-H, @jekkos |
+| [CVE-2025-68147](https://github.com/opensourcepos/opensourcepos/security/advisories/GHSA-xgr7-7pvw-fpmh) | Stored XSS in Return Policy | 8.1 | 2025-12-17 | 3.4.2 | @Nixon-H, @jekkos |
+| [CVE-2025-66924](https://github.com/opensourcepos/opensourcepos/security/advisories/GHSA-gv8j-f6gq-g59m) | Stored XSS in Item Kits | 7.2 | 2026-03-04 | 3.4.2 | @hungnqdz, @omkaryepre |
+
+### Medium Severity
+
+| CVE | Vulnerability | CVSS | Published | Fixed In | Credit |
+|-----|--------------|------|-----------|----------|--------|
+| [CVE-2025-68658](https://github.com/opensourcepos/opensourcepos/security/advisories/GHSA-32r8-8r9r-9chw) | Stored XSS in Company Name | 4.3 | 2026-01-13 | 3.4.2 | @hungnqdz |
+
+For a complete list including draft advisories, see our [GitHub Security Advisories page](https://github.com/opensourcepos/opensourcepos/security/advisories).
 
 ## Reporting a Vulnerability
 
-**Option 1: GitHub Security Advisory (Preferred)**
+Please report (suspected) security vulnerabilities to **[jeroen@steganos.dev](mailto:jeroen@steganos.dev)**. 
 
-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).
+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.

app/Config/App.php

@@ -55,13 +55,21 @@ class App extends BaseConfig
     public string $baseURL;    // Defined in the constructor
 
     /**
-     * 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
+     * Allowed Hostnames for the Site URL.
      * 
-     *     ['media.example.com', 'accounts.example.com']
+     * Security: This is used to validate the HTTP Host header to prevent
+     * Host Header Injection attacks. If the Host header doesn't match
+     * an entry in this list, the request will use the first allowed hostname.
+     * 
+     * IMPORTANT: This MUST be configured for production deployments.
+     * If empty in production, the application will fail to start.
+     * In development, it will fall back to 'localhost' with a warning.
+     * 
+     * Configure via .env file (comma-separated list):
+     *   app.allowedHostnames = 'example.com,www.example.com'
+     * 
+     * For local development:
+     *   app.allowedHostnames = 'localhost'
      *
      * @var list<string>
      */
@@ -117,7 +125,7 @@ class App extends BaseConfig
     | DO NOT CHANGE THIS UNLESS YOU FULLY UNDERSTAND THE REPERCUSSIONS!!
     |
     */
-    public string $permittedURIChars = 'a-z 0-9~%.:_\-';
+    public string $permittedURIChars = 'a-z 0-9~%.:_\-=';
 
     /**
      * --------------------------------------------------------------------------
@@ -278,28 +286,24 @@ 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');
-        }
+        $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 . '/';
@@ -308,39 +312,39 @@ class App extends BaseConfig
 
     /**
      * 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 =
+            $errorMessage = 
                 'Security: allowedHostnames is not configured. ' .
                 'Host header injection protection is disabled. ' .
-                'Set app.allowedHostnames in your .env file or ALLOWED_HOSTNAMES environment variable. ' .
+                'Set app.allowedHostnames in your .env file. ' .
                 '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';
         }
@@ -350,7 +354,7 @@ class App extends BaseConfig
         }
 
         // Host not in whitelist - use first configured hostname as fallback
-        log_message('warning',
+        log_message('warning', 
             'Security: Rejected HTTP_HOST "' . $httpHost . '" - not in allowedHostnames whitelist. ' .
             'Using fallback: ' . $this->allowedHostnames[0]
         );

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
 {
@@ -78,7 +80,6 @@ class Autoload extends AutoloadConfig
         'No_access'           => '/App/Controllers/No_access.php',
         'Office'              => '/App/Controllers/Office.php',
         'Persons'             => '/App/Controllers/Persons.php',
-        'Plugins'             => '/App/Controllers/Plugins.php',
         'Receivings'          => '/App/Controllers/Receivings.php',
         'Reports'             => '/App/Controllers/Reports.php',
         'Sales'               => '/App/Controllers/Sales.php',
@@ -158,9 +159,9 @@ class Autoload extends AutoloadConfig
         'Barcode_lib'   => '/App/Libraries/Barcode_lib.php',
         'Email_lib'     => '/App/Libraries/Email_lib.php',
         'Item_lib'      => '/App/Libraries/Item_lib.php',
+        'Mailchimp_lib' => '/App/Libraries/Mailchimp_lib.php',
         'MY_Email'      => '/App/Libraries/MY_Email.php',
         'MY_Migration'  => '/App/Libraries/MY_Migration.php',
-        'PluginManager' => '/App/Libraries/Plugins/PluginManager.php',
         'Receving_lib'  => '/App/Libraries/Receiving_lib.php',
         'Sale_lib'      => '/App/Libraries/Sale_lib.php',
         'Sms_lib'       => '/App/Libraries/Sms_lib.php',
@@ -204,7 +205,6 @@ class Autoload extends AutoloadConfig
         'cookie',
         'tabular',
         'locale',
-        'security',
-        'plugin'
+        'security'
     ];
 }

app/Config/Boot/testing.php

@@ -1,38 +1,23 @@
 <?php
 
-/*
- * The environment testing is reserved for PHPUnit testing. It has special
- * conditions built into the framework at various places to assist with that.
- * You can’t use it for your development.
- */
-
 /*
  |--------------------------------------------------------------------------
- | ERROR DISPLAY
+| ERROR DISPLAY
  |--------------------------------------------------------------------------
- | In development, we want to show as many errors as possible to help
- | make sure they don't make it to production. And save us hours of
- | painful debugging.
- */
+*/
 error_reporting(E_ALL);
 ini_set('display_errors', '1');
 
 /*
  |--------------------------------------------------------------------------
- | DEBUG BACKTRACES
+| DEBUG BACKTRACES
  |--------------------------------------------------------------------------
- | If true, this constant will tell the error screens to display debug
- | backtraces along with the other error information. If you would
- | prefer to not see this, set this value to false.
- */
+*/
 defined('SHOW_DEBUG_BACKTRACE') || define('SHOW_DEBUG_BACKTRACE', true);
 
 /*
  |--------------------------------------------------------------------------
- | DEBUG MODE
+| DEBUG MODE
  |--------------------------------------------------------------------------
- | Debug mode is an experimental flag that can allow changes throughout
- | the system. It's not widely used currently, and may not survive
- | release of the framework.
- */
-defined('CI_DEBUG') || define('CI_DEBUG', true);
+*/
+defined('CI_DEBUG') || define('CI_DEBUG', true);

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

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 = [];
 }

app/Config/Constants.php

@@ -173,4 +173,4 @@ const DEFAULT_LANGUAGE_CODE = 'en';
 /**
  * Admin modules - list of modules required for admin privileges
  */
-const ADMIN_MODULES = ['customers', 'employees', 'giftcards', 'items', 'item_kits', 'messages', 'plugins', 'receivings', 'reports', 'sales', 'config', 'suppliers'];
+const ADMIN_MODULES = ['customers', 'employees', 'giftcards', 'items', 'item_kits', 'messages', 'receivings', 'reports', 'sales', 'config', 'suppliers'];

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;
 }

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';
 

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',

app/Config/DocTypes.php

@@ -2,6 +2,9 @@
 
 namespace Config;
 
+/**
+ * @immutable
+ */
 class DocTypes
 {
     /**

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
      */

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

app/Config/Events.php

@@ -8,7 +8,6 @@ use CodeIgniter\HotReloader\HotReloader;
 use App\Events\Db_log;
 use App\Events\Load_config;
 use App\Events\Method;
-use App\Libraries\Plugins\PluginManager;
 
 /*
  * --------------------------------------------------------------------
@@ -26,9 +25,6 @@ use App\Libraries\Plugins\PluginManager;
  * Example:
  *      Events::on('create', [$myInstance, 'myMethod']);
  */
-Events::on('pre_system', static function (): void {
-    PluginManager::registerAllNamespaces();
-});
 
 Events::on('pre_system', static function (): void {
     if (ENVIRONMENT !== 'testing') {
@@ -52,6 +48,7 @@ Events::on('pre_system', static function (): void {
     if (CI_DEBUG && ! is_cli()) {
         Events::on('DBQuery', 'CodeIgniter\Debug\Toolbar\Collectors\Database::collect');
         service('toolbar')->respond();
+        // Hot Reload route - for framework use on the hot reloader.
         if (ENVIRONMENT === 'development') {
             service('routes')->get('__hot-reload', static function (): void {
                 (new HotReloader())->run();
@@ -60,12 +57,8 @@ Events::on('pre_system', static function (): void {
     }
 });
 
-Events::on('post_controller_constructor', static function (): void {
-    service('pluginManager');
-}, 10);
-
 $config = new Load_config();
-Events::on('post_controller_constructor', [$config, 'load_config'], 1);
+Events::on('post_controller_constructor', [$config, 'load_config']);
 
 $db_log = new Db_log();
 Events::on('DBQuery', [$db_log, 'db_log_queries']);

app/Config/Filters.php

@@ -65,10 +65,7 @@ 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' => [
@@ -103,7 +100,7 @@ class Filters extends BaseFilters
      * before or after URI patterns.
      *
      * Example:
-     * 'isLoggedIn' => ['before' => ['account/*', 'profiles/*']]
+     * isLoggedIn' => ['before' => ['account/*', 'profiles/*']]
      *
      * @var array<string, array<string, list<string>>>
      */

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;
 }

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',
-    ];
-}

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';
 

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 = [
         /*

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;
 }

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), '. ');
 

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
 {

app/Config/OSPOS.php

@@ -5,7 +5,7 @@ namespace Config;
 use App\Models\Appconfig;
 use CodeIgniter\Cache\CacheInterface;
 use CodeIgniter\Config\BaseConfig;
-use Config\Database;
+use CodeIgniter\Database\Exceptions\DatabaseException;
 
 /**
  * This class holds the configuration options stored from the database so that on launch those settings can be cached
@@ -14,7 +14,7 @@ use Config\Database;
  */
 class OSPOS extends BaseConfig
 {
-    public array $settings = [];
+    public array $settings;
     public string $commit_sha1 = 'dev';    // TODO: Travis scripts need to be updated to replace this with the commit hash on build
     private CacheInterface $cache;
 
@@ -34,37 +34,25 @@ class OSPOS extends BaseConfig
 
         if ($cache) {
             $this->settings = decode_array($cache);
-            return;
-        }
-
-        try {
-            $db = Database::connect();
-
-            if (!$db->tableExists('app_config')) {
-                $this->settings = $this->getDefaultSettings();
-                return;
+        } 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 (DatabaseException $e) {
+                // Database table doesn't exist yet (migrations haven't run)
+                // Return empty settings to allow migration page to display
+                $this->settings = [
+                    'language' => 'english',
+                    'language_code' => 'en',
+                    'company' => 'Home'
+                ];
             }
-
-            $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) {
-            $this->settings = $this->getDefaultSettings();
         }
     }
 
-    private function getDefaultSettings(): array
-    {
-        return [
-            'language'      => 'english',
-            'language_code' => 'en',
-            'company'       => 'Home',
-            'barcode_type'  => 'Code39'
-        ];
-    }
-
     /**
      * @return void
      */
@@ -73,4 +61,4 @@ class OSPOS extends BaseConfig
         $this->cache->delete('settings');
         $this->set_settings();
     }
-}
+}

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
 {

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__ . '/../../';
 }

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

app/Config/Security.php

@@ -13,9 +13,9 @@ class Security extends BaseConfig
      *
      * Protection Method for Cross Site Request Forgery protection.
      *
-     * @var string 'cookie' or 'session'
+     * @var string|false 'cookie', 'session', or false
      */
-    public string $csrfProtection = 'session';
+    public string|false $csrfProtection = 'session';
 
     /**
      * --------------------------------------------------------------------------

app/Config/Services.php

@@ -2,8 +2,6 @@
 
 namespace Config;
 
-use App\Libraries\MY_Language;
-use App\Libraries\Plugins\PluginManager;
 use Locale;
 use HTMLPurifier;
 use HTMLPurifier_Config;
@@ -40,11 +38,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);
@@ -59,30 +55,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);
     }
 
-    public static function pluginManager(bool $getShared = true): PluginManager
-    {
-        if ($getShared) {
-            return static::getSharedInstance('pluginManager');
-        }
+    private static $htmlPurifier;
 
-        $manager = new PluginManager();
-
-        if ($manager->canLoadPlugins()) {
-            $manager->discoverPlugins();
-            $manager->registerPluginEvents();
-        } else {
-            log_message('debug', 'PluginManager: skipping init, plugin_config table not found.');
-        }
-
-        return $manager;
-    }
-
-    private static HTMLPurifier $htmlPurifier;
-
-    public static function htmlPurifier($getShared = true): object
+    public static function htmlPurifier($getShared = true)
     {
         if ($getShared) {
             return static::getSharedInstance('htmlPurifier');

app/Config/Session.php

@@ -6,6 +6,7 @@ use CodeIgniter\Config\BaseConfig;
 use CodeIgniter\Session\Handlers\BaseHandler;
 use CodeIgniter\Session\Handlers\DatabaseHandler;
 use CodeIgniter\Session\Handlers\FileHandler;
+use Config\Database;
 
 class Session extends BaseConfig
 {
@@ -138,11 +139,7 @@ class Session extends BaseConfig
                     $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.
+            } catch (\CodeIgniter\Database\Exceptions\DatabaseException $e) {
                 $this->driver = FileHandler::class;
                 $this->savePath = WRITEPATH . 'session';
             }

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
-    ];
 }

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',
     ];
 }

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';
 }

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;
-}

app/Controllers/Attributes.php

@@ -132,7 +132,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')));

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');
     }
 }

app/Controllers/Config.php

@@ -3,6 +3,8 @@
 namespace App\Controllers;
 
 use App\Libraries\Barcode_lib;
+use App\Libraries\Image_lib;
+use App\Libraries\Mailchimp_lib;
 use App\Libraries\Receiving_lib;
 use App\Libraries\Sale_lib;
 use App\Libraries\Tax_lib;
@@ -81,7 +83,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);
@@ -220,7 +222,6 @@ class Config extends Secure_Controller
      */
     public function getIndex(): string
     {
-        $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();
@@ -231,8 +232,6 @@ class Config extends Secure_Controller
         $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();
@@ -252,6 +251,36 @@ class Config extends Secure_Controller
         $data['image_allowed_types'] = array_combine($image_allowed_types, $image_allowed_types);
         $data['selected_image_allowed_types'] = explode(',', $this->config['image_allowed_types']);
 
+        $exif_fields = ['Make', 'Model', 'Orientation', 'Copyright', 'Software', 'DateTime', 'GPS'];
+        $data['exif_fields'] = array_combine($exif_fields, $exif_fields);
+        $data['selected_exif_fields'] = array_filter(explode(',', $this->config['exif_fields_to_keep'] ?? ''));
+
+        // Integrations Related fields
+        $data['mailchimp']    = [];
+
+        if (check_encryption()) {    // TODO: Hungarian notation
+            if (!isset($this->encrypter)) {
+                helper('security');
+                $this->encrypter = Services::encrypter();
+            }
+
+            $data['mailchimp']['api_key'] = (isset($this->config['mailchimp_api_key']) && !empty($this->config['mailchimp_api_key']))
+                ? $this->encrypter->decrypt($this->config['mailchimp_api_key'])
+                : '';
+
+            $data['mailchimp']['list_id'] = (isset($this->config['mailchimp_list_id']) && !empty($this->config['mailchimp_list_id']))
+                ? $this->encrypter->decrypt($this->config['mailchimp_list_id'])
+                : '';
+
+            // Remove any backup of .env created by check_encryption()
+            remove_backup();
+        } else {
+            $data['mailchimp']['api_key'] = '';
+            $data['mailchimp']['list_id'] = '';
+        }
+
+        $data['mailchimp']['lists'] = $this->_mailchimp();
+
         return view('configs/manage', $data);
     }
 
@@ -289,6 +318,7 @@ class Config extends Secure_Controller
         return $this->response->setJSON(['success' => $success, 'message' => $message]);
     }
 
+
     /**
      * @return array
      */
@@ -330,6 +360,15 @@ class Config extends Secure_Controller
 
         $file->move(FCPATH . 'uploads/', $file_info['raw_name'] . '.' . $file_info['file_ext'], true);
 
+        $exif_fields_to_keep = array_filter(explode(',', $this->appconfig->get_value('exif_fields_to_keep', 'Copyright,Orientation,Software')));
+        if (!empty($exif_fields_to_keep)) {
+            $image_lib = new Image_lib();
+            $filepath = FCPATH . 'uploads/' . $file_info['raw_name'] . '.' . $file_info['file_ext'];
+            if (!$image_lib->stripEXIF($filepath, $exif_fields_to_keep)) {
+                log_message('warning', 'EXIF stripping failed for: ' . $filepath);
+            }
+        }
+
         return ($file_info);
     }
 
@@ -342,7 +381,7 @@ class Config extends Secure_Controller
      */
     public function postSaveGeneral(): ResponseInterface
     {
-        $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,
@@ -357,7 +396,8 @@ class Config extends Secure_Controller
             'image_max_width'                   => $this->request->getPost('image_max_width', FILTER_SANITIZE_NUMBER_INT),
             'image_max_height'                  => $this->request->getPost('image_max_height', FILTER_SANITIZE_NUMBER_INT),
             'image_max_size'                    => $this->request->getPost('image_max_size', FILTER_SANITIZE_NUMBER_INT),
-            'image_allowed_types'               => implode(',', $this->request->getPost('image_allowed_types')),
+            'image_allowed_types'               => implode(',', $this->request->getPost('image_allowed_types') ?? []),
+            'exif_fields_to_keep'               => implode(',', $this->request->getPost('exif_fields_to_keep') ?? []),
             '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'),
@@ -373,26 +413,19 @@ 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);
-
-        $this->db->transComplete();
-
-        $success = $success && $this->db->transStatus();
+        $success = $this->appconfig->batch_save($batch_save_data);
 
         return $this->response->setJSON(['success' => $success, 'message' => lang('Config.saved_' . ($success ? '' : 'un') . 'successfully')]);
     }
@@ -405,35 +438,32 @@ class Config extends Secure_Controller
      */
     public function postCheckNumberLocale(): ResponseInterface
     {
-        $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,
+            '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,
         ]);
     }
 
@@ -547,6 +577,76 @@ class Config extends Secure_Controller
         return $this->response->setJSON(['success' => $success, 'message' => lang('Config.saved_' . ($success ? '' : 'un') . 'successfully')]);
     }
 
+    /**
+     * This function fetches all the available lists from Mailchimp for the given API key
+     */
+    private function _mailchimp(string $api_key = ''): array    // TODO: Hungarian notation
+    {
+        $mailchimp_lib = new Mailchimp_lib(['api_key' => $api_key]);
+
+        $result = [];
+
+        $lists = $mailchimp_lib->getLists();
+        if ($lists !== false) {
+            if (is_array($lists) && !empty($lists['lists']) && is_array($lists['lists'])) {
+                foreach ($lists['lists'] as $list) {
+                    $result[$list['id']] = $list['name'] . ' [' . $list['stats']['member_count'] . ']';
+                }
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Gets Mailchimp lists when a valid API key is inserted. Used in app/Views/configs/integrations_config.php
+     *
+     * @return ResponseInterface
+     * @noinspection PhpUnused
+     */
+    public function postCheckMailchimpApiKey(): ResponseInterface
+    {
+        $lists = $this->_mailchimp($this->request->getPost('mailchimp_api_key'));
+        $success = count($lists) > 0;
+
+        return $this->response->setJSON([
+            'success'         => $success,
+            'message'         => lang('Config.mailchimp_key_' . ($success ? '' : 'un') . 'successfully'),
+            'mailchimp_lists' => $lists
+        ]);
+    }
+
+    /**
+     * Saves Mailchimp configuration. Used in app/Views/configs/integrations_config.php
+     *
+     * @throws ReflectionException
+     * @return ResponseInterface
+     * @noinspection PhpUnused
+     */
+    public function postSaveMailchimp(): ResponseInterface
+    {
+        $api_key = '';
+        $list_id = '';
+
+        if (check_encryption()) {
+            $api_key_unencrypted = $this->request->getPost('mailchimp_api_key');
+            if (!empty($api_key_unencrypted)) {
+                $api_key = $this->encrypter->encrypt($api_key_unencrypted);
+            }
+
+            $list_id_unencrypted = $this->request->getPost('mailchimp_list_id');
+            if (!empty($list_id_unencrypted)) {
+                $list_id = $this->encrypter->encrypt($list_id_unencrypted);
+            }
+        }
+
+        $batch_save_data = ['mailchimp_api_key' => $api_key, 'mailchimp_list_id' => $list_id];
+
+        $success = $this->appconfig->batch_save($batch_save_data);
+
+        return $this->response->setJSON(['success' => $success, 'message' => lang('Config.saved_' . ($success ? '' : 'un') . 'successfully')]);
+    }
+
     /**
      * Gets all stock locations. Used in app/Views/configs/stock_config.php
      *
@@ -826,9 +926,7 @@ class Config extends Secure_Controller
     public function postSaveReceipt(): ResponseInterface
     {
         $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'),
@@ -853,44 +951,6 @@ class Config extends Secure_Controller
         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')
-        ]);
-    }
-
     /**
      * Saves invoice configuration. Used in app/Views/configs/invoice_config.php.
      *
@@ -914,8 +974,8 @@ 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_type'                => Sale_lib::isValidInvoiceType($this->request->getPost('invoice_type')) 
+                ? $this->request->getPost('invoice_type') 
                 : 'invoice'
         ];
 
@@ -961,8 +1021,8 @@ class Config extends Secure_Controller
             return $fieldType === 'first' ? 'name' : '';
         }
 
-        $allowed = $fieldType === 'first'
-            ? Item::ALLOWED_SUGGESTIONS_COLUMNS
+        $allowed = $fieldType === 'first' 
+            ? Item::ALLOWED_SUGGESTIONS_COLUMNS 
             : Item::ALLOWED_SUGGESTIONS_COLUMNS_WITH_EMPTY;
 
         $fallback = $fieldType === 'first' ? 'name' : '';

app/Controllers/Customers.php

@@ -2,10 +2,11 @@
 
 namespace App\Controllers;
 
+use App\Libraries\Mailchimp_lib;
+
 use App\Models\Customer;
 use App\Models\Customer_rewards;
 use App\Models\Tax_code;
-use CodeIgniter\Events\Events;
 use CodeIgniter\HTTP\DownloadResponse;
 use CodeIgniter\HTTP\ResponseInterface;
 use Config\OSPOS;
@@ -14,6 +15,8 @@ use stdClass;
 
 class Customers extends Persons
 {
+    private string $_list_id;
+    private Mailchimp_lib $mailchimp_lib;
     private Customer_rewards $customer_rewards;
     private Customer $customer;
     private Tax_code $tax_code;
@@ -22,11 +25,19 @@ class Customers extends Persons
     public function __construct()
     {
         parent::__construct('customers');
-
+        $this->mailchimp_lib = new Mailchimp_lib();
         $this->customer_rewards = model(Customer_rewards::class);
         $this->customer = model(Customer::class);
         $this->tax_code = model(Tax_code::class);
         $this->config = config(OSPOS::class)->settings;
+
+        $encrypter = Services::encrypter();
+
+        if (!empty($this->config['mailchimp_list_id'])) {
+            $this->_list_id = $encrypter->decrypt($this->config['mailchimp_list_id']);
+        } else {
+            $this->_list_id = '';
+        }
     }
 
     /**
@@ -41,12 +52,11 @@ class Customers extends Persons
 
     /**
      * Gets one row for a customer manage table. This is called using AJAX to update one row.
-     * @param int $row_id
      * @return ResponseInterface
      */
     public function getRow(int $row_id): ResponseInterface
     {
-        $person = $this->customer->getInfo($row_id);
+        $person = $this->customer->get_info($row_id);
 
         // Retrieve the total amount the customer spent so far together with min, max and average values
         $stats = $this->customer->get_stats($person->person_id);    // TODO: This and the next 11 lines are duplicated in search().  Extract a method.
@@ -131,16 +141,14 @@ class Customers extends Persons
 
     /**
      * Loads the customer edit form
-     * @param int $customerId
      * @return string
      */
-    public function getView(int $customerId = NEW_ENTRY): string
+    public function getView(int $customer_id = NEW_ENTRY): string
     {
-        if ($customerId == null) {
-            $customerId = NEW_ENTRY;
-        }
+        // Set default values
+        if ($customer_id == null) $customer_id = NEW_ENTRY;
 
-        $info = $this->customer->getInfo($customerId);
+        $info = $this->customer->get_info($customer_id);
         foreach (get_object_vars($info) as $property => $value) {
             $info->$property = $value;
         }
@@ -151,7 +159,7 @@ class Customers extends Persons
             $data['person_info']->employee_id = $this->employee->get_logged_in_employee_info()->person_id;
         }
 
-        $employee_info = $this->employee->getInfo($info->employee_id);
+        $employee_info = $this->employee->get_info($info->employee_id);
         $data['employee'] = $employee_info->first_name . ' ' . $employee_info->last_name;
 
         $tax_code_info = $this->tax_code->get_info($info->sales_tax_code_id);
@@ -172,7 +180,7 @@ class Customers extends Persons
         $data['use_destination_based_tax'] = $this->config['use_destination_based_tax'];
 
         // Retrieve the total amount the customer spent so far together with min, max and average values
-        $stats = $this->customer->get_stats($customerId);
+        $stats = $this->customer->get_stats($customer_id);
         if (!empty($stats)) {
             foreach (get_object_vars($stats) as $property => $value) {
                 $info->$property = $value;
@@ -180,29 +188,69 @@ class Customers extends Persons
             $data['stats'] = $stats;
         }
 
-        Events::trigger('customer_loaded', $customerId);
+        // Retrieve the info from Mailchimp only if there is an email address assigned
+        if (!empty($info->email)) {
+            // Collect Mailchimp customer info
+            if (($mailchimp_info = $this->mailchimp_lib->getMemberInfo($this->_list_id, $info->email)) !== false) {
+                $data['mailchimp_info'] = $mailchimp_info;
+
+                // Collect customer Mailchimp emails activities (stats)
+                if (($activities = $this->mailchimp_lib->getMemberActivity($this->_list_id, $info->email)) !== false) {
+                    if (array_key_exists('activity', $activities)) {
+                        $open = 0;
+                        $unopen = 0;
+                        $click = 0;
+                        $total = 0;
+                        $lastopen = '';
+
+                        foreach ($activities['activity'] as $activity) {
+                            if ($activity['action'] == 'sent') {
+                                ++$unopen;
+                            } elseif ($activity['action'] == 'open') {
+                                if (empty($lastopen)) {
+                                    $lastopen = substr($activity['timestamp'], 0, 10);
+                                }
+                                ++$open;
+                            } elseif ($activity['action'] == 'click') {
+                                if (empty($lastopen)) {
+                                    $lastopen = substr($activity['timestamp'], 0, 10);
+                                }
+                                ++$click;
+                            }
+
+                            ++$total;
+                        }
+
+                        $data['mailchimp_activity']['total'] = $total;
+                        $data['mailchimp_activity']['open'] = $open;
+                        $data['mailchimp_activity']['unopen'] = $unopen;
+                        $data['mailchimp_activity']['click'] = $click;
+                        $data['mailchimp_activity']['lastopen'] = $lastopen;
+                    }
+                }
+            }
+        }
 
         return view("customers/form", $data);
     }
 
     /**
      * Inserts/updates a customer
-     * @param int $customerId
      * @return ResponseInterface
      */
-    public function postSave(int $customerId = NEW_ENTRY): ResponseInterface
+    public function postSave(int $customer_id = NEW_ENTRY): ResponseInterface
     {
-        $firstName = $this->request->getPost('first_name');
-        $lastName = $this->request->getPost('last_name');
+        $first_name = $this->request->getPost('first_name');
+        $last_name = $this->request->getPost('last_name');
         $email = strtolower($this->request->getPost('email', FILTER_SANITIZE_EMAIL));
 
         // Format first and last name properly
-        $firstName = $this->nameize($firstName);
-        $lastName = $this->nameize($lastName);
+        $first_name = $this->nameize($first_name);
+        $last_name = $this->nameize($last_name);
 
-        $personData = [
-            'first_name'   => $firstName,
-            'last_name'    => $lastName,
+        $person_data = [
+            'first_name'   => $first_name,
+            'last_name'    => $last_name,
             'gender'       => $this->request->getPost('gender', FILTER_SANITIZE_NUMBER_INT),
             'email'        => $email,
             'phone_number' => $this->request->getPost('phone_number'),
@@ -215,9 +263,9 @@ class Customers extends Persons
             'comments'     => $this->request->getPost('comments')
         ];
 
-        $dateFormatter = date_create_from_format($this->config['dateformat'] . ' ' . $this->config['timeformat'], $this->request->getPost('date'));
+        $date_formatter = date_create_from_format($this->config['dateformat'] . ' ' . $this->config['timeformat'], $this->request->getPost('date'));
 
-        $customerData = [
+        $customer_data = [
             'consent'           => $this->request->getPost('consent') != null,
             'account_number'    => $this->request->getPost('account_number') == '' ? null : $this->request->getPost('account_number'),
             'tax_id'            => $this->request->getPost('tax_id'),
@@ -226,32 +274,41 @@ class Customers extends Persons
             'discount_type'     => $this->request->getPost('discount_type') == null ? PERCENT : $this->request->getPost('discount_type', FILTER_SANITIZE_NUMBER_INT),
             'package_id'        => $this->request->getPost('package_id') == '' ? null : $this->request->getPost('package_id'),
             'taxable'           => $this->request->getPost('taxable') != null,
-            'date'              => $dateFormatter->format('Y-m-d H:i:s'),
+            'date'              => $date_formatter->format('Y-m-d H:i:s'),
             'employee_id'       => $this->request->getPost('employee_id', FILTER_SANITIZE_NUMBER_INT),
             'sales_tax_code_id' => $this->request->getPost('sales_tax_code_id') == '' ? null : $this->request->getPost('sales_tax_code_id', FILTER_SANITIZE_NUMBER_INT)
         ];
 
-        if ($this->customer->saveCustomer($personData, $customerData, $customerId)) {
-            Events::trigger('customer_saved', [$customerData['person_id']]);
+        if ($this->customer->save_customer($person_data, $customer_data, $customer_id)) {
+            // Save customer to Mailchimp selected list    // TODO: addOrUpdateMember should be refactored. Potentially pass an array or object instead of 6 parameters.
+            $mailchimp_status = $this->request->getPost('mailchimp_status');
+            $this->mailchimp_lib->addOrUpdateMember(
+                $this->_list_id,
+                $email,
+                $first_name,
+                $last_name,
+                $mailchimp_status == null ? "" : $mailchimp_status,
+                ['vip' => $this->request->getPost('mailchimp_vip') != null]
+            );
 
             // New customer
-            if ($customerId == NEW_ENTRY) {
+            if ($customer_id == NEW_ENTRY) {
                 return $this->response->setJSON([
                     'success' => true,
-                    'message' => lang('Customers.successful_adding') . " $firstName $lastName",
-                    'id'      => $customerData['person_id']
+                    'message' => lang('Customers.successful_adding') . ' ' . $first_name . ' ' . $last_name,
+                    'id'      => $customer_data['person_id']
                 ]);
             } else { // Existing customer
                 return $this->response->setJSON([
                     'success' => true,
-                    'message' => lang('Customers.successful_updating') . " $firstName $lastName",
-                    'id'      => $customerId
+                    'message' => lang('Customers.successful_updating') . ' ' . $first_name . ' ' . $last_name,
+                    'id'      => $customer_id
                 ]);
             }
         } else { // Failure
             return $this->response->setJSON([
                 'success' => false,
-                'message' => lang('Customers.error_adding_updating') . " $firstName $lastName",
+                'message' => lang('Customers.error_adding_updating') . ' ' . $first_name . ' ' . $last_name,
                 'id'      => NEW_ENTRY
             ]);
         }
@@ -287,23 +344,26 @@ class Customers extends Persons
     }
 
     /**
-     * This deletes customers from the customer's table
+     * This deletes customers from the customers table
      * @return ResponseInterface
      */
     public function postDelete(): ResponseInterface
     {
-        $customersToDelete = $this->request->getPost('ids');
-        $customers = $this->customer->get_multiple_info($customersToDelete);
+        $customers_to_delete = $this->request->getPost('ids');
+        $customers_info = $this->customer->get_multiple_info($customers_to_delete);
 
         $count = 0;
-        foreach ($customers->getResult() as $customer) {
-            if ($this->customer->delete($customer->person_id)) {
-                Events::trigger('customer_deleted', (int)$customer->person_id, (string)$customer->email);
+
+        foreach ($customers_info->getResult() as $info) {
+            if ($this->customer->delete($info->person_id)) {
+                // remove customer from Mailchimp selected list
+                $this->mailchimp_lib->removeMember($this->_list_id, $info->email);
+
                 $count++;
             }
         }
 
-        if ($count === count($customersToDelete)) {
+        if ($count == count($customers_to_delete)) {
             return $this->response->setJSON([
                 'success' => true,
                 'message' => lang('Customers.successful_deleted') . ' ' . $count . ' ' . lang('Customers.one_or_multiple')
@@ -351,17 +411,16 @@ class Customers extends Persons
             if (($handle = fopen($_FILES['file_path']['tmp_name'], 'r')) !== false) {
                 // Skip the first row as it's the table description
                 fgetcsv($handle);
-                $rowNumber = 1;
+                $i = 1;
 
                 $failCodes = [];
-                $customerIds = [];
 
                 while (($data = fgetcsv($handle)) !== false) {
                     $consent = $data[3] == '' ? 0 : 1;
 
                     if (sizeof($data) >= 16 && $consent) {
                         $email = strtolower($data[4]);
-                        $personData = [
+                        $person_data = [
                             'first_name'   => $data[0],
                             'last_name'    => $data[1],
                             'gender'       => $data[2],
@@ -376,7 +435,7 @@ class Customers extends Persons
                             'comments'     => $data[12]
                         ];
 
-                        $customerData = [
+                        $customer_data = [
                             'consent'       => $consent,
                             'company_name'  => $data[13],
                             'discount'      => $data[15],
@@ -391,7 +450,7 @@ class Customers extends Persons
                         $invalidated = $this->customer->check_email_exists($email);
 
                         if ($account_number != '') {
-                            $customerData['account_number'] = $account_number;
+                            $customer_data['account_number'] = $account_number;
                             $invalidated &= $this->customer->check_account_number_exists($account_number);
                         }
                     } else {
@@ -399,15 +458,16 @@ class Customers extends Persons
                     }
 
                     if ($invalidated) {
-                        $failCodes[] = $rowNumber;
-                        log_message('error', "Row $rowNumber was not imported: Either email or account number already exist or data was invalid.");
-                    } elseif ($this->customer->saveCustomer($personData, $customerData)) {
-                        $customerIds[] = $customerData['person_id'];
+                        $failCodes[] = $i;
+                        log_message('error', "Row $i was not imported: Either email or account number already exist or data was invalid.");
+                    } elseif ($this->customer->save_customer($person_data, $customer_data)) {
+                        // Save customer to Mailchimp selected list
+                        $this->mailchimp_lib->addOrUpdateMember($this->_list_id, $person_data['email'], $person_data['first_name'], '', $person_data['last_name']);
                     } else {
-                        $failCodes[] = $rowNumber;
+                        $failCodes[] = $i;
                     }
 
-                    ++$rowNumber;
+                    ++$i;
                 }
 
                 if (count($failCodes) > 0) {
@@ -415,8 +475,6 @@ class Customers extends Persons
 
                     return $this->response->setJSON(['success' => false, 'message' => $message]);
                 } else {
-                    Events::trigger('customer_saved', $customerIds);
-
                     return $this->response->setJSON(['success' => true, 'message' => lang('Customers.csv_import_success')]);
                 }
             } else {

app/Controllers/Employees.php

@@ -75,7 +75,7 @@ class Employees extends Persons
      */
     public function getView(int $employee_id = NEW_ENTRY): string
     {
-        $person_info = $this->employee->getInfo($employee_id);
+        $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)) {
@@ -119,7 +119,7 @@ class Employees extends Persons
         $current_user = $this->employee->get_logged_in_employee_info();
 
         if ($employee_id != NEW_ENTRY) {
-            $target_employee = $this->employee->getInfo($employee_id);
+            $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,

app/Controllers/Expenses.php

@@ -106,7 +106,7 @@ class Expenses extends Secure_Controller
             }
         } else {
             $stored_employee_id = $expense_id == NEW_ENTRY ? $current_employee_id : $data['expenses_info']->employee_id;
-            $stored_employee = $this->employee->getInfo($stored_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['can_assign_employee'] = $can_assign_employee;

app/Controllers/Home.php

@@ -35,15 +35,15 @@ 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 $employeeId = NEW_ENTRY)
     {
         $loggedInEmployee = $this->employee->get_logged_in_employee_info();
-        $currentPersonId = (int) $loggedInEmployee->person_id;
+        $currentPersonId = $loggedInEmployee->person_id;
 
         $employeeId = $employeeId === NEW_ENTRY ? $currentPersonId : $employeeId;
 
@@ -51,7 +51,7 @@ class Home extends Secure_Controller
             return $this->response->setStatusCode(403)->setBody(lang('Employees.unauthorized_modify'));
         }
 
-        $person_info = $this->employee->getInfo($employeeId);
+        $person_info = $this->employee->get_info($employeeId);
         foreach (get_object_vars($person_info) as $property => $value) {
             $person_info->$property = $value;
         }
@@ -68,11 +68,10 @@ class Home extends Secure_Controller
     public function postSave(int $employeeId = NEW_ENTRY): ResponseInterface
     {
         $currentUser = $this->employee->get_logged_in_employee_info();
-        $currentPersonId = (int) $currentUser->person_id;
 
-        $employeeId = $employeeId === NEW_ENTRY ? $currentPersonId : $employeeId;
+        $employeeId = $employeeId === NEW_ENTRY ? $currentUser->person_id : $employeeId;
 
-        if (!$this->employee->isAdmin($currentPersonId) && $employeeId !== $currentPersonId) {
+        if (!$this->employee->isAdmin($currentUser->person_id) && $employeeId !== $currentUser->person_id) {
             return $this->response->setStatusCode(403)->setJSON([
                 'success' => false,
                 'message' => lang('Employees.unauthorized_modify')

app/Controllers/Items.php

@@ -3,7 +3,10 @@
 namespace App\Controllers;
 
 use App\Libraries\Barcode_lib;
+use App\Libraries\Image_lib;
 use App\Libraries\Item_lib;
+
+use App\Models\Appconfig;
 use App\Models\Attribute;
 use App\Models\Inventory;
 use App\Models\Item;
@@ -13,7 +16,7 @@ use App\Models\Item_taxes;
 use App\Models\Stock_location;
 use App\Models\Supplier;
 use App\Models\Tax_category;
-use CodeIgniter\Events\Events;
+
 use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\Images\Handlers\BaseHandler;
 use CodeIgniter\HTTP\DownloadResponse;
@@ -38,6 +41,7 @@ class Items extends Secure_Controller
     private Stock_location $stock_location;
     private Supplier $supplier;
     private Tax_category $tax_category;
+    private Appconfig $appconfig;
     private array $config;
 
 
@@ -61,6 +65,7 @@ class Items extends Secure_Controller
         $this->stock_location = model(Stock_location::class);
         $this->supplier = model(Supplier::class);
         $this->tax_category = model(Tax_category::class);
+        $this->appconfig = model(Appconfig::class);
         $this->config = config(OSPOS::class)->settings;
     }
 
@@ -72,7 +77,7 @@ class Items extends Secure_Controller
         $this->session->set('allow_temp_items', 0);
 
         $data['table_headers'] = get_items_manage_table_headers();
-
+        
         // Restore stock_location from URL or session
         $stockLocation = $this->request->getGet('stock_location', FILTER_SANITIZE_NUMBER_INT);
         $data['stock_location'] = $stockLocation
@@ -155,23 +160,8 @@ class Items extends Secure_Controller
     {
         helper('file');
 
-        // Security: Sanitize filename to prevent path traversal
-        // Use basename() to strip directory components and prevent '../' attacks
-        $pic_filename = basename(rawurldecode($pic_filename));
-        $file_extension = strtolower(pathinfo($pic_filename, PATHINFO_EXTENSION));
-
-        // Validate file extension against system-configured allowed image types
-        // Handle both legacy pipe-separated and current comma-separated formats
-        // Fallback to types that GD library can process for thumbnail generation
-        $allowed_types = $this->config['image_allowed_types'] ?? 'jpg,jpeg,gif,png,webp,bmp,tif,tiff';
-        $allowed_extensions = strpos($allowed_types, '|') !== false
-            ? explode('|', $allowed_types)
-            : explode(',', $allowed_types);
-
-        if (!in_array($file_extension, $allowed_extensions, true)) {
-            return $this->response->setStatusCode(400)->setBody('Invalid file type');
-        }
-
+        $pic_filename = rawurldecode($pic_filename);
+        $file_extension = pathinfo($pic_filename, PATHINFO_EXTENSION);
         $images = glob("./uploads/item_pics/$pic_filename");
         $base_path = './uploads/item_pics/' . pathinfo($pic_filename, PATHINFO_FILENAME);
 
@@ -276,7 +266,7 @@ class Items extends Secure_Controller
      */
     public function getRow(string $item_ids): ResponseInterface    // TODO: An array would be better for parameter.
     {
-        $item_infos = $this->item->getMultipleInfo(explode(':', $item_ids), $this->item_lib->get_item_location());
+        $item_infos = $this->item->get_multiple_info(explode(':', $item_ids), $this->item_lib->get_item_location());
 
         $result = [];
 
@@ -492,7 +482,7 @@ class Items extends Secure_Controller
     public function getGenerateBarcodes(string $item_ids): string    // TODO: Passing these through as a string instead of an array limits the contents of the item_ids. Perhaps a better approach would to serialize as JSON in an array and pass through post variables?
     {
         $item_ids = explode(':', $item_ids);
-        $result = $this->item->getMultipleInfo($item_ids, $this->item_lib->get_item_location())->getResultArray();
+        $result = $this->item->get_multiple_info($item_ids, $this->item_lib->get_item_location())->getResultArray();
         $data['barcode_config'] = $this->barcode_lib->get_barcode_config();
 
         foreach ($result as &$item) {
@@ -522,7 +512,7 @@ class Items extends Secure_Controller
         $data['definition_names'] = $this->attribute->get_definition_names();
 
         foreach ($data['definition_values'] as $definition_id => $definition_value) {
-            $attribute_value = $this->attribute->getAttributeValue($item_id, $definition_id);
+            $attribute_value = $this->attribute->get_attribute_value($item_id, $definition_id);
             $attribute_id = (empty($attribute_value) || empty($attribute_value->attribute_id)) ? null : $attribute_value->attribute_id;
             $values = &$data['definition_values'][$definition_id];
             $values['attribute_id'] = $attribute_id;
@@ -558,7 +548,7 @@ class Items extends Secure_Controller
         $data['definition_names'] = $this->attribute->get_definition_names();
 
         foreach ($data['definition_values'] as $definition_id => $definition_value) {
-            $attribute_value = $this->attribute->getAttributeValue($item_id, $definition_id);
+            $attribute_value = $this->attribute->get_attribute_value($item_id, $definition_id);
             $attribute_id = (empty($attribute_value) || empty($attribute_value->attribute_id)) ? null : $attribute_value->attribute_id;
             $values = &$data['definition_values'][$definition_id];
             $values['attribute_id'] = $attribute_id;
@@ -612,149 +602,148 @@ class Items extends Secure_Controller
     }
 
     /**
-     * @param int $itemId
+     * @param int $item_id
      * @return ResponseInterface
      * @throws ReflectionException
      */
-    public function postSave(int $itemId = NEW_ENTRY): ResponseInterface
+    public function postSave(int $item_id = NEW_ENTRY): ResponseInterface
     {
-        $uploadData = $this->upload_image();
-        $uploadSuccess = empty($uploadData['error']);
+        $upload_data = $this->upload_image();
+        $upload_success = empty($upload_data['error']);
 
-        $rawReceivingQuantity = $this->request->getPost('receiving_quantity');
+        $raw_receiving_quantity = $this->request->getPost('receiving_quantity');
 
-        $receivingQuantity = parse_quantity($rawReceivingQuantity);
-        $itemType = $this->request->getPost('item_type') === null ? ITEM : intval($this->request->getPost('item_type'));
+        $receiving_quantity = parse_quantity($raw_receiving_quantity);
+        $item_type = $this->request->getPost('item_type') === null ? ITEM : intval($this->request->getPost('item_type'));
 
-        if ($receivingQuantity === 0.0 && $itemType !== ITEM_TEMP) {
-            $receivingQuantity = 1;
+        if ($receiving_quantity === 0.0 && $item_type !== ITEM_TEMP) {
+            $receiving_quantity = 1;
         }
 
-        $defaultPackName = lang('Items.default_pack_name');
+        $default_pack_name = lang('Items.default_pack_name');
 
-        $costPrice = parse_decimals($this->request->getPost('cost_price'));
-        $unitPrice = parse_decimals($this->request->getPost('unit_price'));
-        $reorderLevel = parse_quantity($this->request->getPost('reorder_level'));
-        $quantityPerPack = parse_quantity($this->request->getPost('qty_per_pack') ?? '');
+        $cost_price = parse_decimals($this->request->getPost('cost_price'));
+        $unit_price = parse_decimals($this->request->getPost('unit_price'));
+        $reorder_level = parse_quantity($this->request->getPost('reorder_level'));
+        $qty_per_pack = parse_quantity($this->request->getPost('qty_per_pack') ?? '');
 
         // Save item data
-        $itemData = [
+        $item_data = [
             'name'                  => $this->request->getPost('name'),
             'description'           => $this->request->getPost('description', FILTER_SANITIZE_FULL_SPECIAL_CHARS),
             'category'              => $this->request->getPost('category'),
-            'item_type'             => $itemType,
+            'item_type'             => $item_type,
             'stock_type'            => $this->request->getPost('stock_type') === null ? HAS_STOCK : intval($this->request->getPost('stock_type')),
             'supplier_id'           => empty($this->request->getPost('supplier_id')) ? null : intval($this->request->getPost('supplier_id')),
             'item_number'           => empty($this->request->getPost('item_number')) ? null : $this->request->getPost('item_number'),
-            'cost_price'            => $costPrice,
-            'unit_price'            => $unitPrice,
-            'reorder_level'         => $reorderLevel,
-            'receiving_quantity'    => $receivingQuantity,
+            'cost_price'            => $cost_price,
+            'unit_price'            => $unit_price,
+            'reorder_level'         => $reorder_level,
+            'receiving_quantity'    => $receiving_quantity,
             'allow_alt_description' => $this->request->getPost('allow_alt_description') != null,
             'is_serialized'         => $this->request->getPost('is_serialized') != null,
-            'qty_per_pack'          => $this->request->getPost('qty_per_pack') == null ? 1 : parse_quantity($quantityPerPack),
-            'pack_name'             => $this->request->getPost('pack_name') == null ? $defaultPackName : $this->request->getPost('pack_name'),
-            'low_sell_item_id'      => $this->request->getPost('low_sell_item_id') === null ? $itemId : intval($this->request->getPost('low_sell_item_id')),
+            'qty_per_pack'          => $this->request->getPost('qty_per_pack') == null ? 1 : parse_quantity($qty_per_pack),
+            'pack_name'             => $this->request->getPost('pack_name') == null ? $default_pack_name : $this->request->getPost('pack_name'),
+            'low_sell_item_id'      => $this->request->getPost('low_sell_item_id') === null ? $item_id : intval($this->request->getPost('low_sell_item_id')),
             'deleted'               => $this->request->getPost('is_deleted') != null,
             'hsn_code'              => $this->request->getPost('hsn_code') === null ? '' : $this->request->getPost('hsn_code')
         ];
 
-        if ($itemData['item_type'] == ITEM_TEMP) {
-            $itemData['stock_type'] = HAS_NO_STOCK;
-            $itemData['receiving_quantity'] = 0;
-            $itemData['reorder_level'] = 0;
+        if ($item_data['item_type'] == ITEM_TEMP) {
+            $item_data['stock_type'] = HAS_NO_STOCK;
+            $item_data['receiving_quantity'] = 0;
+            $item_data['reorder_level'] = 0;
         }
 
-        $taxCategoryId = $this->request->getPost('tax_category_id');
+        $tax_category_id = $this->request->getPost('tax_category_id');
 
-        if (!isset($taxCategoryId)) {
-            $itemData['tax_category_id'] = null;
+        if (!isset($tax_category_id)) {
+            $item_data['tax_category_id'] = null;
         } else {
-            $itemData['tax_category_id'] = empty($this->request->getPost('tax_category_id')) ? null : intval($this->request->getPost('tax_category_id'));
+            $item_data['tax_category_id'] = empty($this->request->getPost('tax_category_id')) ? null : intval($this->request->getPost('tax_category_id'));
         }
 
-        if (!empty($uploadData['orig_name']) && $uploadData['raw_name']) {
-            $itemData['pic_filename'] = $uploadData['raw_name'] . '.' . $uploadData['file_ext'];
+        if (!empty($upload_data['orig_name']) && $upload_data['raw_name']) {
+            $item_data['pic_filename'] = $upload_data['raw_name'] . '.' . $upload_data['file_ext'];
         }
 
-        $employeeId = $this->employee->get_logged_in_employee_info()->person_id;
+        $employee_id = $this->employee->get_logged_in_employee_info()->person_id;
 
-        if ($this->item->save_value($itemData, $itemId)) {
+        if ($this->item->save_value($item_data, $item_id)) {
             $success = true;
-            $newItem = false;
+            $new_item = false;
 
-            if ($itemId === NEW_ENTRY) {
-                $itemId = $itemData['item_id'];
-                $newItem = true;
+            if ($item_id === NEW_ENTRY) {
+                $item_id = $item_data['item_id'];
+                $new_item = true;
             }
 
-            $useDestinationBasedTax = (bool)$this->config['use_destination_based_tax'];
+            $use_destination_based_tax = (bool)$this->config['use_destination_based_tax'];
 
-            if (!$useDestinationBasedTax) {
-                $itemsTaxesData = [];
-                $taxNames = $this->request->getPost('tax_names');
-                $taxPercents = $this->request->getPost('tax_percents');
+            if (!$use_destination_based_tax) {
+                $items_taxes_data = [];
+                $tax_names = $this->request->getPost('tax_names');
+                $tax_percents = $this->request->getPost('tax_percents');
 
-                $taxNameIndex = 0;
+                $tax_name_index = 0;
 
-                foreach ($taxPercents as $taxPercent) {
-                    $taxpercentage = parse_tax($taxPercent);
+                foreach ($tax_percents as $tax_percent) {
+                    $tax_percentage = parse_tax($tax_percent);
 
-                    if (is_numeric($taxpercentage)) {
-                        $itemsTaxesData[] = ['name' => $taxNames[$taxNameIndex], 'percent' => $taxpercentage];
+                    if (is_numeric($tax_percentage)) {
+                        $items_taxes_data[] = ['name' => $tax_names[$tax_name_index], 'percent' => $tax_percentage];
                     }
 
-                    $taxNameIndex++;
+                    $tax_name_index++;
                 }
-                $success &= $this->item_taxes->save_value($itemsTaxesData, $itemId);
+                $success &= $this->item_taxes->save_value($items_taxes_data, $item_id);
             }
 
             // Save item quantity
-            $stockLocations = $this->stock_location->get_undeleted_all()->getResultArray();
-            foreach ($stockLocations as $location) {
-                $updatedQuantity = parse_quantity($this->request->getPost('quantity_' . $location['location_id']));
+            $stock_locations = $this->stock_location->get_undeleted_all()->getResultArray();
+            foreach ($stock_locations as $location) {
+                $updated_quantity = parse_quantity($this->request->getPost('quantity_' . $location['location_id']));
 
-                if ($itemData['item_type'] == ITEM_TEMP) {
-                    $updatedQuantity = 0;
+                if ($item_data['item_type'] == ITEM_TEMP) {
+                    $updated_quantity = 0;
                 }
 
-                $locationDetail = [
-                    'item_id'     => $itemId,
+                $location_detail = [
+                    'item_id'     => $item_id,
                     'location_id' => $location['location_id'],
-                    'quantity'    => $updatedQuantity
+                    'quantity'    => $updated_quantity
                 ];
 
-                $itemQuantity = $this->item_quantity->get_item_quantity($itemId, $location['location_id']);
+                $item_quantity = $this->item_quantity->get_item_quantity($item_id, $location['location_id']);
 
-                if ($itemQuantity->quantity != $updatedQuantity || $newItem) {
-                    $success = $success &&  $this->item_quantity->save_value($locationDetail, $itemId, $location['location_id']);
+                if ($item_quantity->quantity != $updated_quantity || $new_item) {
+                    $success &= $this->item_quantity->save_value($location_detail, $item_id, $location['location_id']);
 
                     $inv_data = [
                         'trans_date'      => date('Y-m-d H:i:s'),
-                        'trans_items'     => $itemId,
-                        'trans_user'      => $employeeId,
+                        'trans_items'     => $item_id,
+                        'trans_user'      => $employee_id,
                         'trans_location'  => $location['location_id'],
                         'trans_comment'   => lang('Items.manually_editing_of_quantity'),
-                        'trans_inventory' => $updatedQuantity - $itemQuantity->quantity
+                        'trans_inventory' => $updated_quantity - $item_quantity->quantity
                     ];
 
-                    $success = $success && $this->inventory->insert($inv_data, false);
+                    $success &= $this->inventory->insert($inv_data, false);
                 }
             }
-            $success = $success && $this->saveItemAttributes($itemId);
+            $this->saveItemAttributes($item_id);
 
-            if ($success && $uploadSuccess) {
-                Events::trigger('item_saved', [$itemId]);
+            if ($success && $upload_success) {
+                $message = lang('Items.successful_' . ($new_item ? 'adding' : 'updating')) . ' ' . $item_data['name'];
 
-                $message = lang('Items.successful_' . ($newItem ? 'adding' : 'updating')) . ' ' . $itemData['name'];
-                return $this->response->setJSON(['success' => true, 'message' => $message, 'id' => $itemId]);
+                return $this->response->setJSON(['success' => true, 'message' => $message, 'id' => $item_id]);
             } else {
-                $message = $uploadSuccess ? lang('Items.error_adding_updating') . ' ' . $itemData['name'] : strip_tags($uploadData['error']);
+                $message = $upload_success ? lang('Items.error_adding_updating') . ' ' . $item_data['name'] : strip_tags($upload_data['error']);
 
-                return $this->response->setJSON(['success' => false, 'message' => $message, 'id' => $itemId]);
+                return $this->response->setJSON(['success' => false, 'message' => $message, 'id' => $item_id]);
             }
         } else {
-            $message = lang('Items.error_adding_updating') . ' ' . $itemData['name'];
+            $message = lang('Items.error_adding_updating') . ' ' . $item_data['name'];
 
             return $this->response->setJSON(['success' => false, 'message' => $message, 'id' => NEW_ENTRY]);
         }
@@ -792,7 +781,7 @@ class Items extends Secure_Controller
 
         $filename = $file->getClientName();
         $info = pathinfo($filename);
-
+        
         // Sanitize filename to remove problematic characters like spaces
         $sanitized_name = preg_replace('/[^a-zA-Z0-9_\-\.]/', '_', $info['filename']);
 
@@ -803,6 +792,16 @@ class Items extends Secure_Controller
         ];
 
         $file->move(FCPATH . 'uploads/item_pics/', $file_info['raw_name'] . '.' . $file_info['file_ext'], true);
+
+        $exif_fields_to_keep = array_filter(explode(',', $this->appconfig->get_value('exif_fields_to_keep', 'Copyright,Orientation,Software')));
+        if (!empty($exif_fields_to_keep)) {
+            $image_lib = new Image_lib();
+            $filepath = FCPATH . 'uploads/item_pics/' . $file_info['raw_name'] . '.' . $file_info['file_ext'];
+            if (!$image_lib->stripEXIF($filepath, $exif_fields_to_keep)) {
+                log_message('warning', 'EXIF stripping failed for: ' . $filepath);
+            }
+        }
+
         return ($file_info);
     }
 
@@ -955,7 +954,7 @@ class Items extends Secure_Controller
      */
     public function getGenerateCsvFile(): DownloadResponse
     {
-        helper('importfile');
+        helper('importfile_helper');
         $name = 'import_items.csv';
         $allowed_locations = $this->stock_location->get_allowed_locations();
         $allowed_attributes = $this->attribute->get_definition_names();
@@ -974,13 +973,14 @@ class Items extends Secure_Controller
     }
 
     /**
-     * Imports items from a CSV-formatted file.
+     * Imports items from CSV formatted file.
      * @return ResponseInterface
+     * @throws ReflectionException
      * @noinspection PhpUnused
      */
     public function postImportCsvFile(): ResponseInterface
     {
-        helper('importfile');
+        helper('importfile_helper');
         try {
             if ($_FILES['file_path']['error'] !== UPLOAD_ERR_OK) {
                 return $this->response->setJSON(['success' => false, 'message' => lang('Items.csv_import_failed')]);
@@ -989,34 +989,33 @@ class Items extends Secure_Controller
                     set_time_limit(240);
 
                     $failCodes = [];
-                    $csvRows = get_csv_file($_FILES['file_path']['tmp_name']);
-                    $employeeId = $this->employee->get_logged_in_employee_info()->person_id;
-                    $allowedStockLocations = $this->stock_location->get_allowed_locations();
-                    $attributeDefinitionNames    = $this->attribute->get_definition_names();
+                    $csv_rows = get_csv_file($_FILES['file_path']['tmp_name']);
+                    $employee_id = $this->employee->get_logged_in_employee_info()->person_id;
+                    $allowed_stock_locations = $this->stock_location->get_allowed_locations();
+                    $attribute_definition_names    = $this->attribute->get_definition_names();
 
-                    unset($attributeDefinitionNames[NEW_ENTRY]);    // Removes the common_none_selected_text from the array
+                    unset($attribute_definition_names[NEW_ENTRY]);    // Removes the common_none_selected_text from the array
 
-                    $attributeData = [];
+                    $attribute_data = [];
 
-                    foreach ($attributeDefinitionNames as $definitionName) {
-                        $attributeData[$definitionName] = $this->attribute->getDefinitionByName($definitionName)[0];
+                    foreach ($attribute_definition_names as $definition_name) {
+                        $attribute_data[$definition_name] = $this->attribute->get_definition_by_name($definition_name)[0];
 
-                        if ($attributeData[$definitionName]['definition_type'] === DROPDOWN) {
-                            $attributeData[$definitionName]['dropdown_values'] = $this->attribute->get_definition_values($attributeData[$definitionName]['definition_id']);
+                        if ($attribute_data[$definition_name]['definition_type'] === DROPDOWN) {
+                            $attribute_data[$definition_name]['dropdown_values'] = $this->attribute->get_definition_values($attribute_data[$definition_name]['definition_id']);
                         }
                     }
                     $db = db_connect();
                     $db->transBegin();    // TODO: This section needs to be reworked so that the data array is being created then passed to the Item model because $db doesn't exist in the controller without being instantiated, but database operations should be restricted to the model
 
-                    $itemIds = [];
-                    foreach ($csvRows as $key => $row) {
-                        $isFailedRow = false;
-                        $itemId = (int)$row['Id'];
-                        $isUpdate = ($itemId > 0);
-                        $itemData = [
-                            'item_id'       => $itemId,
+                    foreach ($csv_rows as $key => $row) {
+                        $is_failed_row = false;
+                        $item_id = (int)$row['Id'];
+                        $is_update = ($item_id > 0);
+                        $item_data = [
+                            'item_id'       => $item_id,
                             'name'          => $row['Item Name'],
-                            'description'   => filter_var($row['Description'], FILTER_SANITIZE_FULL_SPECIAL_CHARS),
+                            'description'   => $row['Description'],
                             'category'      => $row['Category'],
                             'cost_price'    => $row['Cost Price'],
                             'unit_price'    => $row['Unit Price'],
@@ -1026,26 +1025,25 @@ class Items extends Secure_Controller
                             'pic_filename'  => $row['Image']
                         ];
 
-                        if (!empty($row['Supplier ID'])) {
-                            $itemData['supplier_id'] = $this->supplier->exists($row['Supplier ID']) ? $row['Supplier ID'] : null;
+                        if (!empty($row['supplier ID'])) {
+                            $item_data['supplier_id'] = $this->supplier->exists($row['Supplier ID']) ? $row['Supplier ID'] : null;
                         }
 
-                        if ($isUpdate) {
-                            $itemData['allow_alt_description'] = $row['Allow Alt Description'] === '' ? null : $row['Allow Alt Description'];
-                            $itemData['is_serialized'] = $row['Item has Serial Number'] === '' ? null : $row['Item has Serial Number'];
+                        if ($is_update) {
+                            $item_data['allow_alt_description'] = empty($row['Allow Alt Description']) ? null : $row['Allow Alt Description'];
+                            $item_data['is_serialized'] = empty($row['Item has Serial Number']) ? null : $row['Item has Serial Number'];
                         } else {
-                            $itemData['allow_alt_description'] = $row['Allow Alt Description'] === '' ? '0' : '1';
-                            $itemData['is_serialized'] = $row['Item has Serial Number'] === '' ? '0' : '1';
+                            $item_data['allow_alt_description'] = empty($row['Allow Alt Description']) ? '0' : '1';
+                            $item_data['is_serialized'] = empty($row['Item has Serial Number']) ? '0' : '1';
                         }
 
-                        if (!empty($row['Barcode'])) {
-                            $itemData['item_number'] = $row['Barcode'];
-                            $isFailedRow = $this->item->item_number_exists($itemData['item_number'], $itemId);
+                        if (!empty($row['Barcode']) && !$is_update) {
+                            $item_data['item_number'] = $row['Barcode'];
+                            $is_failed_row = $this->item->item_number_exists($item_data['item_number']);
                         }
 
-                        if (!$isFailedRow) {
-                            $allowedStockLocations = $this->stock_location->get_allowed_locations();
-                            $isFailedRow = $this->validateCSVData($row, $itemData, $allowedStockLocations, $attributeDefinitionNames, $attributeData);
+                        if (!$is_failed_row) {
+                            $invalidLocations = $this->validateCSVStockLocations($row, $allowedStockLocations);
                             if (!empty($invalidLocations)) {
                                 $isFailedRow = true;
                                 log_message('error', 'CSV import: Invalid stock location(s) found: ' . implode(', ', $invalidLocations));
@@ -1053,43 +1051,28 @@ class Items extends Secure_Controller
                         }
 
                         // Remove false, null, '' and empty strings but keep 0
-                        $itemData = array_filter($itemData, function ($value) {
+                        $item_data = array_filter($item_data, function ($value) {
                             return $value !== null && strlen($value);
                         });
 
-                        if (!$isFailedRow && $this->item->save_value($itemData, $itemId)) {
-                            if (!$this->save_tax_data($row, $itemData)) {
-                                $isFailedRow = true;
-                            }
-                            if (!$this->save_inventory_quantities($row, $itemData, $allowedStockLocations, $employeeId)) {
-                                $isFailedRow = true;
-                            }
-                            $csvAttributeValues = $this->extractAttributeData($row);
-                            if (!$this->attribute->saveCSVRowAttributeData($csvAttributeValues, $itemData, $attributeData)) {
-                                $isFailedRow = true;
-                            }
-                            if ($isFailedRow) {
-                                $failedRow = $key + 2;
-                                $failCodes[] = $failedRow;
-                                log_message('error', "CSV Item import failed on line $failedRow while saving item.");
-                                continue;
-                            }
+                        if (!$is_failed_row && $this->item->save_value($item_data, $item_id)) {
+                            $this->save_tax_data($row, $item_data);
+                            $this->save_inventory_quantities($row, $item_data, $allowed_stock_locations, $employee_id);
+                            $is_failed_row = $this->save_attribute_data($row, $item_data, $attribute_data);    // TODO: $is_failed_row never gets used after this.
 
-                            if ($isUpdate) {
-                                $itemData = array_merge($itemData, get_object_vars($this->item->get_info_by_id_or_number($itemId)));
+                            if ($is_update) {
+                                $item_data = array_merge($item_data, get_object_vars($this->item->get_info_by_id_or_number($item_id)));
                             }
-
-                            $itemIds[] = $itemData['item_id'];
                         } else {
-                            $failedRow = $key + 2;
-                            $failCodes[] = $failedRow;
-                            log_message('error', "CSV Item import failed on line $failedRow. This item was not imported.");
+                            $failed_row = $key + 2;
+                            $failCodes[] = $failed_row;
+                            log_message('error', "CSV Item import failed on line $failed_row. This item was not imported.");
                         }
 
-                        unset($csvRows[$key]);
+                        unset($csv_rows[$key]);
                     }
 
-                    $csvRows = null;
+                    $csv_rows = null;
 
                     if (count($failCodes) > 0) {
                         $message = lang('Items.csv_import_partially_failed', [count($failCodes), implode(', ', $failCodes)]);
@@ -1097,9 +1080,6 @@ class Items extends Secure_Controller
                         return $this->response->setJSON(['success' => false, 'message' => $message]);
                     } else {
                         $db->transCommit();
-                        $this->attribute->deleteOrphanedValues();
-
-                        Events::trigger('item_saved', [$itemIds]);
 
                         return $this->response->setJSON(['success' => true, 'message' => lang('Items.csv_import_success')]);
                     }
@@ -1113,20 +1093,6 @@ class Items extends Secure_Controller
 
     }
 
-    private function extractAttributeData(array $row): array
-    {
-        $attributeData = [];
-
-        foreach ($row as $key => $value) {
-            if (str_starts_with($key, 'attribute_')) {
-                $definitionName = substr($key, 10);
-                $attributeData[$definitionName] = $value;
-            }
-        }
-
-        return $attributeData;
-    }
-
     /**
      * Validates that stock location columns in CSV row are valid locations
      *
@@ -1155,99 +1121,87 @@ class Items extends Secure_Controller
      * Checks the entire line of data in an import file for errors
      *
      * @param array $row
-     * @param array $itemData
-     * @param array $allowedStockLocations
-     * @param array $definitionNames
-     * @param array $attributeData
+     * @param array $item_data
+     * @param array $allowed_locations
+     * @param array $definition_names
+     * @param array $attribute_data
      * @return    bool    Returns false if all data checks out and true when there is an error in the data
      */
-    private function validateCSVData(array $row, array $itemData, array $allowedStockLocations, array $definitionNames, array $attributeData): bool    // TODO: Long function and large number of parameters in the declaration... perhaps refactoring is needed
+    private function data_error_check(array $row, array $item_data, array $allowed_locations, array $definition_names, array $attribute_data): bool    // TODO: Long function and large number of parameters in the declaration... perhaps refactoring is needed
     {
-        $itemId = $row['Id'];
-        $isUpdate = (bool)$itemId;
+        $item_id = $row['Id'];
+        $is_update = (bool)$item_id;
 
         // Check for empty required fields
-        $valuesToCheckForEmpty = [
-            'name'       => $itemData['name'],
-            'category'   => $itemData['category'],
-            'unit_price' => $itemData['unit_price']
+        $check_for_empty = [
+            'name'       => $item_data['name'],
+            'category'   => $item_data['category'],
+            'unit_price' => $item_data['unit_price']
         ];
 
-        foreach ($valuesToCheckForEmpty as $key => $value) {
-            if (($value === null || $value === '') && !$isUpdate) {
+        foreach ($check_for_empty as $key => $val) {
+            if (empty($val) && !$is_update) {
                 log_message('error', "Empty required value in $key.");
                 return true;
             }
         }
 
-        if (!$isUpdate) {
-            $itemData['cost_price'] = empty($itemData['cost_price']) ? 0 : $itemData['cost_price'];    // Allow for zero wholesale price
+        if (!$is_update) {
+            $item_data['cost_price'] = empty($item_data['cost_price']) ? 0 : $item_data['cost_price'];    // Allow for zero wholesale price
         } else {
-            if (!$this->item->exists($itemId)) {
-                log_message('error', "non-existent item_id: '$itemId' when either existing item_id or no item_id is required.");
+            if (!$this->item->exists($item_id)) {
+                log_message('error', "non-existent item_id: '$item_id' when either existing item_id or no item_id is required.");
                 return true;
             }
         }
 
         // Build array of fields to check for numerics
-        $valuesToCheckForNumeric = [
-            'cost_price'    => $itemData['cost_price'],
-            'unit_price'    => $itemData['unit_price'],
-            'reorder_level' => $itemData['reorder_level'],
+        $check_for_numeric_values = [
+            'cost_price'    => $item_data['cost_price'],
+            'unit_price'    => $item_data['unit_price'],
+            'reorder_level' => $item_data['reorder_level'],
             'supplier_id'   => $row['Supplier ID'],
             'Tax 1 Percent' => $row['Tax 1 Percent'],
             'Tax 2 Percent' => $row['Tax 2 Percent']
         ];
 
-        foreach ($allowedStockLocations as $location_name) {
-            $valuesToCheckForNumeric[] = $row["location_$location_name"];
+        foreach ($allowed_locations as $location_name) {
+            $check_for_numeric_values[] = $row["location_$location_name"];
         }
 
         // Check for non-numeric values which require numeric
-        foreach ($valuesToCheckForNumeric as $key => $value) {
+        foreach ($check_for_numeric_values as $key => $value) {
             if (!is_numeric($value) && !empty($value)) {
                 log_message('error', "non-numeric: '$value' for '$key' when numeric is required");
                 return true;
             }
         }
 
-        // Check stock locations
-        $invalidLocations = $this->validateCSVStockLocations($row, $allowedStockLocations);
-        if (!empty($invalidLocations)) {
-            log_message('error', 'CSV import: Invalid stock location(s) found: ' . implode(', ', $invalidLocations));
-            return true;
-        }
-
         // Check Attribute Data
-        foreach ($definitionNames as $definitionName) {
-            $attributeColumn = "attribute_$definitionName";
-            if (array_key_exists($attributeColumn, $row) && $row[$attributeColumn] != '') {
-                $definitionType = $attributeData[$definitionName]['definition_type'];
-                $attributeValue = $row[$attributeColumn];
+        foreach ($definition_names as $definition_name) {
+            if (!empty($row["attribute_$definition_name"])) {
+                $definition_type = $attribute_data[$definition_name]['definition_type'];
+                $attribute_value = $row["attribute_$definition_name"];
 
-                if (strcasecmp($attributeValue, '_DELETE_') === 0) {
-                    continue;
-                }
-
-                switch ($definitionType) {
+                switch ($definition_type) {
                     case DROPDOWN:
-                        $dropdownValues = $attributeData[$definitionName]['dropdown_values'];
-                        $dropdownValues[] = '';
+                        $dropdown_values = $attribute_data[$definition_name]['dropdown_values'];
+                        $dropdown_values[] = '';
 
-                        if (!empty($attributeValue) && !in_array($attributeValue, $dropdownValues)) {
-                            log_message('error', "Value: '$attributeValue' is not an acceptable DROPDOWN value");
+                        if (!empty($attribute_value) && !in_array($attribute_value, $dropdown_values)) {
+                            log_message('error', "Value: '$attribute_value' is not an acceptable DROPDOWN value");
                             return true;
                         }
                         break;
                     case DECIMAL:
-                        if (!is_numeric($attributeValue) && !empty($attributeValue)) {
-                            log_message('error', "'$attributeValue' is not an acceptable DECIMAL value");
+                        if (!is_numeric($attribute_value) && !empty($attribute_value)) {
+                            log_message('error', "'$attribute_value' is not an acceptable DECIMAL value");
                             return true;
                         }
                         break;
                     case DATE:
-                        if (!valid_date($attributeValue) && !empty($attributeValue)) {
-                            log_message('error', "'$attributeValue' is not an acceptable DATE value. The value must match the set locale.");
+                        if (!valid_date($attribute_value) && !empty($attribute_value)) {
+                            log_message('error', "'$attribute_value' is not an acceptable DATE value. The value must match the set locale.");
                             return true;
                         }
                         break;
@@ -1258,6 +1212,59 @@ class Items extends Secure_Controller
         return false;
     }
 
+    /**
+     * Saves attribute data found in the CSV import.
+     *
+     * @param array $row
+     * @param array $item_data
+     * @param array $definitions
+     * @return bool
+     */
+    private function save_attribute_data(array $row, array $item_data, array $definitions): bool
+    {
+        foreach ($definitions as $definition) {
+            $attribute_name = $definition['definition_name'];
+            $attribute_value = $row["attribute_$attribute_name"];
+
+            // Create attribute value
+            if (!empty($attribute_value) || $attribute_value === '0') {
+                if ($definition['definition_type'] === CHECKBOX) {
+                    $checkbox_is_unchecked = (strcasecmp($attribute_value, 'false') === 0 || $attribute_value === '0');
+                    $attribute_value = $checkbox_is_unchecked ? '0' : '1';
+
+                    $attribute_id = $this->store_attribute_value($attribute_value, $definition, $item_data['item_id']);
+                } elseif (!empty($attribute_value)) {
+                    $attribute_id = $this->store_attribute_value($attribute_value, $definition, $item_data['item_id']);
+                } else {
+                    return true;
+                }
+
+                if (!$attribute_id) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Saves the attribute_value and attribute_link if necessary
+     */
+    private function store_attribute_value(string $value, array $attribute_data, int $item_id)
+    {
+        $attribute_id = $this->attribute->attributeValueExists($value, $attribute_data['definition_type']);
+
+        $this->attribute->deleteAttributeLinks($item_id, $attribute_data['definition_id']);
+
+        if (!$attribute_id) {
+            $attribute_id = $this->attribute->saveAttributeValue($value, $attribute_data['definition_id'], $item_id, false, $attribute_data['definition_type']);
+        } elseif (!$this->attribute->saveAttributeLink($item_id, $attribute_data['definition_id'], $attribute_id)) {
+            return false;
+        }
+
+        return $attribute_id;
+    }
+
     /**
      * Saves inventory quantities for the row in the appropriate stock locations.
      *
@@ -1265,15 +1272,13 @@ class Items extends Secure_Controller
      * @param array $item_data
      * @param array $allowed_locations
      * @param int $employee_id
-     * @return bool Returns true on success, false on failure
      * @throws ReflectionException
      */
-    private function save_inventory_quantities(array $row, array $item_data, array $allowed_locations, int $employee_id): bool
+    private function save_inventory_quantities(array $row, array $item_data, array $allowed_locations, int $employee_id): void
     {
         // Quantities & Inventory Section
         $comment = lang('Items.inventory_CSV_import_quantity');
         $is_update = (bool)$row['Id'];
-        $success = true;
 
         foreach ($allowed_locations as $location_id => $location_name) {
             $item_quantity_data = ['item_id' => $item_data['item_id'], 'location_id' => $location_id];
@@ -1287,22 +1292,20 @@ class Items extends Secure_Controller
 
             if (!empty($row["location_$location_name"]) || $row["location_$location_name"] === '0') {
                 $item_quantity_data['quantity'] = $row["location_$location_name"];
-                $success &= $this->item_quantity->save_value($item_quantity_data, $item_data['item_id'], $location_id);
+                $this->item_quantity->save_value($item_quantity_data, $item_data['item_id'], $location_id);
 
                 $csv_data['trans_inventory'] = $row["location_$location_name"];
-                $success &= (bool)$this->inventory->insert($csv_data, false);
+                $this->inventory->insert($csv_data, false);
             } elseif ($is_update) {
-                continue;
+                return;
             } else {
                 $item_quantity_data['quantity'] = 0;
-                $success &= $this->item_quantity->save_value($item_quantity_data, $item_data['item_id'], $location_id);
+                $this->item_quantity->save_value($item_quantity_data, $item_data['item_id'], $location_id);
 
                 $csv_data['trans_inventory'] = 0;
-                $success &= (bool)$this->inventory->insert($csv_data, false);
+                $this->inventory->insert($csv_data, false);
             }
         }
-
-        return (bool)$success;
     }
 
     /**
@@ -1310,9 +1313,8 @@ class Items extends Secure_Controller
      *
      * @param array $row
      * @param array $item_data
-     * @return bool Returns true on success, false on failure
      */
-    private function save_tax_data(array $row, array $item_data): bool
+    private function save_tax_data(array $row, array $item_data): void
     {
         $items_taxes_data = [];
 
@@ -1324,11 +1326,9 @@ class Items extends Secure_Controller
             $items_taxes_data[] = ['name' => $row['Tax 2 Name'], 'percent' => $row['Tax 2 Percent']];
         }
 
-        if (!empty($items_taxes_data)) {
-            return $this->item_taxes->save_value($items_taxes_data, $item_data['item_id']);
+        if (isset($items_taxes_data)) {
+            $this->item_taxes->save_value($items_taxes_data, $item_data['item_id']);
         }
-
-        return true;
     }
 
     /**
@@ -1358,11 +1358,10 @@ class Items extends Secure_Controller
      * Saves item attributes for a given item.
      *
      * @param int $itemId The item for which attributes need to be saved to.
-     * @return bool Returns true when item attributes are successfully saved and false on error.
+     * @return void
      */
-    public function saveItemAttributes(int $itemId): bool
+    public function saveItemAttributes(int $itemId): void
     {
-        $success = true;
         $attributeLinks = $this->request->getPost('attribute_links') ?? [];
         $attributeIds = $this->request->getPost('attribute_ids');
 
@@ -1374,18 +1373,16 @@ class Items extends Secure_Controller
             switch ($definitionType) {
                 case DROPDOWN:
                     $attributeId = $attributeValue;
-                    $success = $success && $this->attribute->saveAttributeLink($itemId, $definitionId, $attributeId);
                     break;
                 case DECIMAL:
                     $attributeValue = parse_decimals($attributeValue);
-                    // no break
+                // Fall through to save the attribute value
                 default:
                     $attributeId = $this->attribute->saveAttributeValue($attributeValue, $definitionId, $itemId, $attributeIds[$definitionId], $definitionType);
-                    $success = $success && ($attributeId > 0);
                     break;
             }
-        }
 
-        return $success && $this->attribute->deleteOrphanedValues();
+            $this->attribute->saveAttributeLink($itemId, $definitionId, $attributeId);
+        }
     }
 }

app/Controllers/Login.php

@@ -49,13 +49,6 @@ class Login extends BaseController
                 return view('login', $data);
             }
 
-            if (!$data['is_latest'] || $data['is_new_install']) {
-                set_time_limit(3600);
-
-                $migration->setNamespace('App')->latest();
-                return redirect()->to('login');
-            }
-
             $rules = ['username' => 'required|login_check[data]'];
             $messages = [
                 'username' => [
@@ -69,6 +62,13 @@ class Login extends BaseController
 
                 return view('login', $data);
             }
+
+            if (!$data['is_latest']) {
+                set_time_limit(3600);
+
+                $migration->setNamespace('App')->latest();
+                return redirect()->to('login');
+            }
         }
 
         return redirect()->to('home');
@@ -79,18 +79,18 @@ class Login extends BaseController
         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()

app/Controllers/Messages.php

@@ -33,7 +33,7 @@ class Messages extends Secure_Controller
     public function getView(int $person_id = NEW_ENTRY): string
     {
         $person = model(Person::class);
-        $info = $person->getInfo($person_id);
+        $info = $person->get_info($person_id);
 
         foreach (get_object_vars($info) as $property => $value) {
             $info->$property = $value;

app/Controllers/Persons.php

@@ -49,7 +49,7 @@ abstract class Persons extends Secure_Controller
      */
     public function getRow(int $row_id): ResponseInterface
     {
-        $data_row = get_person_data_row($this->person->getInfo($row_id));
+        $data_row = get_person_data_row($this->person->get_info($row_id));
 
         return $this->response->setJSON($data_row);
     }

app/Controllers/Plugins.php

@@ -1,169 +0,0 @@
-<?php
-
-namespace App\Controllers;
-
-use App\Libraries\Plugins\PluginManager;
-use CodeIgniter\HTTP\ResponseInterface;
-
-class Plugins extends Secure_Controller
-{
-    private PluginManager $pluginManager;
-
-    public function __construct()
-    {
-        parent::__construct('plugins');
-        $this->pluginManager = service('pluginManager');
-    }
-
-    public function getIndex(): string
-    {
-        $data['table_headers'] = get_plugin_manage_table_headers();
-        return view('plugins/manage', $data);
-    }
-
-    public function getSearch(): ResponseInterface
-    {
-        $search = strtolower($this->request->getGet('search') ?? '');
-        $limit  = (int)($this->request->getGet('limit') ?? 0);
-        $offset = (int)($this->request->getGet('offset') ?? 0);
-        $sort   = $this->sanitizeSortColumn(plugin_headers(), $this->request->getGet('sort', FILTER_SANITIZE_FULL_SPECIAL_CHARS), 'name');
-        $order  = strtolower($this->request->getGet('order', FILTER_SANITIZE_FULL_SPECIAL_CHARS) ?? 'asc');
-
-        $pluginData = $this->buildPluginDataArray();
-
-        if ($search !== '') {
-            $pluginData = array_values(array_filter($pluginData, static function (array $p) use ($search): bool {
-                return str_contains(strtolower($p['name']), $search)
-                    || str_contains(strtolower($p['description']), $search)
-                    || str_contains(strtolower($p['id']), $search);
-            }));
-        }
-
-        $total = count($pluginData);
-
-        usort($pluginData, static function (array $a, array $b) use ($sort, $order): int {
-            $valA = strtolower($a[$sort] ?? $a['name']);
-            $valB = strtolower($b[$sort] ?? $b['name']);
-            return $order === 'asc' ? strcmp($valA, $valB) : strcmp($valB, $valA);
-        });
-
-        $pluginData = $limit > 0 ? array_slice($pluginData, $offset, $limit) : array_slice($pluginData, $offset);
-
-        return $this->response->setJSON(['total' => $total, 'rows' => array_map('get_plugin_data_row', $pluginData)]);
-    }
-
-    public function getRow(string $pluginId): ResponseInterface
-    {
-        $plugin = $this->pluginManager->getPlugin($pluginId);
-        if (!$plugin) {
-            return $this->response->setJSON(['success' => false, 'message' => lang('Plugins.not_found')]);
-        }
-
-        $enabled = $this->pluginManager->getEnabledPlugins();
-        $pluginData = [
-            'id'          => $plugin->getPluginId(),
-            'name'        => $plugin->getPluginName(),
-            'description' => $plugin->getPluginDescription(),
-            'version'     => $plugin->getVersion(),
-            'enabled'     => isset($enabled[$pluginId]),
-            'has_config'  => $plugin->getConfigView() !== null,
-        ];
-
-        return $this->response->setJSON(get_plugin_data_row($pluginData));
-    }
-
-    private function buildPluginDataArray(): array
-    {
-        $plugins = $this->pluginManager->getAllPlugins();
-        $enabled = $this->pluginManager->getEnabledPlugins();
-        $result  = [];
-
-        foreach ($plugins as $pluginId => $plugin) {
-            $result[] = [
-                'id'          => $plugin->getPluginId(),
-                'name'        => $plugin->getPluginName(),
-                'description' => $plugin->getPluginDescription(),
-                'version'     => $plugin->getVersion(),
-                'enabled'     => isset($enabled[$pluginId]),
-                'has_config'  => $plugin->getConfigView() !== null,
-            ];
-        }
-
-        return $result;
-    }
-
-    public function postEnable(string $pluginId): ResponseInterface
-    {
-        if ($this->pluginManager->enablePlugin($pluginId)) {
-            return $this->response->setJSON(['success' => true, 'message' => lang('Plugins.enabled')]);
-        }
-        return $this->response->setJSON(['success' => false, 'message' => lang('Plugins.enable_failed')]);
-    }
-
-    public function postDisable(string $pluginId): ResponseInterface
-    {
-        if ($this->pluginManager->disablePlugin($pluginId)) {
-            return $this->response->setJSON(['success' => true, 'message' => lang('Plugins.disabled')]);
-        }
-        return $this->response->setJSON(['success' => false, 'message' => lang('Plugins.disable_failed')]);
-    }
-
-    public function postUninstall(string $pluginId): ResponseInterface
-    {
-        if ($this->pluginManager->uninstallPlugin($pluginId)) {
-            return $this->response->setJSON(['success' => true, 'message' => lang('Plugins.uninstalled')]);
-        }
-        return $this->response->setJSON(['success' => false, 'message' => lang('Plugins.uninstall_failed')]);
-    }
-
-    public function getConfig(string $pluginId): ResponseInterface
-    {
-        $plugin = $this->pluginManager->getPlugin($pluginId);
-
-        if (!$plugin) {
-            return $this->response->setJSON(['success' => false, 'message' => lang('Plugins.not_found')]);
-        }
-
-        $configView = $plugin->getConfigView();
-        if (!$configView) {
-            return $this->response->setJSON(['success' => false, 'message' => lang('Plugins.no_config')]);
-        }
-
-        $settings = $plugin->getSettings();
-        $data     = array_merge(['settings' => $settings, 'plugin' => $plugin], $plugin->getConfigViewData());
-
-        // Plugin views may live outside app/Views/ (absolute path from plugin's __DIR__)
-        if (is_file($configView . '.php')) {
-            $renderer = \Config\Services::renderer(dirname($configView) . DIRECTORY_SEPARATOR, null, false);
-            echo $renderer->setData($data)->render(basename($configView));
-        } else {
-            echo view($configView, $data);
-        }
-
-        return $this->response;
-    }
-
-    /**
-     * Save plugin settings by calling the plugin's saveSettings method.
-     *
-     * @param string $pluginId The plugin ID for the current plugin
-     * @return ResponseInterface The JSON response
-     * @noinspection PhpUnused Called via AJAX
-     */
-    public function postSaveConfig(string $pluginId): ResponseInterface
-    {
-        $plugin = $this->pluginManager->getPlugin($pluginId);
-
-        if (!$plugin) {
-            return $this->response->setJSON(['success' => false, 'message' => lang('Plugins.not_found')]);
-        }
-
-        $settings = $this->request->getPost();
-        unset($settings['_method'], $settings[csrf_token()]);
-
-        if ($plugin->saveSettings($settings)) {
-            return $this->response->setJSON(['success' => true, 'message' => lang('Plugins.settings_saved')]);
-        }
-        return $this->response->setJSON(['success' => false, 'message' => lang('Plugins.settings_save_failed')]);
-    }
-}

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\Events\Events;
 use CodeIgniter\HTTP\ResponseInterface;
 use Config\OSPOS;
 use Config\Services;
@@ -191,11 +190,11 @@ class Receivings extends Secure_Controller
     /**
      * Edit line item in current receiving. Used in app/Views/receivings/receiving.php
      *
-     * @param int|string|null $item_id
+     * @param string|int|null $item_id
      * @return string
      * @noinspection PhpUnused
      */
-    public function postEditItem(int|string|null $item_id): string
+    public function postEditItem($item_id): string
     {
         $data = [];
 
@@ -243,7 +242,7 @@ class Receivings extends Secure_Controller
         }
 
         $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);
 
@@ -254,7 +253,7 @@ class Receivings extends Secure_Controller
             }
         } else {
             $stored_employee_id = $receiving_info['employee_id'];
-            $stored_employee = $this->employee->getInfo($stored_employee_id);
+            $stored_employee = $this->employee->get_info($stored_employee_id);
             $data['employees'][$stored_employee_id] = $stored_employee->first_name . ' ' . $stored_employee->last_name;
         }
 
@@ -281,10 +280,8 @@ class Receivings extends Secure_Controller
     }
 
     /**
-     * @param int $receiving_id
-     * @param bool $update_inventory
-     * @return ResponseInterface
      * @throws ReflectionException
+     * @return ResponseInterface
      */
     public function postDelete(int $receiving_id = -1, bool $update_inventory = true): ResponseInterface
     {
@@ -343,12 +340,12 @@ class Receivings extends Secure_Controller
         }
 
         $employee_id = $this->employee->get_logged_in_employee_info()->person_id;
-        $employee_info = $this->employee->getInfo($employee_id);
+        $employee_info = $this->employee->get_info($employee_id);
         $data['employee'] = $employee_info->first_name . ' ' . $employee_info->last_name;
 
         $supplier_id = $this->receiving_lib->get_supplier();
         if ($supplier_id != -1) {
-            $supplier_info = $this->supplier->getInfo($supplier_id);
+            $supplier_info = $this->supplier->get_info($supplier_id);
             $data['supplier'] = $supplier_info->company_name;    // TODO: duplicated code
             $data['first_name'] = $supplier_info->first_name;
             $data['last_name'] = $supplier_info->last_name;
@@ -368,7 +365,6 @@ class Receivings extends Secure_Controller
             $data['error_message'] = lang('Receivings.transaction_failed');
         } else {
             $data['barcode'] = $this->barcode_lib->generate_receipt_barcode($data['receiving_id']);
-            Events::trigger('receiving_complete', (int) substr($data['receiving_id'], 5), $data['mode']);
         }
 
         $data['print_after_sale'] = $this->receiving_lib->is_print_after_sale();
@@ -424,12 +420,12 @@ class Receivings extends Secure_Controller
         $data['reference'] = $this->receiving_lib->get_reference();
         $data['receiving_id'] = 'RECV ' . $receiving_id;
         $data['barcode'] = $this->barcode_lib->generate_receipt_barcode($data['receiving_id']);
-        $employee_info = $this->employee->getInfo($receiving_info['employee_id']);
+        $employee_info = $this->employee->get_info($receiving_info['employee_id']);
         $data['employee'] = $employee_info->first_name . ' ' . $employee_info->last_name;
 
         $supplier_id = $this->receiving_lib->get_supplier();    // TODO: Duplicated code
         if ($supplier_id != -1) {
-            $supplier_info = $this->supplier->getInfo($supplier_id);
+            $supplier_info = $this->supplier->get_info($supplier_id);
             $data['supplier'] = $supplier_info->company_name;
             $data['first_name'] = $supplier_info->first_name;
             $data['last_name'] = $supplier_info->last_name;
@@ -477,7 +473,7 @@ class Receivings extends Secure_Controller
         $supplier_id = $this->receiving_lib->get_supplier();
 
         if ($supplier_id != -1) {    // TODO: Duplicated Code... replace -1 with a constant
-            $supplier_info = $this->supplier->getInfo($supplier_id);
+            $supplier_info = $this->supplier->get_info($supplier_id);
             $data['supplier'] = $supplier_info->company_name;
             $data['first_name'] = $supplier_info->first_name;
             $data['last_name'] = $supplier_info->last_name;

app/Controllers/Reports.php

@@ -1246,15 +1246,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')
         ];
     }
 
@@ -1343,7 +1341,7 @@ class Reports extends Secure_Controller
             }
         }
 
-        $customer_info = $this->customer->getInfo($customer_id);
+        $customer_info = $this->customer->get_info($customer_id);
         $customer_name = !empty($customer_info->company_name)    // TODO: This variable is not used anywhere in the code. Should it be or can it be deleted?
             ? "[ $customer_info->company_name ]"
             : $customer_info->company_name;
@@ -1470,7 +1468,7 @@ class Reports extends Secure_Controller
             }
         }
 
-        $employee_info = $this->employee->getInfo($employee_id);
+        $employee_info = $this->employee->get_info($employee_id);
         // TODO: Duplicated Code
         $data = [
             'title'                => $employee_info->first_name . ' ' . $employee_info->last_name . ' ' . lang('Reports.report'),
@@ -1736,7 +1734,7 @@ class Reports extends Secure_Controller
             ];
         }
 
-        $supplier_info = $this->supplier->getInfo((int) $supplier_id);
+        $supplier_info = $this->supplier->get_info((int) $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]),

app/Controllers/Sales.php

@@ -20,7 +20,6 @@ use App\Models\Stock_location;
 use App\Models\Tokens\Token_invoice_count;
 use App\Models\Tokens\Token_customer;
 use App\Models\Tokens\Token_invoice_sequence;
-use CodeIgniter\Events\Events;
 use CodeIgniter\HTTP\ResponseInterface;
 use Config\Services;
 use Config\OSPOS;
@@ -94,8 +93,6 @@ class Sales extends Secure_Controller
                 'only_check'        => lang('Sales.check_filter'),
                 'only_creditcard'   => lang('Sales.credit_filter'),
                 'only_debit'        => lang('Sales.debit'),
-                'only_bank_transfer'=> lang('Sales.bank_transfer'),
-                'only_wallet'       => lang('Sales.wallet'),
                 'only_invoices'     => lang('Sales.invoice_filter'),
                 'selected_customer' => lang('Sales.selected_customer')
             ];
@@ -159,10 +156,8 @@ class Sales extends Secure_Controller
             'selected_customer' => false,
             'only_creditcard'   => false,
             'only_debit'        => false,
-            'only_bank_transfer'=> false,
-            'only_wallet'       => false,
             'only_invoices'     => $this->config['invoice_enable'] && $this->request->getGet('only_invoices', FILTER_SANITIZE_NUMBER_INT),
-            'is_valid_receipt'  => $this->sale->isValidReceipt($search)
+            'is_valid_receipt'  => $this->sale->is_valid_receipt($search)
         ];
 
         // Check if any filter is set in the multiselect dropdown
@@ -199,7 +194,7 @@ class Sales extends Secure_Controller
             ? $this->request->getGet('term')
             : null;
 
-        if ($this->sale_lib->get_mode() == 'return' && $this->sale->isValidReceipt($receipt)) {
+        if ($this->sale_lib->get_mode() == 'return' && $this->sale->is_valid_receipt($receipt)) {
             // If a valid receipt or invoice was found the search term will be replaced with a receipt number (POS #)
             $suggestions[] = $receipt;
         }
@@ -234,8 +229,8 @@ class Sales extends Secure_Controller
         $customer_id = (int)$this->request->getPost('customer', FILTER_SANITIZE_NUMBER_INT);
         if ($this->customer->exists($customer_id)) {
             $this->sale_lib->set_customer($customer_id);
-            $discount = $this->customer->getInfo($customer_id)->discount;
-            $discount_type = $this->customer->getInfo($customer_id)->discount_type;
+            $discount = $this->customer->get_info($customer_id)->discount;
+            $discount_type = $this->customer->get_info($customer_id)->discount_type;
 
             // Apply customer default discount to items that have 0 discount
             if ($discount != '') {
@@ -430,7 +425,7 @@ class Sales extends Secure_Controller
                     $new_giftcard_value = $giftcard->get_giftcard_value($giftcard_num) - $this->sale_lib->get_amount_due();
                     $new_giftcard_value = max($new_giftcard_value, 0);
                     $this->sale_lib->set_giftcard_remainder($new_giftcard_value);
-                    $new_giftcard_value = to_currency($new_giftcard_value);
+                    $new_giftcard_value = str_replace('$', '\$', to_currency($new_giftcard_value));
                     $data['warning'] = lang('Giftcards.remaining_balance', [$giftcard_num, $new_giftcard_value]);
                     $amount_tendered = min($this->sale_lib->get_amount_due(), $giftcard->get_giftcard_value($giftcard_num));
 
@@ -438,9 +433,9 @@ class Sales extends Secure_Controller
                 }
             } elseif ($payment_type === lang('Sales.rewards')) {
                 $customer_id = $this->sale_lib->get_customer();
-                $package_id = $this->customer->getInfo($customer_id)->package_id;
+                $package_id = $this->customer->get_info($customer_id)->package_id;
                 if (!empty($package_id)) {
-                    $points = $this->customer->getInfo($customer_id)->points;
+                    $points = $this->customer->get_info($customer_id)->points;
                     $points = ($points == null ? 0 : $points);
 
                     $payments = $this->sale_lib->get_payments();
@@ -512,8 +507,8 @@ class Sales extends Secure_Controller
         $customer_id = $this->sale_lib->get_customer();
         if ($customer_id != NEW_ENTRY) {
             // Load the customer discount if any
-            $customer_discount = $this->customer->getInfo($customer_id)->discount;
-            $customer_discount_type = $this->customer->getInfo($customer_id)->discount_type;
+            $customer_discount = $this->customer->get_info($customer_id)->discount;
+            $customer_discount_type = $this->customer->get_info($customer_id)->discount_type;
             if ($customer_discount != '') {
                 $discount = $customer_discount;
                 $discount_type = $customer_discount_type;
@@ -526,7 +521,7 @@ class Sales extends Secure_Controller
         $quantity = ($mode == 'return') ? -$quantity : $quantity;
         $item_location = $this->sale_lib->get_sale_location();
 
-        if ($mode == 'return' && $this->sale->isValidReceipt($item_id_or_number_or_item_kit_or_receipt)) {
+        if ($mode == 'return' && $this->sale->is_valid_receipt($item_id_or_number_or_item_kit_or_receipt)) {
             $this->sale_lib->return_entire_sale($item_id_or_number_or_item_kit_or_receipt);
         } elseif ($this->item_kit->is_valid_item_kit($item_id_or_number_or_item_kit_or_receipt)) {
             // Add kit item to order if one is assigned
@@ -704,7 +699,7 @@ class Sales extends Secure_Controller
         $data['show_stock_locations'] = $this->stock_location->show_locations('sales');
         $data['comments'] = $this->sale_lib->get_comment();
         $employee_id = $this->employee->get_logged_in_employee_info()->person_id;
-        $employee_info = $this->employee->getInfo($employee_id);
+        $employee_info = $this->employee->get_info($employee_id);
         $data['employee'] = $employee_info->first_name . ' ' . mb_substr($employee_info->last_name, 0, 1);
 
         $data['company_info'] = implode("\n", [$this->config['address'], $this->config['phone']]);
@@ -801,7 +796,7 @@ class Sales extends Secure_Controller
 
             if ($sale_id == NEW_ENTRY && $this->sale->check_invoice_number_exists($invoice_number)) {
                 $data['error'] = lang('Sales.invoice_number_duplicate', [$invoice_number]);
-                return $this->_reload($data);
+                $this->_reload($data);
             } else {
                 $data['invoice_number'] = $invoice_number;
                 $data['sale_status'] = COMPLETED;
@@ -822,7 +817,6 @@ class Sales extends Secure_Controller
 
                 if ($data['sale_id_num'] == NEW_ENTRY) {
                     $data['error_message'] = lang('Sales.transaction_failed');
-                    return $this->_reload($data);
                 } else {
                     $data['barcode'] = $this->barcode_lib->generate_receipt_barcode($data['sale_id']);
                     $this->sale_lib->clear_all();
@@ -846,7 +840,7 @@ class Sales extends Secure_Controller
 
             if ($sale_id == NEW_ENTRY && $this->sale->check_work_order_number_exists($work_order_number)) {
                 $data['error'] = lang('Sales.work_order_number_duplicate');
-                return $this->_reload($data);
+                $this->_reload($data);
             } else {
                 $data['work_order_number'] = $work_order_number;
                 $data['sale_status'] = SUSPENDED;
@@ -874,7 +868,7 @@ class Sales extends Secure_Controller
 
             if ($sale_id == NEW_ENTRY && $this->sale->check_quote_number_exists($quote_number)) {
                 $data['error'] = lang('Sales.quote_number_duplicate');
-                return $this->_reload($data);
+                $this->_reload($data);
             } else {
                 $data['quote_number'] = $quote_number;
                 $data['sale_status'] = SUSPENDED;
@@ -906,19 +900,8 @@ class Sales extends Secure_Controller
 
             if ($data['sale_id_num'] == NEW_ENTRY) {
                 $data['error_message'] = lang('Sales.transaction_failed');
-                return $this->_reload($data);
             } else {
                 $data['barcode'] = $this->barcode_lib->generate_receipt_barcode($data['sale_id']);
-
-                // Validate receipt template to prevent path traversal
-                $receipt_template = $this->config['receipt_template'] ?? '';
-                if (!Sale_lib::isValidReceiptTemplate($receipt_template)) {
-                    $receipt_template = 'receipt_default';
-                }
-                $data['receipt_template_view'] = $receipt_template;
-
-                Events::trigger('sale_complete', $data['sale_id_num'], $sale_type);
-
                 $this->sale_lib->clear_all();
                 return view('sales/receipt', $data);
             }
@@ -952,10 +935,7 @@ class Sales extends Secure_Controller
                 new Token_customer((array)$sale_data)
             ];
             $text = $this->token_lib->render($text, $tokens);
-            $sale_data['mimetype'] = $this->email_lib->getLogoMimeType();
-
-            // Build img_tag for email views that need it (receipt_email.php)
-            $sale_data['img_tag'] = $this->email_lib->buildLogoImgTag();
+            $sale_data['mimetype'] = mime_content_type(FCPATH . 'uploads/' . $this->config['company_logo']);
 
             // Generate email attachment: invoice in PDF format
             $view = Services::renderer();
@@ -992,7 +972,13 @@ class Sales extends Secure_Controller
 
         if (!empty($sale_data['customer_email'])) {
             $sale_data['barcode'] = $this->barcode_lib->generate_receipt_barcode($sale_data['sale_id']);
-            $sale_data['img_tag'] = $this->email_lib->buildLogoImgTag();
+            $sale_data['img_tag'] = '';
+
+            $logo_path = FCPATH . 'uploads/' . $this->config['company_logo'];
+            if (!empty($this->config['company_logo']) && file_exists($logo_path)) {
+                $logo_data = base64_encode(file_get_contents($logo_path));
+                $sale_data['img_tag'] = '<img id="image" src="data:image/png;base64,' . $logo_data . '" alt="company_logo">';
+            }
 
             $to = $sale_data['customer_email'];
             $subject = lang('Sales.receipt');
@@ -1021,7 +1007,7 @@ class Sales extends Secure_Controller
         $customer_info = '';
 
         if ($customer_id != NEW_ENTRY) {
-            $customer_info = $this->customer->getInfo($customer_id);
+            $customer_info = $this->customer->get_info($customer_id);
             $data['customer_id'] = $customer_id;
 
             if (!empty($customer_info->company_name)) {
@@ -1044,11 +1030,11 @@ class Sales extends Secure_Controller
             $data['customer_account_number'] = $customer_info->account_number;
             $data['customer_discount'] = $customer_info->discount;
             $data['customer_discount_type'] = $customer_info->discount_type;
-            $package_id = $this->customer->getInfo($customer_id)->package_id;
+            $package_id = $this->customer->get_info($customer_id)->package_id;
 
             if ($package_id != null) {
                 $package_name = $this->customer_rewards->get_name($package_id);
-                $points = $this->customer->getInfo($customer_id)->points;
+                $points = $this->customer->get_info($customer_id)->points;
                 $data['customer_rewards']['package_id'] = $package_id;
                 $data['customer_rewards']['points'] = empty($points) ? 0 : $points;
                 $data['customer_rewards']['package_name'] = $package_name;
@@ -1127,7 +1113,7 @@ class Sales extends Secure_Controller
 
         $data['amount_change'] = $data['amount_due'] * -1;
 
-        $employee_info = $this->employee->getInfo($this->sale_lib->get_employee());
+        $employee_info = $this->employee->get_info($this->sale_lib->get_employee());
         $data['employee'] = $employee_info->first_name . ' ' . mb_substr($employee_info->last_name, 0, 1);
         $this->_load_customer_data($this->sale_lib->get_customer(), $data);
 
@@ -1174,13 +1160,6 @@ class Sales extends Secure_Controller
         }
         $data['invoice_view'] = $invoice_type;
 
-        // Validate receipt template to prevent path traversal
-        $receipt_template = $this->config['receipt_template'] ?? '';
-        if (!Sale_lib::isValidReceiptTemplate($receipt_template)) {
-            $receipt_template = 'receipt_default';
-        }
-        $data['receipt_template_view'] = $receipt_template;
-
         return $data;
     }
 
@@ -1275,7 +1254,6 @@ class Sales extends Secure_Controller
 
         $data['quote_number'] = $this->sale_lib->get_quote_number();
         $data['work_order_number'] = $this->sale_lib->get_work_order_number();
-        $data['keyboardShortcuts'] = $this->sale_lib->getKeyShortcuts();
 
         // TODO: the if/else set below should be converted to a switch
         if ($this->sale_lib->get_mode() == 'sale_invoice') {    // TODO: Duplicated code.
@@ -1342,7 +1320,7 @@ class Sales extends Secure_Controller
         $sale_info = $this->sale->get_info($sale_id)->getRowArray();
         $data['selected_customer_id'] = $sale_info['customer_id'];
         $data['selected_customer_name'] = $sale_info['customer_name'];
-        $employee_info = $this->employee->getInfo($sale_info['employee_id']);
+        $employee_info = $this->employee->get_info($sale_info['employee_id']);
         $data['selected_employee_id'] = $sale_info['employee_id'];
         $data['selected_employee_name'] = $employee_info->first_name . ' ' . $employee_info->last_name;
         $data['sale_info'] = $sale_info;
@@ -1664,9 +1642,7 @@ class Sales extends Secure_Controller
      */
     public function getSalesKeyboardHelp(): string
     {
-        return view('sales/help', [
-            'keyboardShortcuts' => $this->sale_lib->getKeyShortcuts()
-        ]);
+        return view('sales/help');
     }
 
     /**
@@ -1717,11 +1693,10 @@ class Sales extends Secure_Controller
         $this->item->update_item_number($item_id, $item_number);
         $cart = $this->sale_lib->get_cart();
         $x = $this->search_cart_for_item_id($item_id, $cart);
-        if ($x !== null) {
+        if ($x != null) {
             $cart[$x]['item_number'] = $item_number;
         }
         $this->sale_lib->set_cart($cart);
-        return $this->response->setJSON(['success' => true]);
     }
 
     /**
@@ -1740,12 +1715,11 @@ class Sales extends Secure_Controller
         $cart = $this->sale_lib->get_cart();
         $x = $this->search_cart_for_item_id($item_id, $cart);
 
-        if ($x !== null) {
+        if ($x != null) {
             $cart[$x]['name'] = $name;
         }
 
         $this->sale_lib->set_cart($cart);
-        return $this->response->setJSON(['success' => true]);
     }
 
     /**
@@ -1764,12 +1738,11 @@ class Sales extends Secure_Controller
         $cart = $this->sale_lib->get_cart();
         $x = $this->search_cart_for_item_id($item_id, $cart);
 
-        if ($x !== null) {
+        if ($x != null) {
             $cart[$x]['description'] = $description;
         }
 
         $this->sale_lib->set_cart($cart);
-        return $this->response->setJSON(['success' => true]);
     }
 
     /**

app/Controllers/Secure_Controller.php

@@ -99,10 +99,10 @@ class Secure_Controller extends BaseController
     }
 
     /**
-     * @param string $key
+     * @param $key
      * @return mixed|void
      */
-    public function getConfig(string $key)
+    public function getConfig($key)
     {
         if (isset($config[$key])) {
             return $config[$key];

app/Controllers/Suppliers.php

@@ -34,7 +34,7 @@ class Suppliers extends Persons
      */
     public function getRow($row_id): ResponseInterface
     {
-        $data_row = get_supplier_data_row($this->supplier->getInfo($row_id));
+        $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);
@@ -97,7 +97,7 @@ class Suppliers extends Persons
      */
     public function getView(int $supplier_id = NEW_ENTRY): string
     {
-        $info = $this->supplier->getInfo($supplier_id);
+        $info = $this->supplier->get_info($supplier_id);
         foreach (get_object_vars($info) as $property => $value) {
             $info->$property = $value;
         }

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

app/Database/Migrations/20170501150000_upgrade_to_3_1_1.php

@@ -2,7 +2,6 @@
 
 namespace App\Database\Migrations;
 
-use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Database\Migration;
 
 class Migration_Upgrade_To_3_1_1 extends Migration
@@ -18,37 +17,7 @@ class Migration_Upgrade_To_3_1_1 extends Migration
     public function up(): void
     {
         helper('migration');
-
-        // MariaDB blocks CONVERT TO CHARACTER SET on tables with FK constraints.
-        // Drop all FKs across affected tables before running the SQL script, recreate after.
-        $fkColumns = [
-            ['modules',         'module_id'],
-            ['stock_locations', 'location_id'],
-            ['permissions',     'permission_id'],
-            ['people',          'person_id'],
-            ['suppliers',       'supplier_id'],
-            ['items',           'item_id'],
-            ['item_kits',       'item_kit_id'],
-            ['sales',           'sale_id'],
-            ['receivings',      'receiving_id'],
-            ['employees',       'employee_id'],
-            ['customers',       'person_id'],
-        ];
-
-        $constraints = [];
-        foreach ($fkColumns as [$table, $column]) {
-            foreach (dropAllForeignKeyConstraints($table, $column) as $c) {
-                $constraints[$c['constraintName']] = $c;
-            }
-        }
-
-        if (!execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.0.2_to_3.1.1.sql')) {
-            throw new DatabaseException('Migration script 3.0.2_to_3.1.1.sql failed. Check logs for details.');
-        }
-
-        $droppedTables = ['sales_suspended', 'sales_suspended_items', 'sales_suspended_items_taxes', 'sales_suspended_payments'];
-        $toRecreate = array_filter($constraints, fn($c) => !in_array($c['tableName'], $droppedTables, true));
-        recreateForeignKeyConstraints(array_values($toRecreate));
+        execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.0.2_to_3.1.1.sql');
     }
 
     /**

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);

app/Database/Migrations/20260306120000_MigrationEXIFStrippingOptions.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+use Config\Database;
+
+class MigrationEXIFStrippingOptions extends Migration
+{
+    /**
+     * Perform a migration step.
+     */
+    public function up(): void
+    {
+        log_message('info', 'Migrating EXIF Stripping Options');
+
+        $db = Database::connect();
+
+        $configs = [
+            [
+                'key' => 'exif_fields_to_keep',
+                'value' => 'Copyright,Orientation,Software'
+            ]
+        ];
+
+        foreach ($configs as $config) {
+            $existing = $db->table('app_config')
+                ->where('key', $config['key'])
+                ->get()
+                ->getRow();
+
+            if ($existing === null) {
+                $db->table('app_config')->insert($config);
+            }
+        }
+    }
+
+    /**
+     * Revert a migration step.
+     */
+    public function down(): void
+    {
+        $db = Database::connect();
+
+        $db->table('app_config')
+            ->where('key', 'exif_fields_to_keep')
+            ->delete();
+    }
+}

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();
-    }
-}

app/Database/Migrations/20260520000000_PluginConfigTableCreate.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Database\Migrations;
-
-use CodeIgniter\Database\Migration;
-
-class PluginConfigTableCreate extends Migration
-{
-    public function up(): void
-    {
-        log_message('info', 'Migrating plugin_config table started');
-
-        execute_script(APPPATH . 'Database/Migrations/sqlscripts/3.5.0_PluginConfigTableCreate.sql');
-    }
-
-    public function down(): void
-    {
-        $this->forge->dropTable('plugin_config', true);
-    }
-}

app/Database/Migrations/sqlscripts/3.0.2_to_3.1.1.sql

@@ -327,6 +327,19 @@ INSERT INTO `ospos_sales_items` (sale_id, item_id, description, serialnumber, li
 INSERT INTO `ospos_sales_payments` (sale_id, payment_type, payment_amount) SELECT sale_id, payment_type, payment_amount FROM `ospos_sales_suspended_payments`;
 INSERT INTO `ospos_sales_items_taxes` (sale_id, item_id, line, name, percent) SELECT sale_id, item_id, line, name, percent FROM `ospos_sales_suspended_items_taxes`;
 
+ALTER TABLE `ospos_sales_suspended_payments` DROP FOREIGN KEY `ospos_sales_suspended_payments_ibfk_1`;
+
+ALTER TABLE `ospos_sales_suspended_items_taxes` DROP FOREIGN KEY `ospos_sales_suspended_items_taxes_ibfk_1`;
+ALTER TABLE `ospos_sales_suspended_items_taxes` DROP FOREIGN KEY `ospos_sales_suspended_items_taxes_ibfk_2`;
+
+ALTER TABLE `ospos_sales_suspended_items` DROP FOREIGN KEY `ospos_sales_suspended_items_ibfk_1`;
+ALTER TABLE `ospos_sales_suspended_items` DROP FOREIGN KEY `ospos_sales_suspended_items_ibfk_2`;
+ALTER TABLE `ospos_sales_suspended_items` DROP FOREIGN KEY `ospos_sales_suspended_items_ibfk_3`;
+
+ALTER TABLE `ospos_sales_suspended` DROP FOREIGN KEY `ospos_sales_suspended_ibfk_1`;
+ALTER TABLE `ospos_sales_suspended` DROP FOREIGN KEY `ospos_sales_suspended_ibfk_2`;
+ALTER TABLE `ospos_sales_suspended` DROP FOREIGN KEY `ospos_sales_suspended_ibfk_3`;
+
 DROP TABLE `ospos_sales_suspended_payments`, `ospos_sales_suspended_items_taxes`, `ospos_sales_suspended_items`, `ospos_sales_suspended`;
 
 --

app/Database/Migrations/sqlscripts/3.1.1_to_3.2.0.sql

@@ -140,7 +140,7 @@ CREATE TABLE IF NOT EXISTS `ospos_expense_categories` (
   `category_name` varchar(255) DEFAULT NULL,
   `category_description` varchar(255) NOT NULL,
   `deleted` int(1) NOT NULL DEFAULT '0'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 
 -- Table structure for table `ospos_expenses`
@@ -154,7 +154,7 @@ CREATE TABLE IF NOT EXISTS `ospos_expenses` (
   `description` varchar(255) NOT NULL,
   `employee_id` int(10) NOT NULL,
   `deleted` int(1) NOT NULL DEFAULT '0'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 
 -- Indexes for table `ospos_expense_categories`

app/Database/Migrations/sqlscripts/3.2.1_to_3.3.0.sql

@@ -75,7 +75,7 @@ CREATE TABLE `ospos_cash_up` (
   `open_employee_id` int(10) NOT NULL,
   `close_employee_id` int(10) NOT NULL,
   `deleted` int(1) NOT NULL DEFAULT '0'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 -- Indexes for table `ospos_cash_up`
 

app/Database/Migrations/sqlscripts/3.3.0_indiagst.sql

@@ -26,7 +26,7 @@ CREATE TABLE IF NOT EXISTS `ospos_tax_codes` (
     `state` varchar(255) NOT NULL DEFAULT '',
     `deleted` int(1) NOT NULL DEFAULT 0,
     PRIMARY KEY (`tax_code_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 ALTER TABLE `ospos_customers`
     ADD COLUMN `tax_id` varchar(32) NOT NULL DEFAULT '' AFTER `taxable`,
@@ -59,7 +59,7 @@ CREATE TABLE `ospos_sales_taxes` (
     `rounding_code` tinyint(2) NOT NULL DEFAULT 0,
     PRIMARY KEY (`sales_taxes_id`),
     KEY `print_sequence` (`sale_id`,`print_sequence`,`tax_group`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE IF NOT EXISTS `ospos_tax_jurisdictions` (
     `jurisdiction_id` int(11) NOT NULL AUTO_INCREMENT,
@@ -71,7 +71,7 @@ CREATE TABLE IF NOT EXISTS `ospos_tax_jurisdictions` (
     `cascade_sequence` tinyint(2) NOT NULL DEFAULT 0,
     `deleted` int(1) NOT NULL DEFAULT 0,
     PRIMARY KEY (`jurisdiction_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci AUTO_INCREMENT=1;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1;
 
 ALTER TABLE `ospos_suppliers`
     ADD COLUMN `tax_id` varchar(32) DEFAULT NULL AFTER `account_number`;
@@ -89,7 +89,7 @@ CREATE TABLE IF NOT EXISTS `ospos_tax_rates` (
     `tax_rate` decimal(15,4) NOT NULL DEFAULT 0.0000,
     `tax_rounding_code` tinyint(2) NOT NULL DEFAULT 0,
     PRIMARY KEY (`tax_rate_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 -- Add support for sales tax report
 

app/Database/Migrations/sqlscripts/3.3.0_paymenttracking.sql

@@ -12,7 +12,7 @@ CREATE TABLE `ospos_sales_payments` (
   `reference_code` varchar(40) NOT NULL DEFAULT '',
   PRIMARY KEY (`payment_id`),
   KEY `payment_sale` (`sale_id`, `payment_type`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 INSERT INTO ospos_sales_payments (sale_id, payment_type, payment_amount, payment_user)
 SELECT payments.sale_id, payments.payment_type, payments.payment_amount, sales.employee_id

app/Database/Migrations/sqlscripts/3.5.0_PluginConfigTableCreate.sql

@@ -1,21 +0,0 @@
-CREATE TABLE IF NOT EXISTS `ospos_plugin_config` (
-    `id` int(11) NOT NULL AUTO_INCREMENT,
-    `plugin_id` varchar(100) NOT NULL,
-    `key` varchar(100) NOT NULL,
-    `value` text NOT NULL,
-    `is_control` tinyint(1) NOT NULL DEFAULT 0,
-    `created_at` timestamp NOT NULL DEFAULT current_timestamp(),
-    `updated_at` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-    PRIMARY KEY (`id`),
-    UNIQUE KEY `uq_plugin_key` (`plugin_id`, `key`),
-    KEY `idx_plugin_id` (`plugin_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-INSERT IGNORE INTO `ospos_modules` (`name_lang_key`, `desc_lang_key`, `sort`, `module_id`) VALUES
-    ('module_plugins', 'module_plugins_desc', 111, 'plugins');
-
-INSERT IGNORE INTO `ospos_permissions` (`permission_id`, `module_id`) VALUES
-   ('plugins', 'plugins');
-
-INSERT IGNORE INTO `ospos_grants` (`permission_id`, `person_id`, `menu_group`)
-SELECT 'plugins', `person_id`, 'office' FROM `ospos_grants` WHERE `permission_id` = 'config';

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}`");
-    }
-}

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;
     }
 
     /**

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');
-    }
-}

app/Helpers/importfile_helper.php

@@ -1,10 +1,10 @@
 <?php
-
 /**
  * @param array $stock_locations
  * @param array $attributes
  * @return string
  */
+
 function generate_import_items_csv(array $stock_locations, array $attributes): string
 {
     $csv_headers = pack('CCC', 0xef, 0xbb, 0xbf);    // Encode the Byte-Order Mark (BOM) so that UTF-8 File headers display properly in Microsoft Excel

app/Helpers/locale_helper.php

@@ -22,7 +22,7 @@ function current_language_code(bool $load_system_language = false): string
         }
     }
 
-    return $config['language_code'] ?? DEFAULT_LANGUAGE_CODE;
+    return $config->language_code ?? DEFAULT_LANGUAGE_CODE;
 }
 
 /**
@@ -43,7 +43,7 @@ function current_language(bool $load_system_language = false): string
         }
     }
 
-    return $config['language'] ?? DEFAULT_LANGUAGE;
+    return $config->language ?? DEFAULT_LANGUAGE_CODE;
 }
 
 /**
@@ -272,9 +272,6 @@ function get_payment_options(): array
         $payments[lang('Sales.upi')] = lang('Sales.upi');
     }
 
-    $payments[lang('Sales.bank_transfer')] = lang('Sales.bank_transfer');
-    $payments[lang('Sales.wallet')]        = lang('Sales.wallet');
-
     return $payments;
 }
 

app/Helpers/migration_helper.php

@@ -172,7 +172,6 @@ function dropAllForeignKeyConstraints(string $table, string $column): array {
             WHERE kcu.TABLE_SCHEMA = DATABASE()
                 AND ((kcu.REFERENCED_TABLE_NAME = '" . $db->getPrefix() . "$table' AND kcu.REFERENCED_COLUMN_NAME = '$column')
                 OR (kcu.TABLE_NAME = '" . $db->getPrefix() . "$table' AND kcu.COLUMN_NAME = '$column'))
-                AND rc.CONSTRAINT_NAME IS NOT NULL
         ");
 
     $deletedConstraints = [];

app/Helpers/plugin_helper.php

@@ -1,19 +0,0 @@
-<?php
-
-use CodeIgniter\Events\Events;
-
-if (!function_exists('pluginContent')) {
-    function pluginContent(string $section, array $data = []): string
-    {
-        ob_start();
-        Events::trigger("view:{$section}", $data);
-        return ob_get_clean() ?: '';
-    }
-}
-
-if (!function_exists('pluginContentExists')) {
-    function pluginContentExists(string $section): bool
-    {
-        return !empty(Events::listeners("view:{$section}"));
-    }
-}

app/Helpers/security_helper.php

@@ -94,3 +94,4 @@ function remove_backup(): void
     @unlink($backup_path);
     log_message('info', "Removed $backup_path");
 }
+

app/Helpers/tabular_helper.php

@@ -5,7 +5,6 @@ use App\Models\Employee;
 use App\Models\Item_taxes;
 use App\Models\Tax_category;
 use CodeIgniter\Database\ResultInterface;
-use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\Session\Session;
 use Config\OSPOS;
 use Config\Services;
@@ -578,8 +577,8 @@ function item_kit_headers(): array
         ['item_kit_number'  => lang('Item_kits.item_kit_number')],
         ['name'             => lang('Item_kits.name')],
         ['description'      => lang('Item_kits.description')],
-        ['total_cost_price' => lang('Items.cost_price'), 'sortable' => false],
-        ['total_unit_price' => lang('Items.unit_price'), 'sortable' => false]
+        ['total_cost_price' => lang('Items.cost_price'), 'sortable' => FALSE],
+        ['total_unit_price' => lang('Items.unit_price'), 'sortable' => FALSE]
     ];
 }
 
@@ -655,7 +654,7 @@ function expand_attribute_values(array $definition_names, array $row): array
     foreach ($definition_names as $definition_id => $definitionInfo) {
         if (isset($indexed_values[$definition_id])) {
             $raw_value = $indexed_values[$definition_id];
-
+            
             // Format DECIMAL attributes according to locale
             if (is_array($definitionInfo) && isset($definitionInfo['type']) && $definitionInfo['type'] === DECIMAL) {
                 $attribute_values["$definition_id"] = to_decimals($raw_value);
@@ -743,7 +742,7 @@ function get_expense_category_manage_table_headers(): string
 }
 
 /**
- * Gets the html data row for the expense category
+ * Gets the html data row for the expenses category
  */
 function get_expense_category_data_row(object $expense_category): array
 {
@@ -842,7 +841,7 @@ function get_expenses_data_last_row(object $expense): array
 }
 
 /**
- * Get the expense payments summary
+ * Get the expenses payments summary
  */
 function get_expenses_manage_payments_summary(array $payments, ResultInterface $expenses): string    // TODO: $expenses is passed but never used.
 {
@@ -933,67 +932,23 @@ function get_controller(): string
     return end($controller_name_parts);
 }
 
-function plugin_headers(): array
-{
-    return [
-        ['name'        => lang('Plugins.name'),    'escape' => false],
-        ['description' => lang('Plugins.description')],
-        ['version'     => lang('Plugins.version'), 'escape' => false],
-        ['status'      => lang('Plugins.status'),  'escape' => false],
-    ];
-}
-
-function get_plugin_manage_table_headers(): string
-{
-    return transform_headers(plugin_headers(), false, true);
-}
-
-function get_plugin_data_row(array $plugin): array
-{
-    $pluginId = $plugin['id'];
-
-    $statusHtml = $plugin['enabled']
-        ? '<span class="label label-success">' . lang('Plugins.active') . '</span>'
-        : '<span class="label label-default">' . lang('Plugins.inactive') . '</span>';
-
-    $editHtml = $plugin['enabled']
-        ? '<button class="btn btn-warning btn-xs plugin-action" data-action="disable" data-plugin-id="' . esc($pluginId) . '">'
-          . '<span class="glyphicon glyphicon-pause"></span> ' . lang('Plugins.disable') . '</button>'
-        : '<button class="btn btn-success btn-xs plugin-action" data-action="enable" data-plugin-id="' . esc($pluginId) . '">'
-          . '<span class="glyphicon glyphicon-play"></span> ' . lang('Plugins.enable') . '</button>';
-
-    if ($plugin['has_config'] && $plugin['enabled']) {
-        $editHtml .= ' <button class="btn btn-primary btn-xs plugin-config" data-plugin-id="' . esc($pluginId) . '">'
-            . '<span class="glyphicon glyphicon-cog"></span> ' . lang('Plugins.configure') . '</button>';
-    }
-
-    return [
-        'plugin_id'   => $pluginId,
-        'name'        => '<strong>' . esc($plugin['name']) . '</strong><br><small class="text-muted">' . esc($pluginId) . '</small>',
-        'description' => esc($plugin['description']),
-        'version'     => '<span class="label label-default">' . esc($plugin['version']) . '</span>',
-        'status'      => $statusHtml,
-        'edit'        => $editHtml,
-    ];
-}
-
 /**
- * Restores filter values from the URL query string.
- *
- * @param IncomingRequest $request The request object
+ * Restores filter values from URL query string.
+ * 
+ * @param CodeIgniter\HTTP\IncomingRequest $request The request object
  * @return array Array with 'start_date', 'end_date', and 'selected_filters' keys
  */
-function restoreTableFilters(IncomingRequest $request): array
+function restoreTableFilters($request): array
 {
     $startDate = $request->getGet('start_date', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
     $endDate = $request->getGet('end_date', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
     $urlFilters = $request->getGet('filters', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
-
+    
     return array_filter([
         'start_date' => $startDate ?: null,
         'end_date' => $endDate ?: null,
         'selected_filters' => $urlFilters ?? []
-    ], function ($value) {
+    ], function($value) {
         return $value !== null && $value !== [];
     });
 }

app/Helpers/url_helper.php

@@ -7,7 +7,7 @@ if (!function_exists('base64url_encode')) {
      * @param string $data
      * @return string
      */
-    function base64url_encode(string $data): string
+    function base64url_encode($data)
     {
         return rtrim(strtr(base64_encode($data), '+/', '-_'), '=');
     }
@@ -20,7 +20,7 @@ if (!function_exists('base64url_decode')) {
      * @param string $data
      * @return string|false
      */
-    function base64url_decode(string $data): false|string
+    function base64url_decode($data)
     {
         $remainder = strlen($data) % 4;
         if ($remainder) {
@@ -28,4 +28,4 @@ if (!function_exists('base64url_decode')) {
         }
         return base64_decode(strtr($data, '-_', '+/'));
     }
-}
+}

app/Language/ar-EG/Config.php

@@ -166,6 +166,8 @@ return [
     "info"                                      => "معلومات",
     "info_configuration"                        => "معلومات الشركة",
     "input_groups"                              => "مجموعات الإدخال",
+    "integrations"                              => "التكامل",
+    "integrations_configuration"                => "تكامل",
     "invoice"                                   => "الفاتورة",
     "invoice_configuration"                     => "إعدادات طباعة الفاتورة",
     "invoice_default_comments"                  => "التعليق الافتراضي على الفاتورة",
@@ -196,6 +198,13 @@ return [
     "location_info"                             => "معلومات تهيئة الأماكن",
     "login_form"                                => "نمط نموذج تسجيل الدخول",
     "logout"                                    => "هل تريد عمل نسخة إحتياطية قبل الخروج؟ اضغط [نعم] لعمل النسخة أو [الغاء] للخروج.",
+    "mailchimp"                                 => "ميل تشامب",
+    "mailchimp_api_key"                         => "مفتاح ميل شيمب",
+    "mailchimp_configuration"                   => "إعدادات ميل شيمب",
+    "mailchimp_key_successfully"                => "نجاح.",
+    "mailchimp_key_unsuccessfully"              => "فشل.",
+    "mailchimp_lists"                           => "إعدادات ميل شيمب",
+    "mailchimp_tooltip"                         => "انقر على رمز مفتاح API.",
     "message"                                   => "الرسائل",
     "message_configuration"                     => "إعدادات الرسائل",
     "msg_msg"                                   => "الرسائل النصية المحفوظة",

app/Language/ar-EG/Customers.php

@@ -28,6 +28,16 @@ return [
     "employee"                      => "الموظف",
     "error_adding_updating"         => "خطاء فى إضافة أو تحديث العميل.",
     "import_items_csv"              => "استيراد العملا ء من ورقة عمل اكسل",
+    "mailchimp_activity_click"      => "النقر على البريد الإلكتروني",
+    "mailchimp_activity_lastopen"   => "آخر رسالة إلكترونية مفتوحة",
+    "mailchimp_activity_open"       => "رسالة إلكترونية مفتوحة",
+    "mailchimp_activity_total"      => "تم ارسال الرسالة الإلكترونية بنجاح",
+    "mailchimp_activity_unopen"     => "رسالة إلكترونية غير مفتوحة",
+    "mailchimp_email_client"        => "بريد الكتروني",
+    "mailchimp_info"                => "ميل تشيمب",
+    "mailchimp_member_rating"       => "التقييم",
+    "mailchimp_status"              => "الحالة",
+    "mailchimp_vip"                 => "مهم",
     "max"                           => "الحد الأقصى",
     "min"                           => "الحد الأدنى",
     "new"                           => "عميل جديد",

app/Language/ar-EG/Module.php

@@ -32,7 +32,6 @@ return [
     "migrate_desc"               => "تحديث قاعدة البيانات.",
     "office"                     => "المكتب",
     "office_desc"                => "اظهار الائحة المكتبية.",
-    'plugins'                    => 'الإضافات',
     "receivings"                 => "استلام الأصناف",
     "receivings_desc"            => "معالجة أوامر الشراء و استلام الأصناف.",
     "reports"                    => "التقارير",

app/Language/ar-EG/Plugins.php

@@ -1,27 +0,0 @@
-<?php
-return [
-    'actions'               => 'إجراءات',
-    'active'                => 'نشط',
-    'configure'             => 'تكوين',
-    'description'           => 'الوصف',
-    'disable'               => 'تعطيل',
-    'disable_failed'        => 'فشل تعطيل الإضافة',
-    'disabled'              => 'تم تعطيل الإضافة بنجاح',
-    'enable'                => 'تفعيل',
-    'enable_failed'         => 'فشل تفعيل الإضافة',
-    'enabled'               => 'تم تفعيل الإضافة بنجاح',
-    'inactive'              => 'غير نشط',
-    'management'            => 'إدارة الإضافات',
-    'name'                  => 'اسم الإضافة',
-    'no_config'             => 'هذه الإضافة لا تحتوي على خيارات تكوين',
-    'no_plugins_to_display' => 'لا توجد إضافات للعرض',
-    'not_found'             => 'الإضافة غير موجودة',
-    'plugins'               => 'الإضافات',
-    'settings_save_failed'  => 'فشل حفظ إعدادات الإضافة',
-    'settings_saved'        => 'تم حفظ إعدادات الإضافة بنجاح',
-    'status'                => 'الحالة',
-    'uninstall'             => 'إلغاء التثبيت',
-    'uninstall_failed'      => 'فشل إلغاء تثبيت الإضافة',
-    'uninstalled'           => 'تم إلغاء تثبيت الإضافة بنجاح',
-    'version'               => 'الإصدار',
-];

app/Language/ar-EG/Sales.php

@@ -41,6 +41,7 @@ return [
     "customer_discount"                => "الخصم",
     "customer_email"                   => "البريد الإلكترونى",
     "customer_location"                => "المكان",
+    "customer_mailchimp_status"        => "حالة بريد ميل تشيمب",
     "customer_optional"                => "(مطلوب للدفعات المستحقة)",
     "customer_required"                => "(اجباري)",
     "customer_total"                   => "المجموع",

app/Language/ar-LB/Config.php

@@ -166,6 +166,8 @@ return [
     "info"                                      => "معلومات",
     "info_configuration"                        => "معلومات الشركة",
     "input_groups"                              => "مجموعات الإدخال",
+    "integrations"                              => "التكامل",
+    "integrations_configuration"                => "تكامل",
     "invoice"                                   => "الفاتورة",
     "invoice_configuration"                     => "إعدادات طباعة الفاتورة",
     "invoice_default_comments"                  => "التعليق الافتراضي على الفاتورة",
@@ -196,6 +198,13 @@ return [
     "location_info"                             => "معلومات تهيئة الأماكن",
     "login_form"                                => "نمط نموذج تسجيل الدخول",
     "logout"                                    => "هل تريد عمل نسخة إحتياطية قبل الخروج؟ اضغط [نعم] لعمل النسخة أو [الغاء] للخروج.",
+    "mailchimp"                                 => "ميل تشامب",
+    "mailchimp_api_key"                         => "مفتاح ميل شيمب",
+    "mailchimp_configuration"                   => "إعدادات ميل شيمب",
+    "mailchimp_key_successfully"                => "نجاح.",
+    "mailchimp_key_unsuccessfully"              => "فشل.",
+    "mailchimp_lists"                           => "قوائم ميل شيمب",
+    "mailchimp_tooltip"                         => "انقر على رمز مفتاح API.",
     "message"                                   => "الرسائل",
     "message_configuration"                     => "إعدادات الرسائل",
     "msg_msg"                                   => "الرسائل النصية المحفوظة",

app/Language/ar-LB/Customers.php

@@ -28,6 +28,16 @@ return [
     "employee"                      => "الموظف",
     "error_adding_updating"         => "خطاء فى إضافة أو تحديث العميل.",
     "import_items_csv"              => "استيراد العملا ء من ورقة عمل اكسل",
+    "mailchimp_activity_click"      => "النقر على البريد الإلكتروني",
+    "mailchimp_activity_lastopen"   => "آخر رسالة إلكترونية مفتوحة",
+    "mailchimp_activity_open"       => "رسالة إلكترونية مفتوحة",
+    "mailchimp_activity_total"      => "تم ارسال الرسالة الإلكترونية بنجاح",
+    "mailchimp_activity_unopen"     => "رسالة إلكترونية غير مفتوحة",
+    "mailchimp_email_client"        => "بريد الكتروني",
+    "mailchimp_info"                => "ميل تشيمب",
+    "mailchimp_member_rating"       => "التقييم",
+    "mailchimp_status"              => "الحالة",
+    "mailchimp_vip"                 => "مهم",
     "max"                           => "الحد الأقصى",
     "min"                           => "الحد الأدنى",
     "new"                           => "عميل جديد",

app/Language/ar-LB/Module.php

@@ -32,7 +32,6 @@ return [
     "migrate_desc"               => "تحديث قاعدة البيانات.",
     "office"                     => "المكتب",
     "office_desc"                => "اظهار الائحة المكتبية.",
-    'plugins'                    => 'الإضافات',
     "receivings"                 => "استلام الأصناف",
     "receivings_desc"            => "معالجة أوامر الشراء و استلام الأصناف.",
     "reports"                    => "التقارير",

app/Language/ar-LB/Plugins.php

@@ -1,27 +0,0 @@
-<?php
-return [
-    'actions'               => 'إجراءات',
-    'active'                => 'نشط',
-    'configure'             => 'تكوين',
-    'description'           => 'الوصف',
-    'disable'               => 'تعطيل',
-    'disable_failed'        => 'فشل تعطيل الإضافة',
-    'disabled'              => 'تم تعطيل الإضافة بنجاح',
-    'enable'                => 'تفعيل',
-    'enable_failed'         => 'فشل تفعيل الإضافة',
-    'enabled'               => 'تم تفعيل الإضافة بنجاح',
-    'inactive'              => 'غير نشط',
-    'management'            => 'إدارة الإضافات',
-    'name'                  => 'اسم الإضافة',
-    'no_config'             => 'هذه الإضافة لا تحتوي على خيارات تكوين',
-    'no_plugins_to_display' => 'لا توجد إضافات للعرض',
-    'not_found'             => 'الإضافة غير موجودة',
-    'plugins'               => 'الإضافات',
-    'settings_save_failed'  => 'فشل حفظ إعدادات الإضافة',
-    'settings_saved'        => 'تم حفظ إعدادات الإضافة بنجاح',
-    'status'                => 'الحالة',
-    'uninstall'             => 'إلغاء التثبيت',
-    'uninstall_failed'      => 'فشل إلغاء تثبيت الإضافة',
-    'uninstalled'           => 'تم إلغاء تثبيت الإضافة بنجاح',
-    'version'               => 'الإصدار',
-];

app/Language/ar-LB/Sales.php

@@ -41,6 +41,7 @@ return [
     "customer_discount"                => "الخصم",
     "customer_email"                   => "البريد الإلكترونى",
     "customer_location"                => "المكان",
+    "customer_mailchimp_status"        => "حالة بريد ميل تشيمب",
     "customer_optional"                => "(مطلوب للدفعات المستحقة)",
     "customer_required"                => "(اجباري)",
     "customer_total"                   => "المجموع",

app/Language/az/Config.php

@@ -166,6 +166,8 @@ return [
     "info"                                      => "Məlumat",
     "info_configuration"                        => "Dükan İnformasiyası",
     "input_groups"                              => "",
+    "integrations"                              => "İnteqrasiya",
+    "integrations_configuration"                => "Üçüncü tərəf inteqrasiya",
     "invoice"                                   => "Faktura",
     "invoice_configuration"                     => "Faktura Çap Parametrləri",
     "invoice_default_comments"                  => "Standart Faktura Şərhləri",
@@ -196,6 +198,13 @@ return [
     "location_info"                             => "Yer Konfiqurasiya Məlumatı",
     "login_form"                                => "",
     "logout"                                    => "Çıxışdan əvvəl məlumatlari ehtiyat bazasına köçürmək istəyirsinizmi? Çıxış üçün Bekap və ya [Ləğv] üçün [OK]' düyməsinə basın.",
+    "mailchimp"                                 => "Mailçimp",
+    "mailchimp_api_key"                         => "Mailchimp API Açarı",
+    "mailchimp_configuration"                   => "Mailchimp Konfiqurasiyası",
+    "mailchimp_key_successfully"                => "API Açarı etibarlıdır.",
+    "mailchimp_key_unsuccessfully"              => "API Açarı etibarsızdır.",
+    "mailchimp_lists"                           => "Mailchimp siyahısı (lar)",
+    "mailchimp_tooltip"                         => "API Açarının İşarəsinə basın.",
     "message"                                   => "Mesaj",
     "message_configuration"                     => "Mesaj Konfiqurasiyası",
     "msg_msg"                                   => "Saxlanılan Mətn Mesajı",