fix: Address remaining CodeRabbit review comments

- Fix invalid jq string filter syntax (missing quotes around interpolation)
- Add environment validation job in deploy.yml for workflow_call input
- Add fork detection guard in deploy-pr.yml to prevent fork PR deployments

Fixes:
- deploy.yml:183-184 - jq filter syntax error
- deploy.yml:31 - unvalidated environment input in reusable workflow
- deploy-pr.yml:5 - fork PR deployments blocked by pull_request_review restrictions
- deploy-pr.yml:168-200 - jq filter syntax errors

.github/workflows/deploy-pr.yml

@@ -0,0 +1,204 @@
+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:
+  deploy-staging:
+    name: Deploy to staging
+    runs-on: ubuntu-latest
+    if: >
+      github.event.review.state == 'approved' &&
+      github.event.pull_request.head.repo.full_name == github.repository
+    
+    environment:
+      name: staging
+      url: ${{ vars.DEPLOY_URL || 'https://dev.opensourcepos.org' }}
+      deployment: false
+    
+    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"
+      
+      - name: Create GitHub Deployment
+        id: deployment
+        env:
+          GH_TOKEN: ${{ github.token }}
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+          REF_SHA: ${{ github.event.pull_request.head.sha }}
+        run: |
+          set -euo pipefail
+          
+          DEPLOYMENT_ID=$(gh api "repos/${GITHUB_REPOSITORY}/deployments" \
+            -X POST \
+            -f ref="${REF_SHA}" \
+            -f environment="staging" \
+            -f description="Deploy PR #${PR_NUMBER} to staging" \
+            -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 }}
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+        run: |
+          set -euo pipefail
+          
+          gh api "repos/${GITHUB_REPOSITORY}/deployments/${{ steps.deployment.outputs.deployment_id }}/statuses" \
+            -X POST \
+            -f state="in_progress" \
+            -f description="Deploying PR #${PR_NUMBER}..." \
+            -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: ${{ steps.image.outputs.tag }}
+          REF_SHA: ${{ github.event.pull_request.head.sha }}
+          DEPLOYMENT_ID: ${{ steps.deployment.outputs.deployment_id }}
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+        run: |
+          set -euo pipefail
+          
+          if [ -z "$DEPLOY_WEBHOOK_URL" ]; then
+            echo "::error::DEPLOY_WEBHOOK_URL secret is not configured"
+            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)
+          
+          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}
+            }')
+          
+          echo "Sending webhook..."
+          echo "Image: ${IMAGE_TAG}"
+          echo "PR: #${PR_NUMBER}"
+          
+          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")
+          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: ${{ steps.image.outputs.tag }}
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+        run: |
+          set -euo pipefail
+          
+          STATE="${{ steps.webhook.outputs.status }}"
+          
+          if [ "$STATE" = "success" ]; then
+            DESCRIPTION=$(jq -nr --arg tag "$IMAGE_TAG" --arg pr "$PR_NUMBER" \
+              '"Deployed PR #\($pr) (\($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="Staging deployment failed"
+            exit 1
+          fi
+      
+      - name: Comment deployment status
+        if: always()
+        env:
+          GH_TOKEN: ${{ github.token }}
+          IMAGE_TAG: ${{ steps.image.outputs.tag }}
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+          REF_SHA: ${{ github.event.pull_request.head.sha }}
+          STATUS: ${{ steps.webhook.outputs.status }}
+        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

@@ -0,0 +1,214 @@
+name: Deploy
+
+on:
+  workflow_dispatch:
+    inputs:
+      image_tag:
+        description: 'Docker image tag to deploy (e.g., v3.4.0, latest)'
+        required: true
+        default: 'latest'
+      environment:
+        description: 'Target environment'
+        required: true
+        type: choice
+        options:
+          - production
+          - staging
+        default: 'production'
+  workflow_call:
+    inputs:
+      image_tag:
+        description: 'Docker image tag to deploy'
+        type: string
+        default: 'latest'
+      environment:
+        description: 'Target environment'
+        type: string
+        default: 'staging'
+      sha:
+        description: 'Git commit SHA to deploy'
+        required: true
+        type: string
+
+concurrency:
+  group: deploy-${{ inputs.environment }}
+  cancel-in-progress: false
+
+permissions:
+  contents: read
+  deployments: write
+
+jobs:
+  validate-inputs:
+    name: Validate deployment inputs
+    runs-on: ubuntu-latest
+    steps:
+      - name: Validate environment
+        env:
+          TARGET_ENV: ${{ inputs.environment }}
+        run: |
+          set -euo pipefail
+          case "$TARGET_ENV" in
+            production|staging) ;;
+            *)
+              echo "::error::Invalid environment '$TARGET_ENV'. Expected 'production' or 'staging'."
+              exit 1
+              ;;
+          esac
+
+  deploy:
+    name: Deploy to ${{ inputs.environment }}
+    needs: validate-inputs
+    runs-on: ubuntu-latest
+    
+    environment:
+      name: ${{ inputs.environment }}
+      url: ${{ vars.DEPLOY_URL || (inputs.environment == 'production' && 'https://demo.opensourcepos.org' || 'https://dev.opensourcepos.org') }}
+      deployment: false
+    
+    steps:
+      - name: Create GitHub Deployment
+        id: deployment
+        env:
+          GH_TOKEN: ${{ github.token }}
+          IMAGE_TAG: ${{ inputs.image_tag }}
+          TARGET_ENV: ${{ inputs.environment }}
+          REF_SHA: ${{ inputs.sha || github.sha }}
+        run: |
+          set -euo pipefail
+          
+          DEPLOYMENT_ID=$(gh api "repos/${GITHUB_REPOSITORY}/deployments" \
+            -X POST \
+            -f ref="${REF_SHA}" \
+            -f environment="${TARGET_ENV}" \
+            -f description="Deploy image ${IMAGE_TAG}" \
+            -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 }}
+          TARGET_ENV: ${{ inputs.environment }}
+          REF_SHA: ${{ inputs.sha || github.sha }}
+          DEPLOYMENT_ID: ${{ steps.deployment.outputs.deployment_id }}
+        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)
+          
+          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 environment "$TARGET_ENV" \
+            --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: $environment, repository: $repository, sha: $sha, run_id: $run_id, actor: $actor}
+            }')
+          
+          echo "Sending webhook..."
+          echo "Image: ${IMAGE_TAG}"
+          echo "Environment: ${TARGET_ENV}"
+          
+          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 }}
+          TARGET_ENV: ${{ inputs.environment }}
+        run: |
+          set -euo pipefail
+          
+          STATE="${{ steps.webhook.outputs.status }}"
+          
+          if [ "$STATE" = "success" ]; then
+            DESCRIPTION=$(jq -nr --arg tag "$IMAGE_TAG" --arg env "$TARGET_ENV" \
+              '"Deployed image \($tag) to \($env)"')
+            
+            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

CHANGELOG.md

@@ -1,5 +1,4 @@
-[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
+[unreleased]: https://github.com/opensourcepos/opensourcepos/compare/3.4.1...HEAD
 [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
@@ -34,10 +33,36 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
-## [3.4.0] - 2025-02-06
+## [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
 
 - 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

CODE_OF_CONDUCT.md

@@ -1,98 +1,85 @@
-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:
+[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:
 
 * 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
-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.
+## 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 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

@@ -7,13 +7,17 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     && docker-php-ext-install mysqli bcmath intl gd \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \
-    && a2enmod rewrite
+    && a2enmod rewrite \
+    && sed -i 's/AllowOverride None/AllowOverride All/' /etc/apache2/apache2.conf
 
 RUN echo "date.timezone = \"\${PHP_TIMEZONE}\"" > /usr/local/etc/php/conf.d/timezone.ini
 
 WORKDIR /app
 COPY --chown=www-data:www-data . /app
 RUN chmod 770 /app/writable/uploads /app/writable/logs /app/writable/cache \
+    && mkdir -p /app/public/uploads/item_pics \
+    && chown www-data:www-data /app/public/uploads/item_pics \
+    && chmod 640 /app/.env \
     && ln -s /app/*[^public] /var/www \
     && rm -rf /var/www/html \
     && ln -nsf /app/public /var/www/html

app/Config/App.php

@@ -327,8 +327,9 @@ class App extends BaseConfig
             $errorMessage =
                 'Security: allowedHostnames is not configured. ' .
                 'Host header injection protection is disabled. ' .
-                'Set app.allowedHostnames in your .env file. ' .
-                'Example: app.allowedHostnames = "example.com,www.example.com" ' .
+                'Either set app.allowedHostnames in your .env file ' .
+                '(e.g., app.allowedHostnames = "example.com,www.example.com") ' .
+                'or configure $allowedHostnames in app/Config/App.php. ' .
                 'Received Host: ' . $httpHost;
 
             // Production: Fail explicitly to prevent silent security vulnerabilities

app/Config/Mimes.php

@@ -486,10 +486,9 @@ class Mimes
     /**
      * Attempts to determine the best mime type for the given file extension.
      *
-     * @param string $extension
-     * @return array|string|null The mime type found, or none if unable to determine.
+     * @return string|null The mime type found, or none if unable to determine.
      */
-    public static function guessTypeFromExtension(string $extension): array|string|null
+    public static function guessTypeFromExtension(string $extension)
     {
         $extension = trim(strtolower($extension), '. ');
 
@@ -507,7 +506,7 @@ class Mimes
      *
      * @return string|null The extension determined, or null if unable to match.
      */
-    public static function guessExtensionFromType(string $type, ?string $proposedExtension = null): ?string
+    public static function guessExtensionFromType(string $type, ?string $proposedExtension = null)
     {
         $type = trim(strtolower($type), '. ');
 
@@ -523,7 +522,7 @@ class Mimes
         }
 
         // Reverse check the mime type list if no extension was proposed.
-        // This search is order-sensitive!
+        // This search is order sensitive!
         foreach (static::$mimes as $ext => $types) {
             if (in_array($type, (array) $types, true)) {
                 return $ext;

app/Config/OSPOS.php

@@ -5,7 +5,6 @@ namespace Config;
 use App\Models\Appconfig;
 use CodeIgniter\Cache\CacheInterface;
 use CodeIgniter\Config\BaseConfig;
-use CodeIgniter\Database\Exceptions\DatabaseException;
 
 /**
  * This class holds the configuration options stored from the database so that on launch those settings can be cached
@@ -41,9 +40,11 @@ class OSPOS extends BaseConfig
                     $this->settings[$app_config->key] = $app_config->value;
                 }
                 $this->cache->save('settings', encode_array($this->settings));
-            } catch (DatabaseException $e) {
+            } catch (\Exception $e) {
                 // Database table doesn't exist yet (migrations haven't run)
-                // Return empty settings to allow migration page to display
+                // or database connection failed. Return empty settings to
+                // allow migration page to display. Catches mysqli_sql_exception
+                // which is not a subclass of DatabaseException.
                 $this->settings = [
                     'language' => 'english',
                     'language_code' => 'en',

app/Config/Session.php

@@ -3,7 +3,6 @@
 namespace Config;
 
 use CodeIgniter\Config\BaseConfig;
-use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Session\Handlers\BaseHandler;
 use CodeIgniter\Session\Handlers\DatabaseHandler;
 use CodeIgniter\Session\Handlers\FileHandler;
@@ -139,7 +138,11 @@ class Session extends BaseConfig
                     $this->driver = FileHandler::class;
                     $this->savePath = WRITEPATH . 'session';
                 }
-            } catch (DatabaseException $e) {
+            } catch (\Exception $e) {
+                // Database not available yet (e.g. fresh install before migrations).
+                // Fall back to file-based sessions so the login/migration page
+                // can still be served. Catches mysqli_sql_exception which is
+                // not a subclass of DatabaseException but is a RuntimeException.
                 $this->driver = FileHandler::class;
                 $this->savePath = WRITEPATH . 'session';
             }

app/Controllers/Attributes.php

@@ -246,7 +246,7 @@ class Attributes extends Secure_Controller
         $data['definition_group'][''] = lang('Common.none_selected_text');
         $data['definition_info'] = $info;
 
-        $show_all = Attribute::SHOW_IN_ITEMS | Attribute::SHOW_IN_RECEIVINGS | Attribute::SHOW_IN_SALES | Attribute::SHOW_IN_SEARCH | Attribute::SHOW_IN_CUSTOMERS | Attribute::SHOW_IN_EMPLOYEES | Attribute::SHOW_IN_SUPPLIERS;
+        $show_all = Attribute::SHOW_IN_ITEMS | Attribute::SHOW_IN_RECEIVINGS | Attribute::SHOW_IN_SALES;
         $data['definition_flags'] = $this->get_attributes($show_all);
         $selected_flags = $info->definition_flags === '' ? $show_all : $info->definition_flags;
         $data['selected_definition_flags'] = $this->get_attributes($selected_flags);

app/Controllers/BaseController.php

@@ -28,12 +28,9 @@ abstract class BaseController extends Controller
     // protected $session;
 
     /**
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @param LoggerInterface $logger
      * @return void
      */
-    public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger): void
+    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.

app/Controllers/Config.php

@@ -82,7 +82,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);
@@ -221,6 +221,7 @@ 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,6 +232,8 @@ 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();
@@ -946,6 +949,44 @@ 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.
      *

app/Controllers/Customers.php

@@ -3,7 +3,7 @@
 namespace App\Controllers;
 
 use App\Libraries\Mailchimp_lib;
-use App\Models\Attribute;
+
 use App\Models\Customer;
 use App\Models\Customer_rewards;
 use App\Models\Tax_code;
@@ -15,31 +15,34 @@ use stdClass;
 
 class Customers extends Persons
 {
-    private string $listId;
-    private Mailchimp_lib $mailchimpLib;
-    private Customer_rewards $customerRewards;
+    private string $_list_id;
+    private Mailchimp_lib $mailchimp_lib;
+    private Customer_rewards $customer_rewards;
     private Customer $customer;
-    private Tax_code $taxCode;
-    private array $appConfig;
+    private Tax_code $tax_code;
+    private array $config;
 
     public function __construct()
     {
         parent::__construct('customers');
-        $this->mailchimpLib = new Mailchimp_lib();
-        $this->customerRewards = model(Customer_rewards::class);
+        $this->mailchimp_lib = new Mailchimp_lib();
+        $this->customer_rewards = model(Customer_rewards::class);
         $this->customer = model(Customer::class);
-        $this->taxCode = model(Tax_code::class);
-        $this->appConfig = config(OSPOS::class)->settings;
+        $this->tax_code = model(Tax_code::class);
+        $this->config = config(OSPOS::class)->settings;
 
         $encrypter = Services::encrypter();
 
-        if (!empty($this->appConfig['mailchimp_list_id'])) {
-            $this->listId = $encrypter->decrypt($this->appConfig['mailchimp_list_id']);
+        if (!empty($this->config['mailchimp_list_id'])) {
+            $this->_list_id = $encrypter->decrypt($this->config['mailchimp_list_id']);
         } else {
-            $this->listId = '';
+            $this->_list_id = '';
         }
     }
 
+    /**
+     * @return string
+     */
     public function getIndex(): string
     {
         $data['table_headers'] = get_customer_manage_table_headers();
@@ -47,13 +50,19 @@ class Customers extends Persons
         return view('people/manage', $data);
     }
 
-    public function getRow(int $rowId): ResponseInterface
+    /**
+     * Gets one row for a customer manage table. This is called using AJAX to update one row.
+     * @return ResponseInterface
+     */
+    public function getRow(int $row_id): ResponseInterface
     {
-        $person = $this->customer->get_info($rowId);
+        $person = $this->customer->get_info($row_id);
 
-        $stats = $this->customer->get_stats($person->person_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.
 
         if (empty($stats)) {
+            // Create object with empty properties.
             $stats = new stdClass();
             $stats->total = 0;
             $stats->min = 0;
@@ -63,11 +72,17 @@ class Customers extends Persons
             $stats->quantity = 0;
         }
 
-        $dataRow = get_customer_data_row($person, $stats);
+        $data_row = get_customer_data_row($person, $stats);
 
-        return $this->response->setJSON($dataRow);
+        return $this->response->setJSON($data_row);
     }
 
+
+    /**
+     * Returns customer table data rows. This will be called with AJAX.
+     *
+     * @return void
+     */
     public function getSearch(): ResponseInterface
     {
         $search = $this->request->getGet('search');
@@ -77,13 +92,15 @@ class Customers extends Persons
         $order = $this->request->getGet('order', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
 
         $customers = $this->customer->search($search, $limit, $offset, $sort, $order);
-        $totalRows = $this->customer->get_found_rows($search);
+        $total_rows = $this->customer->get_found_rows($search);
 
-        $dataRows = [];
+        $data_rows = [];
 
         foreach ($customers->getResult() as $person) {
-            $stats = $this->customer->get_stats($person->person_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: duplicated... see above
             if (empty($stats)) {
+                // Create object with empty properties.
                 $stats = new stdClass();
                 $stats->total = 0;
                 $stats->min = 0;
@@ -93,12 +110,16 @@ class Customers extends Persons
                 $stats->quantity = 0;
             }
 
-            $dataRows[] = get_customer_data_row($person, $stats);
+            $data_rows[] = get_customer_data_row($person, $stats);
         }
 
-        return $this->response->setJSON(['total' => $totalRows, 'rows' => $dataRows]);
+        return $this->response->setJSON(['total' => $total_rows, 'rows' => $data_rows]);
     }
 
+    /**
+     * Gives search suggestions based on what is being searched for
+     * @return ResponseInterface
+     */
     public function getSuggest(): ResponseInterface
     {
         $search = $this->request->getGet('term');
@@ -107,7 +128,10 @@ class Customers extends Persons
         return $this->response->setJSON($suggestions);
     }
 
-    public function suggestSearch(): ResponseInterface
+    /**
+     * @return ResponseInterface
+     */
+    public function suggest_search(): ResponseInterface
     {
         $search = $this->request->getGet('term');
         $suggestions = $this->customer->get_search_suggestions($search, 25, false);
@@ -115,11 +139,16 @@ class Customers extends Persons
         return $this->response->setJSON($suggestions);
     }
 
-    public function getView(int $customerId = NEW_ENTRY): string
+    /**
+     * Loads the customer edit form
+     * @return 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->get_info($customerId);
+        $info = $this->customer->get_info($customer_id);
         foreach (get_object_vars($info) as $property => $value) {
             $info->$property = $value;
         }
@@ -130,27 +159,28 @@ class Customers extends Persons
             $data['person_info']->employee_id = $this->employee->get_logged_in_employee_info()->person_id;
         }
 
-        $employeeInfo = $this->employee->get_info($info->employee_id);
-        $data['employee'] = $employeeInfo->first_name . ' ' . $employeeInfo->last_name;
+        $employee_info = $this->employee->get_info($info->employee_id);
+        $data['employee'] = $employee_info->first_name . ' ' . $employee_info->last_name;
 
-        $taxCodeInfo = $this->taxCode->get_info($info->sales_tax_code_id);
+        $tax_code_info = $this->tax_code->get_info($info->sales_tax_code_id);
 
-        if ($taxCodeInfo->tax_code != null) {
-            $data['sales_tax_code_label'] = $taxCodeInfo->tax_code . ' ' . $taxCodeInfo->tax_code_name;
+        if ($tax_code_info->tax_code != null) {
+            $data['sales_tax_code_label'] = $tax_code_info->tax_code . ' ' . $tax_code_info->tax_code_name;
         } else {
             $data['sales_tax_code_label'] = '';
         }
 
         $packages = ['' => lang('Items.none')];
-        foreach ($this->customerRewards->get_all()->getResultArray() as $row) {
+        foreach ($this->customer_rewards->get_all()->getResultArray() as $row) {
             $packages[$row['package_id']] = $row['package_name'];
         }
         $data['packages'] = $packages;
         $data['selected_package'] = $info->package_id;
 
-        $data['use_destination_based_tax'] = $this->appConfig['use_destination_based_tax'];
+        $data['use_destination_based_tax'] = $this->config['use_destination_based_tax'];
 
-        $stats = $this->customer->get_stats($customerId);
+        // Retrieve the total amount the customer spent so far together with min, max and average values
+        $stats = $this->customer->get_stats($customer_id);
         if (!empty($stats)) {
             foreach (get_object_vars($stats) as $property => $value) {
                 $info->$property = $value;
@@ -158,11 +188,14 @@ class Customers extends Persons
             $data['stats'] = $stats;
         }
 
+        // Retrieve the info from Mailchimp only if there is an email address assigned
         if (!empty($info->email)) {
-            if (($mailchimpInfo = $this->mailchimpLib->getMemberInfo($this->listId, $info->email)) !== false) {
-                $data['mailchimp_info'] = $mailchimpInfo;
+            // Collect Mailchimp customer info
+            if (($mailchimp_info = $this->mailchimp_lib->getMemberInfo($this->_list_id, $info->email)) !== false) {
+                $data['mailchimp_info'] = $mailchimp_info;
 
-                if (($activities = $this->mailchimpLib->getMemberActivity($this->listId, $info->email)) !== false) {
+                // 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;
@@ -202,25 +235,22 @@ class Customers extends Persons
     }
 
     /**
-     * Gets person attributes for a customer (AJAX)
+     * Inserts/updates a customer
+     * @return ResponseInterface
      */
-    public function getAttributes(int $customerId = NEW_ENTRY): string
+    public function postSave(int $customer_id = NEW_ENTRY): ResponseInterface
     {
-        return $this->getPersonAttributes($customerId, Attribute::SHOW_IN_CUSTOMERS);
-    }
-
-    public function postSave(int $customerId = 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));
 
-        $firstName = $this->nameize($firstName);
-        $lastName = $this->nameize($lastName);
+        // Format first and last name properly
+        $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'),
@@ -233,9 +263,9 @@ class Customers extends Persons
             'comments'     => $this->request->getPost('comments')
         ];
 
-        $dateFormatter = date_create_from_format($this->appConfig['dateformat'] . ' ' . $this->appConfig['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'),
@@ -244,57 +274,68 @@ 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->save_customer($personData, $customerData, $customerId)) {
-            $personId = $customerId == NEW_ENTRY ? $customerData['person_id'] : $customerId;
-            $this->savePersonAttributes($personId, Attribute::SHOW_IN_CUSTOMERS);
-
-            $mailchimpStatus = $this->request->getPost('mailchimp_status');
-            $this->mailchimpLib->addOrUpdateMember(
-                $this->listId,
+        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,
-                $firstName,
-                $lastName,
-                $mailchimpStatus == null ? "" : $mailchimpStatus,
+                $first_name,
+                $last_name,
+                $mailchimp_status == null ? "" : $mailchimp_status,
                 ['vip' => $this->request->getPost('mailchimp_vip') != null]
             );
 
-            if ($customerId == NEW_ENTRY) {
+            // New customer
+            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 {
+            } 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 {
+        } 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
             ]);
         }
     }
 
+    /**
+     * Verifies if an email address already exists. Used in app/Views/customers/form.php
+     *
+     * @return ResponseInterface
+     * @noinspection PhpUnused
+     */
     public function postCheckEmail(): ResponseInterface
     {
         $email = strtolower($this->request->getPost('email', FILTER_SANITIZE_EMAIL));
-        $personId = $this->request->getPost('person_id', FILTER_SANITIZE_NUMBER_INT);
+        $person_id = $this->request->getPost('person_id', FILTER_SANITIZE_NUMBER_INT);
 
-        $exists = $this->customer->check_email_exists($email, $personId);
+        $exists = $this->customer->check_email_exists($email, $person_id);
 
         return $this->response->setJSON(!$exists ? 'true' : 'false');
     }
 
+    /**
+     * Verifies if an account number already exists. Used in app/Views/customers/form.php
+     *
+     * @return ResponseInterface
+     * @noinspection PhpUnused
+     */
     public function postCheckAccountNumber(): ResponseInterface
     {
         $exists = $this->customer->check_account_number_exists($this->request->getPost('account_number'), $this->request->getPost('person_id', FILTER_SANITIZE_NUMBER_INT));
@@ -302,22 +343,27 @@ class Customers extends Persons
         return $this->response->setJSON(!$exists ? 'true' : 'false');
     }
 
+    /**
+     * This deletes customers from the customers table
+     * @return ResponseInterface
+     */
     public function postDelete(): ResponseInterface
     {
-        $customersToDelete = $this->request->getPost('ids');
-        $customersInfo = $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 ($customersInfo->getResult() as $info) {
+        foreach ($customers_info->getResult() as $info) {
             if ($this->customer->delete($info->person_id)) {
-                $this->mailchimpLib->removeMember($this->listId, $info->email);
+                // 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')
@@ -327,6 +373,12 @@ class Customers extends Persons
         }
     }
 
+    /**
+     * Customers import from csv spreadsheet
+     *
+     * @return DownloadResponse The template for Customer CSV imports is returned and download forced.
+     * @noinspection PhpUnused
+     */
     public function getCsv(): DownloadResponse
     {
         $name = 'importCustomers.csv';
@@ -334,17 +386,30 @@ class Customers extends Persons
         return $this->response->download($name, $data);
     }
 
+    /**
+     * Displays the customer CSV import modal. Used in app/Views/people/manage.php
+     *
+     * @return string
+     * @noinspection PhpUnused
+     */
     public function getCsvImport(): string
     {
         return view('customers/form_csv_import');
     }
 
+    /**
+     * Imports a CSV file containing customers. Used in app/Views/customers/form_csv_import.php
+     *
+     * @return ResponseInterface
+     * @noinspection PhpUnused
+     */
     public function postImportCsvFile(): ResponseInterface
     {
         if ($_FILES['file_path']['error'] != UPLOAD_ERR_OK) {
             return $this->response->setJSON(['success' => false, 'message' => lang('Customers.csv_import_failed')]);
         } else {
             if (($handle = fopen($_FILES['file_path']['tmp_name'], 'r')) !== false) {
+                // Skip the first row as it's the table description
                 fgetcsv($handle);
                 $i = 1;
 
@@ -355,7 +420,7 @@ class Customers extends Persons
 
                     if (sizeof($data) >= 16 && $consent) {
                         $email = strtolower($data[4]);
-                        $personData = [
+                        $person_data = [
                             'first_name'   => $data[0],
                             'last_name'    => $data[1],
                             'gender'       => $data[2],
@@ -370,7 +435,7 @@ class Customers extends Persons
                             'comments'     => $data[12]
                         ];
 
-                        $customerData = [
+                        $customer_data = [
                             'consent'       => $consent,
                             'company_name'  => $data[13],
                             'discount'      => $data[15],
@@ -379,13 +444,14 @@ class Customers extends Persons
                             'date'          => date('Y-m-d H:i:s'),
                             'employee_id'   => $this->employee->get_logged_in_employee_info()->person_id
                         ];
-                        $accountNumber = $data[14];
+                        $account_number = $data[14];
 
+                        // Don't duplicate people with same email
                         $invalidated = $this->customer->check_email_exists($email);
 
-                        if ($accountNumber != '') {
-                            $customerData['account_number'] = $accountNumber;
-                            $invalidated &= $this->customer->check_account_number_exists($accountNumber);
+                        if ($account_number != '') {
+                            $customer_data['account_number'] = $account_number;
+                            $invalidated &= $this->customer->check_account_number_exists($account_number);
                         }
                     } else {
                         $invalidated = true;
@@ -394,8 +460,9 @@ class Customers extends Persons
                     if ($invalidated) {
                         $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($personData, $customerData)) {
-                        $this->mailchimpLib->addOrUpdateMember($this->listId, $personData['email'], $personData['first_name'], '', $personData['last_name']);
+                    } 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[] = $i;
                     }
@@ -415,4 +482,4 @@ class Customers extends Persons
             }
         }
     }
-}
+}

app/Controllers/Employees.php

@@ -2,15 +2,18 @@
 
 namespace App\Controllers;
 
-use App\Models\Attribute;
 use App\Models\Module;
 use CodeIgniter\HTTP\ResponseInterface;
 use Config\Services;
 
+/**
+ *
+ *
+ * @property module module
+ *
+ */
 class Employees extends Persons
 {
-    protected Module $module;
-
     public function __construct()
     {
         parent::__construct('employees');
@@ -18,25 +21,35 @@ class Employees extends Persons
         $this->module = model('Module');
     }
 
+    /**
+     * Returns employee table data rows. This will be called with AJAX.
+     *
+     * @return void
+     */
     public function getSearch(): ResponseInterface
     {
         $search = $this->request->getGet('search');
-        $limit = $this->request->getGet('limit', FILTER_SANITIZE_NUMBER_INT);
+        $limit  = $this->request->getGet('limit', FILTER_SANITIZE_NUMBER_INT);
         $offset = $this->request->getGet('offset', FILTER_SANITIZE_NUMBER_INT);
-        $sort = $this->sanitizeSortColumn(person_headers(), $this->request->getGet('sort', FILTER_SANITIZE_FULL_SPECIAL_CHARS), 'people.person_id');
-        $order = $this->request->getGet('order', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
+        $sort   = $this->sanitizeSortColumn(person_headers(), $this->request->getGet('sort', FILTER_SANITIZE_FULL_SPECIAL_CHARS), 'people.person_id');
+        $order  = $this->request->getGet('order', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
 
         $employees = $this->employee->search($search, $limit, $offset, $sort, $order);
-        $totalRows = $this->employee->get_found_rows($search);
+        $total_rows = $this->employee->get_found_rows($search);
 
-        $dataRows = [];
+        $data_rows = [];
         foreach ($employees->getResult() as $person) {
-            $dataRows[] = get_person_data_row($person);
+            $data_rows[] = get_person_data_row($person);
         }
 
-        return $this->response->setJSON(['total' => $totalRows, 'rows' => $dataRows]);
+        return $this->response->setJSON(['total' => $total_rows, 'rows' => $data_rows]);
     }
 
+    /**
+     * AJAX called function gives search suggestions based on what is being searched for.
+     *
+     * @return ResponseInterface
+     */
     public function getSuggest(): ResponseInterface
     {
         $search = $this->request->getGet('term');
@@ -45,7 +58,10 @@ class Employees extends Persons
         return $this->response->setJSON($suggestions);
     }
 
-    public function suggestSearch(): ResponseInterface
+    /**
+     * @return ResponseInterface
+     */
+    public function suggest_search(): ResponseInterface
     {
         $search = $this->request->getPost('term');
         $suggestions = $this->employee->get_search_suggestions($search);
@@ -53,35 +69,39 @@ class Employees extends Persons
         return $this->response->setJSON($suggestions);
     }
 
-    public function getView(int $employeeId = NEW_ENTRY): string
+    /**
+     * Loads the employee edit form
+     * @return string
+     */
+    public function getView(int $employee_id = NEW_ENTRY): string
     {
-        $personInfo = $this->employee->get_info($employeeId);
-        $currentUser = $this->employee->get_logged_in_employee_info();
+        $person_info = $this->employee->get_info($employee_id);
+        $current_user = $this->employee->get_logged_in_employee_info();
 
-        if ($employeeId != NEW_ENTRY && !$this->employee->canModifyEmployee($personInfo->person_id, $currentUser->person_id)) {
+        if ($employee_id != NEW_ENTRY && !$this->employee->canModifyEmployee($person_info->person_id, $current_user->person_id)) {
             header('Location: ' . base_url('no_access/employees/employees'));
             exit();
         }
 
-        foreach (get_object_vars($personInfo) as $property => $value) {
-            $personInfo->$property = $value;
+        foreach (get_object_vars($person_info) as $property => $value) {
+            $person_info->$property = $value;
         }
-        $data['person_info'] = $personInfo;
-        $data['employee_id'] = $employeeId;
+        $data['person_info'] = $person_info;
+        $data['employee_id'] = $employee_id;
 
         $modules = [];
         foreach ($this->module->get_all_modules()->getResult() as $module) {
-            $module->grant = $this->employee->has_grant($module->module_id, $personInfo->person_id);
-            $module->menu_group = $this->employee->get_menu_group($module->module_id, $personInfo->person_id);
+            $module->grant = $this->employee->has_grant($module->module_id, $person_info->person_id);
+            $module->menu_group = $this->employee->get_menu_group($module->module_id, $person_info->person_id);
 
             $modules[] = $module;
         }
         $data['all_modules'] = $modules;
 
         $permissions = [];
-        foreach ($this->module->get_all_subpermissions()->getResult() as $permission) {
+        foreach ($this->module->get_all_subpermissions()->getResult() as $permission) {    // TODO: subpermissions does not follow naming standards.
             $permission->permission_id = str_replace(' ', '_', $permission->permission_id);
-            $permission->grant = $this->employee->has_grant($permission->permission_id, $personInfo->person_id);
+            $permission->grant = $this->employee->has_grant($permission->permission_id, $person_info->person_id);
 
             $permissions[] = $permission;
         }
@@ -90,18 +110,17 @@ class Employees extends Persons
         return view('employees/form', $data);
     }
 
-    public function getAttributes(int $employeeId = NEW_ENTRY): string
+    /**
+     * Inserts/updates an employee
+     * @return ResponseInterface
+     */
+    public function postSave(int $employee_id = NEW_ENTRY): ResponseInterface
     {
-        return $this->getPersonAttributes($employeeId, Attribute::SHOW_IN_EMPLOYEES);
-    }
+        $current_user = $this->employee->get_logged_in_employee_info();
 
-    public function postSave(int $employeeId = NEW_ENTRY): ResponseInterface
-    {
-        $currentUser = $this->employee->get_logged_in_employee_info();
-
-        if ($employeeId != NEW_ENTRY) {
-            $targetEmployee = $this->employee->get_info($employeeId);
-            if (!$this->employee->canModifyEmployee($targetEmployee->person_id, $currentUser->person_id)) {
+        if ($employee_id != NEW_ENTRY) {
+            $target_employee = $this->employee->get_info($employee_id);
+            if (!$this->employee->canModifyEmployee($target_employee->person_id, $current_user->person_id)) {
                 return $this->response->setJSON([
                     'success' => false,
                     'message' => lang('Employees.error_updating_admin'),
@@ -110,16 +129,17 @@ class Employees extends Persons
             }
         }
 
-        $firstName = $this->request->getPost('first_name', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
-        $lastName = $this->request->getPost('last_name', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
+        $first_name = $this->request->getPost('first_name', FILTER_SANITIZE_FULL_SPECIAL_CHARS);    // TODO: duplicated code
+        $last_name = $this->request->getPost('last_name', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
         $email = strtolower($this->request->getPost('email', FILTER_SANITIZE_EMAIL));
 
-        $firstName = $this->nameize($firstName);
-        $lastName = $this->nameize($lastName);
+        // format first and last name properly
+        $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', FILTER_SANITIZE_FULL_SPECIAL_CHARS),
@@ -132,98 +152,108 @@ class Employees extends Persons
             'comments'     => $this->request->getPost('comments', FILTER_SANITIZE_FULL_SPECIAL_CHARS)
         ];
 
-        $grantsArray = [];
-        $isAdmin = $this->employee->isAdmin($currentUser->person_id);
+        $grants_array = [];
+        $isAdmin = $this->employee->isAdmin($current_user->person_id);
 
         foreach ($this->module->get_all_permissions()->getResult() as $permission) {
             $grants = [];
             $grant = $this->request->getPost('grant_' . $permission->permission_id) != null ? $this->request->getPost('grant_' . $permission->permission_id, FILTER_SANITIZE_FULL_SPECIAL_CHARS) : '';
 
             if ($grant == $permission->permission_id) {
-                if (!$isAdmin && !$this->employee->has_grant($permission->permission_id, $currentUser->person_id)) {
+                if (!$isAdmin && !$this->employee->has_grant($permission->permission_id, $current_user->person_id)) {
                     continue;
                 }
                 $grants['permission_id'] = $permission->permission_id;
                 $grants['menu_group'] = $this->request->getPost('menu_group_' . $permission->permission_id) != null ? $this->request->getPost('menu_group_' . $permission->permission_id, FILTER_SANITIZE_FULL_SPECIAL_CHARS) : '--';
-                $grantsArray[] = $grants;
+                $grants_array[] = $grants;
             }
         }
 
+        // Password has been changed OR first time password set
         if (!empty($this->request->getPost('password')) && ENVIRONMENT != 'testing') {
             $exploded = explode(":", $this->request->getPost('language', FILTER_SANITIZE_FULL_SPECIAL_CHARS));
-            $employeeData = [
+            $employee_data = [
                 'username'      => $this->request->getPost('username', FILTER_SANITIZE_FULL_SPECIAL_CHARS),
                 'password'      => password_hash($this->request->getPost('password'), PASSWORD_DEFAULT),
                 'hash_version'  => 2,
                 'language_code' => $exploded[0],
                 'language'      => $exploded[1]
             ];
-        } else {
+        } else { // Password not changed
             $exploded = explode(":", $this->request->getPost('language', FILTER_SANITIZE_FULL_SPECIAL_CHARS));
-            $employeeData = [
+            $employee_data = [
                 'username'      => $this->request->getPost('username', FILTER_SANITIZE_FULL_SPECIAL_CHARS),
                 'language_code' => $exploded[0],
                 'language'      => $exploded[1]
             ];
         }
 
-        if ($this->employee->save_employee($personData, $employeeData, $grantsArray, $employeeId)) {
-            $personId = $employeeId == NEW_ENTRY ? $employeeData['person_id'] : $employeeId;
-            $this->savePersonAttributes($personId, Attribute::SHOW_IN_EMPLOYEES);
-
-            if ($employeeId == NEW_ENTRY) {
+        if ($this->employee->save_employee($person_data, $employee_data, $grants_array, $employee_id)) {
+            // New employee
+            if ($employee_id == NEW_ENTRY) {
                 return $this->response->setJSON([
                     'success' => true,
-                    'message' => lang('Employees.successful_adding') . ' ' . $firstName . ' ' . $lastName,
-                    'id'      => $employeeData['person_id']
+                    'message' => lang('Employees.successful_adding') . ' ' . $first_name . ' ' . $last_name,
+                    'id'      => $employee_data['person_id']
                 ]);
-            } else {
-                $loggedInEmployeeId = session()->get('person_id');
-                if ($employeeId == $loggedInEmployeeId) {
-                    session()->set('language_code', $employeeData['language_code']);
-                    session()->set('language', $employeeData['language']);
+            } else { // Existing employee
+                $logged_in_employee_id = session()->get('person_id');
+                if ($employee_id == $logged_in_employee_id) {
+                    session()->set('language_code', $employee_data['language_code']);
+                    session()->set('language', $employee_data['language']);
                 }
                 return $this->response->setJSON([
                     'success' => true,
-                    'message' => lang('Employees.successful_updating') . ' ' . $firstName . ' ' . $lastName,
-                    'id'      => $employeeId
+                    'message' => lang('Employees.successful_updating') . ' ' . $first_name . ' ' . $last_name,
+                    'id'      => $employee_id
                 ]);
             }
-        } else {
+        } else { // Failure
             return $this->response->setJSON([
                 'success' => false,
-                'message' => lang('Employees.error_adding_updating') . ' ' . $firstName . ' ' . $lastName,
+                'message' => lang('Employees.error_adding_updating') . ' ' . $first_name . ' ' . $last_name,
                 'id'      => NEW_ENTRY
             ]);
         }
     }
 
+    /**
+     * This deletes employees from the employees table
+     * @return ResponseInterface
+     */
     public function postDelete(): ResponseInterface
     {
-        $employeesToDelete = $this->request->getPost('ids', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
-        $currentUser = $this->employee->get_logged_in_employee_info();
+        $employees_to_delete = $this->request->getPost('ids', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
+        $current_user = $this->employee->get_logged_in_employee_info();
 
-        if (!$this->employee->isAdmin($currentUser->person_id)) {
-            foreach ($employeesToDelete as $empId) {
-                if ($this->employee->isAdmin((int)$empId)) {
+        if (!$this->employee->isAdmin($current_user->person_id)) {
+            foreach ($employees_to_delete as $emp_id) {
+                if ($this->employee->isAdmin((int)$emp_id)) {
                     return $this->response->setJSON(['success' => false, 'message' => lang('Employees.error_deleting_admin')]);
                 }
             }
         }
 
-        if ($this->employee->delete_list($employeesToDelete)) {
+        if ($this->employee->delete_list($employees_to_delete)) {    // TODO: this is passing a string, but delete_list expects an array
             return $this->response->setJSON([
                 'success' => true,
-                'message' => lang('Employees.successful_deleted') . ' ' . count($employeesToDelete) . ' ' . lang('Employees.one_or_multiple')
+                'message' => lang('Employees.successful_deleted') . ' ' . count($employees_to_delete) . ' ' . lang('Employees.one_or_multiple')
             ]);
         } else {
             return $this->response->setJSON(['success' => false, 'message' => lang('Employees.cannot_be_deleted')]);
         }
     }
 
-    public function getCheckUsername($employeeId): ResponseInterface
+    /**
+     * Checks an employee username against the database. Used in app\Views\employees\form.php
+     *
+     * @param $employee_id
+     * @return ResponseInterface
+     * @noinspection PhpUnused
+     */
+    public function getCheckUsername($employee_id): ResponseInterface
     {
-        $exists = $this->employee->username_exists($employeeId, $this->request->getGet('username'));
+        $exists = $this->employee->username_exists($employee_id, $this->request->getGet('username'));
         return $this->response->setJSON(!$exists ? 'true' : 'false');
     }
-}
+}

app/Controllers/Home.php

@@ -43,7 +43,7 @@ class Home extends Secure_Controller
     public function getChangePassword(int $employeeId = NEW_ENTRY): ResponseInterface|string
     {
         $loggedInEmployee = $this->employee->get_logged_in_employee_info();
-        $currentPersonId = $loggedInEmployee->person_id;
+        $currentPersonId = (int) $loggedInEmployee->person_id;
 
         $employeeId = $employeeId === NEW_ENTRY ? $currentPersonId : $employeeId;
 
@@ -68,10 +68,11 @@ 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 ? $currentUser->person_id : $employeeId;
+        $employeeId = $employeeId === NEW_ENTRY ? $currentPersonId : $employeeId;
 
-        if (!$this->employee->isAdmin($currentUser->person_id) && $employeeId !== $currentUser->person_id) {
+        if (!$this->employee->isAdmin($currentPersonId) && $employeeId !== $currentPersonId) {
             return $this->response->setStatusCode(403)->setJSON([
                 'success' => false,
                 'message' => lang('Employees.unauthorized_modify')

app/Controllers/Persons.php

@@ -2,28 +2,28 @@
 
 namespace App\Controllers;
 
-use App\Models\Attribute;
 use App\Models\Person;
 use CodeIgniter\HTTP\ResponseInterface;
-use Config\OSPOS;
 use Config\Services;
 use function Tamtamchik\NameCase\str_name_case;
 
 abstract class Persons extends Secure_Controller
 {
     protected Person $person;
-    protected Attribute $attribute;
-    protected array $appConfig;
 
-    public function __construct(?string $moduleId = null)
+    /**
+     * @param string|null $module_id
+     */
+    public function __construct(?string $module_id = null)
     {
-        parent::__construct($moduleId);
+        parent::__construct($module_id);
 
         $this->person = model(Person::class);
-        $this->attribute = model(Attribute::class);
-        $this->appConfig = config(OSPOS::class)->settings;
     }
 
+    /**
+     * @return string
+     */
     public function getIndex(): string
     {
         $data['table_headers'] = get_people_manage_table_headers();
@@ -31,6 +31,10 @@ abstract class Persons extends Secure_Controller
         return view('people/manage', $data);
     }
 
+    /**
+     * Gives search suggestions based on what is being searched for
+     * @return ResponseInterface
+     */
     public function getSuggest(): ResponseInterface
     {
         $search = $this->request->getGet('term');
@@ -39,88 +43,34 @@ abstract class Persons extends Secure_Controller
         return $this->response->setJSON($suggestions);
     }
 
-    public function getRow(int $rowId): ResponseInterface
+    /**
+     * Gets one row for a person manage table. This is called using AJAX to update one row.
+     * @return ResponseInterface
+     */
+    public function getRow(int $row_id): ResponseInterface
     {
-        $dataRow = get_person_data_row($this->person->get_info($rowId));
+        $data_row = get_person_data_row($this->person->get_info($row_id));
 
-        return $this->response->setJSON($dataRow);
-    }
-
-    protected function getPersonAttributes(int $personId, int $definitionFlags): string
-    {
-        $data['person_id'] = $personId;
-        $data['config'] = $this->appConfig;
-        $definitionIds = json_decode($this->request->getGet('definition_ids') ?? '', true);
-        $data['definition_values'] = $this->attribute->getAttributesByPerson($personId) + $this->attribute->get_values_by_definitions($definitionIds);
-        $data['definition_names'] = $this->attribute->getDefinitionsByType(true, $definitionFlags);
-
-        foreach ($data['definition_values'] as $definitionId => $definitionValue) {
-            $attributeValue = $this->attribute->getPersonAttributeValue($personId, $definitionId);
-            $attributeId = (empty($attributeValue) || empty($attributeValue->attribute_id)) ? null : $attributeValue->attribute_id;
-            $values = &$data['definition_values'][$definitionId];
-            $values['attribute_id'] = $attributeId;
-            $values['attribute_value'] = $attributeValue;
-            $values['selected_value'] = '';
-
-            if ($definitionValue['definition_type'] === DROPDOWN) {
-                $values['values'] = $this->attribute->get_definition_values($definitionId);
-                $linkValue = $this->getPersonLinkValue($personId, $definitionId);
-                $values['selected_value'] = (empty($linkValue)) ? '' : $linkValue->attribute_id;
-            }
-
-            if (!empty($definitionIds[$definitionId])) {
-                $values['selected_value'] = $definitionIds[$definitionId];
-            }
-
-            unset($data['definition_names'][$definitionId]);
-        }
-
-        return view('attributes/person', $data);
-    }
-
-    private function getPersonLinkValue(int $personId, int $definitionId): ?object
-    {
-        $builder = $this->db->table('attribute_links');
-        $builder->where('person_id', $personId);
-        $builder->where('item_id', null);
-        $builder->where('sale_id', null);
-        $builder->where('receiving_id', null);
-        $builder->where('definition_id', $definitionId);
-
-        return $builder->get()->getRowObject();
-    }
-
-    protected function savePersonAttributes(int $personId, int $definitionFlags): void
-    {
-        $attributeLinks = $this->request->getPost('attribute_links') ?? [];
-        $attributeIds = $this->request->getPost('attribute_ids') ?? [];
-
-        $this->attribute->deletePersonAttributeLinks($personId);
-
-        foreach ($attributeLinks as $definitionId => $attributeId) {
-            $definitionInfo = $this->attribute->getAttributeInfo((int)$definitionId);
-            $definitionType = $definitionInfo->definition_type;
-
-            if ($definitionType !== DROPDOWN) {
-                $attributeId = $this->attribute->savePersonAttributeValue(
-                    $attributeId,
-                    (int)$definitionId,
-                    $personId,
-                    $attributeIds[$definitionId] ?? false,
-                    $definitionType
-                );
-            }
-
-            $this->attribute->savePersonAttributeLink($personId, (int)$definitionId, (int)$attributeId);
-        }
+        return $this->response->setJSON($data_row);
     }
 
+    /**
+     * Capitalize segments of a name, and put the rest into lower case.
+     * You can pass the characters you want to use as delimiters as exceptions.
+     * The function supports UTF-8 strings
+     *
+     * Example:
+     * i.e. <?php echo nameize("john o'grady-smith"); ?>
+     *
+     * returns John O'Grady-Smith
+     */
     protected function nameize(string $input): string
     {
-        $adjustedName = str_name_case($input);
+        $adjusted_name = str_name_case($input);
 
+        // TODO: Use preg_replace to match HTML entities and convert them to lowercase. This is a workaround for https://github.com/tamtamchik/namecase/issues/20
         return preg_replace_callback('/&[a-zA-Z0-9#]+;/', function ($matches) {
             return strtolower($matches[0]);
-        }, $adjustedName);
+        }, $adjusted_name);
     }
-}
+}

app/Controllers/Sales.php

@@ -1253,6 +1253,7 @@ 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.
@@ -1641,7 +1642,9 @@ class Sales extends Secure_Controller
      */
     public function getSalesKeyboardHelp(): string
     {
-        return view('sales/help');
+        return view('sales/help', [
+            'keyboardShortcuts' => $this->sale_lib->getKeyShortcuts()
+        ]);
     }
 
     /**

app/Controllers/Suppliers.php

@@ -2,7 +2,6 @@
 
 namespace App\Controllers;
 
-use App\Models\Attribute;
 use App\Models\Supplier;
 use CodeIgniter\HTTP\ResponseInterface;
 use Config\Services;
@@ -18,6 +17,9 @@ class Suppliers extends Persons
         $this->supplier = model(Supplier::class);
     }
 
+    /**
+     * @return string
+     */
     public function getIndex(): string
     {
         $data['table_headers'] = get_suppliers_manage_table_headers();
@@ -25,14 +27,23 @@ class Suppliers extends Persons
         return view('people/manage', $data);
     }
 
-    public function getRow($rowId): ResponseInterface
+    /**
+     * Gets one row for a supplier manage table. This is called using AJAX to update one row.
+     * @param $row_id
+     * @return ResponseInterface
+     */
+    public function getRow($row_id): ResponseInterface
     {
-        $dataRow = get_supplier_data_row($this->supplier->get_info($rowId));
-        $dataRow['category'] = $this->supplier->get_category_name($dataRow['category']);
+        $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($dataRow);
+        return $this->response->setJSON($data_row);
     }
 
+    /**
+     * Returns Supplier table data rows. This will be called with AJAX.
+     * @return void
+     **/
     public function getSearch(): ResponseInterface
     {
         $search = $this->request->getGet('search');
@@ -42,19 +53,23 @@ class Suppliers extends Persons
         $order = $this->request->getGet('order', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
 
         $suppliers = $this->supplier->search($search, $limit, $offset, $sort, $order);
-        $totalRows = $this->supplier->get_found_rows($search);
+        $total_rows = $this->supplier->get_found_rows($search);
 
-        $dataRows = [];
+        $data_rows = [];
 
         foreach ($suppliers->getResult() as $supplier) {
             $row = get_supplier_data_row($supplier);
             $row['category'] = $this->supplier->get_category_name($row['category']);
-            $dataRows[] = $row;
+            $data_rows[] = $row;
         }
 
-        return $this->response->setJSON(['total' => $totalRows, 'rows' => $dataRows]);
+        return $this->response->setJSON(['total' => $total_rows, 'rows' => $data_rows]);
     }
 
+    /**
+     * Gives search suggestions based on what is being searched for
+     * @return ResponseInterface
+     **/
     public function getSuggest(): ResponseInterface
     {
         $search = $this->request->getGet('term');
@@ -63,7 +78,10 @@ class Suppliers extends Persons
         return $this->response->setJSON($suggestions);
     }
 
-    public function suggestSearch(): ResponseInterface
+    /**
+     * @return ResponseInterface
+     */
+    public function suggest_search(): ResponseInterface
     {
         $search = $this->request->getPost('term');
         $suggestions = $this->supplier->get_search_suggestions($search, false);
@@ -71,9 +89,15 @@ class Suppliers extends Persons
         return $this->response->setJSON($suggestions);
     }
 
-    public function getView(int $supplierId = NEW_ENTRY): string
+    /**
+     * Loads the supplier edit form
+     *
+     * @param int $supplier_id
+     * @return string
+     */
+    public function getView(int $supplier_id = NEW_ENTRY): string
     {
-        $info = $this->supplier->get_info($supplierId);
+        $info = $this->supplier->get_info($supplier_id);
         foreach (get_object_vars($info) as $property => $value) {
             $info->$property = $value;
         }
@@ -83,23 +107,25 @@ class Suppliers extends Persons
         return view("suppliers/form", $data);
     }
 
-    public function getAttributes(int $supplierId = NEW_ENTRY): string
+    /**
+     * Inserts/updates a supplier
+     *
+     * @param int $supplier_id
+     * @return ResponseInterface
+     */
+    public function postSave(int $supplier_id = NEW_ENTRY): ResponseInterface
     {
-        return $this->getPersonAttributes($supplierId, Attribute::SHOW_IN_SUPPLIERS);
-    }
-
-    public function postSave(int $supplierId = NEW_ENTRY): ResponseInterface
-    {
-        $firstName = $this->request->getPost('first_name', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
-        $lastName = $this->request->getPost('last_name', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
+        $first_name = $this->request->getPost('first_name', FILTER_SANITIZE_FULL_SPECIAL_CHARS);    // TODO: Duplicate code
+        $last_name = $this->request->getPost('last_name', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
         $email = strtolower($this->request->getPost('email', FILTER_SANITIZE_EMAIL));
 
-        $firstName = $this->nameize($firstName);
-        $lastName = $this->nameize($lastName);
+        // Format first and last name properly
+        $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'),
             'email'        => $email,
             'phone_number' => $this->request->getPost('phone_number', FILTER_SANITIZE_FULL_SPECIAL_CHARS),
@@ -112,7 +138,7 @@ class Suppliers extends Persons
             'comments'     => $this->request->getPost('comments', FILTER_SANITIZE_FULL_SPECIAL_CHARS)
         ];
 
-        $supplierData = [
+        $supplier_data = [
             'company_name'   => $this->request->getPost('company_name', FILTER_SANITIZE_FULL_SPECIAL_CHARS),
             'agency_name'    => $this->request->getPost('agency_name', FILTER_SANITIZE_FULL_SPECIAL_CHARS),
             'category'       => $this->request->getPost('category', FILTER_SANITIZE_FULL_SPECIAL_CHARS),
@@ -120,43 +146,47 @@ class Suppliers extends Persons
             'tax_id'         => $this->request->getPost('tax_id', FILTER_SANITIZE_NUMBER_INT)
         ];
 
-        if ($this->supplier->save_supplier($personData, $supplierData, $supplierId)) {
-            $personId = $supplierId == NEW_ENTRY ? $supplierData['person_id'] : $supplierId;
-            $this->savePersonAttributes($personId, Attribute::SHOW_IN_SUPPLIERS);
-
-            if ($supplierId == NEW_ENTRY) {
+        if ($this->supplier->save_supplier($person_data, $supplier_data, $supplier_id)) {
+            // New supplier
+            if ($supplier_id == NEW_ENTRY) {
                 return $this->response->setJSON([
                     'success' => true,
-                    'message' => lang('Suppliers.successful_adding') . ' ' . $supplierData['company_name'],
-                    'id'      => $supplierData['person_id']
+                    'message' => lang('Suppliers.successful_adding') . ' ' . $supplier_data['company_name'],
+                    'id'      => $supplier_data['person_id']
                 ]);
-            } else {
+            } else { // Existing supplier
+
                 return $this->response->setJSON([
                     'success' => true,
-                    'message' => lang('Suppliers.successful_updating') . ' ' . $supplierData['company_name'],
-                    'id'      => $supplierId
+                    'message' => lang('Suppliers.successful_updating') . ' ' . $supplier_data['company_name'],
+                    'id'      => $supplier_id
                 ]);
             }
-        } else {
+        } else { // Failure
             return $this->response->setJSON([
                 'success' => false,
-                'message' => lang('Suppliers.error_adding_updating') . ' ' . $supplierData['company_name'],
+                'message' => lang('Suppliers.error_adding_updating') . ' ' .     $supplier_data['company_name'],
                 'id'      => NEW_ENTRY
             ]);
         }
     }
 
+    /**
+     * This deletes suppliers from the suppliers table
+     *
+     * @return ResponseInterface
+     */
     public function postDelete(): ResponseInterface
     {
-        $suppliersToDelete = $this->request->getPost('ids', FILTER_SANITIZE_NUMBER_INT);
+        $suppliers_to_delete = $this->request->getPost('ids', FILTER_SANITIZE_NUMBER_INT);
 
-        if ($this->supplier->delete_list($suppliersToDelete)) {
+        if ($this->supplier->delete_list($suppliers_to_delete)) {
             return $this->response->setJSON([
                 'success' => true,
-                'message' => lang('Suppliers.successful_deleted') . ' ' . count($suppliersToDelete) . ' ' . lang('Suppliers.one_or_multiple')
+                'message' => lang('Suppliers.successful_deleted') . ' ' . count($suppliers_to_delete) . ' ' . lang('Suppliers.one_or_multiple')
             ]);
         } else {
             return $this->response->setJSON(['success' => false, 'message' => lang('Suppliers.cannot_be_deleted')]);
         }
     }
-}
+}

app/Database/Dockerfile

@@ -1,5 +1,5 @@
 FROM alpine:3.14
-MAINTAINER jekkos
+LABEL maintainer="jekkos"
 
 ADD database.sql /docker-entrypoint-initdb.d/database.sql
 VOLUME /docker-entrypoint-initdb.d

app/Database/Migrations/20260402000000_AddPersonToAttributeLinks.php

@@ -1,61 +0,0 @@
-<?php
-
-namespace App\Database\Migrations;
-
-use CodeIgniter\Database\Migration;
-use Config\Database;
-
-class AddPersonToAttributeLinks extends Migration
-{
-    public function up(): void
-    {
-        helper('migration');
-        
-        // First, modify the generated unique column to include person_id
-        // Drop the existing unique constraint
-        $this->db->query('ALTER TABLE `ospos_attribute_links` DROP INDEX `attribute_links_uq3`');
-        $this->db->query('ALTER TABLE `ospos_attribute_links` DROP COLUMN `generated_unique_column`');
-        
-        // Add person_id column
-        $this->db->query('ALTER TABLE `ospos_attribute_links` ADD COLUMN `person_id` INT(10) NULL AFTER `receiving_id`');
-        
-        // Add index for person_id
-        $this->db->query('ALTER TABLE `ospos_attribute_links` ADD KEY `person_id` (`person_id`)');
-        
-        // Add foreign key constraint for person_id
-        $this->db->query('ALTER TABLE `ospos_attribute_links` ADD CONSTRAINT `ospos_attribute_links_ibfk_6` FOREIGN KEY (`person_id`) REFERENCES `ospos_people` (`person_id`) ON DELETE CASCADE');
-        
-        // Recreate the generated unique column with person_id support
-        // This ensures uniqueness for both item attributes and person attributes
-        $this->db->query("ALTER TABLE `ospos_attribute_links`
-            ADD COLUMN `generated_unique_column` VARCHAR(255) GENERATED ALWAYS AS (
-                CASE
-                    WHEN `sale_id` IS NULL AND `receiving_id` IS NULL AND `item_id` IS NOT NULL THEN CONCAT('item-', `definition_id`, '-', `item_id`)
-                    WHEN `sale_id` IS NULL AND `receiving_id` IS NULL AND `item_id` IS NULL AND `person_id` IS NOT NULL THEN CONCAT('person-', `definition_id`, '-', `person_id`)
-                    ELSE NULL
-                END
-            ) STORED");
-        
-        // Re-add unique constraint
-        $this->db->query('ALTER TABLE `ospos_attribute_links` ADD UNIQUE INDEX `attribute_links_uq3` (`generated_unique_column`)');
-    }
-
-    public function down(): void
-    {
-        // Drop person_id related constraints and column
-        $this->db->query('ALTER TABLE `ospos_attribute_links` DROP INDEX `attribute_links_uq3`');
-        $this->db->query('ALTER TABLE `ospos_attribute_links` DROP COLUMN `generated_unique_column`');
-        $this->db->query('ALTER TABLE `ospos_attribute_links` DROP FOREIGN KEY `ospos_attribute_links_ibfk_6`');
-        $this->db->query('ALTER TABLE `ospos_attribute_links` DROP COLUMN `person_id`');
-        
-        // Restore original generated column
-        $this->db->query("ALTER TABLE `ospos_attribute_links`
-            ADD COLUMN `generated_unique_column` VARCHAR(255) GENERATED ALWAYS AS (
-                CASE
-                    WHEN `sale_id` IS NULL AND `receiving_id` IS NULL AND `item_id` IS NOT NULL THEN CONCAT(`definition_id`, '-', `item_id`)
-                    ELSE NULL
-                END
-            ) STORED");
-        $this->db->query('ALTER TABLE `ospos_attribute_links` ADD UNIQUE INDEX `attribute_links_uq3` (`generated_unique_column`)');
-    }
-}

app/Database/Migrations/20260403000000_AddPersonAttributeFlag.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Database\Migrations;
-
-use CodeIgniter\Database\Migration;
-
-class AddPersonAttributeFlag extends Migration
-{
-    public function up(): void
-    {
-        $this->db->query('ALTER TABLE `ospos_attribute_definitions` ADD COLUMN `person_attribute` TINYINT(1) DEFAULT 0 AFTER `definition_flags`');
-    }
-
-    public function down(): void
-    {
-        $this->db->query('ALTER TABLE `ospos_attribute_definitions` DROP COLUMN `person_attribute`');
-    }
-}

app/Database/Migrations/20260506000000_AddShortcutKeys.php

@@ -0,0 +1,46 @@
+<?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/Language/en/Attributes.php

@@ -23,10 +23,6 @@ return [
     "new"                              => "New Attribute",
     "no_attributes_to_display"         => "No Attributes to display",
     "receipt_visibility"               => "Receipt",
-    "show_in_customers"                => "Show in customers",
-    "show_in_customers_visibility"     => "Customers",
-    "show_in_employees"                => "Show in employees",
-    "show_in_employees_visibility"     => "Employees",
     "show_in_items"                    => "Show in items",
     "show_in_items_visibility"         => "Items",
     "show_in_receipt"                  => "Show in receipt",
@@ -34,7 +30,5 @@ return [
     "show_in_receivings_visibility"    => "Receivings",
     "show_in_sales"                    => "Show in sales",
     "show_in_sales_visibility"         => "Sales",
-    "show_in_suppliers"                => "Show in suppliers",
-    "show_in_suppliers_visibility"     => "Suppliers",
     "update"                           => "Update Attribute",
 ];

app/Language/en/Config.php

@@ -302,6 +302,10 @@ return [
     "suggestions_layout"                        => "Search Suggestions Layout",
     "suggestions_second_column"                 => "Column 2",
     "suggestions_third_column"                  => "Column 3",
+    "shortcuts"                                 => "Shortcuts",
+    "shortcuts_configuration"                   => "Sales Keyboard Shortcut Configuration",
+    "shortcuts_duplicate_bindings"              => "Shortcut bindings must be unique.",
+    "shortcuts_save_error"                       => "Unable to save shortcut settings.",
     "system_conf"                               => "Setup & Conf",
     "system_info"                               => "System Info",
     "table"                                     => "Table",

app/Language/es-ES/Items.php

@@ -26,7 +26,7 @@ return [
     "cost_price_required"                => "Precio al Por Mayor es un campo requerido.",
     "count"                              => "Actualizar Inventario",
     "csv_import_failed"                  => "Falló la importación de Hoja de Cálculo",
-    "csv_import_invalid_location"        => "Ubicación(es) de stock inválida(s) encontrada(s): {0}. Solo ubicaciones de stock válidas son permitidas.",
+    "csv_import_invalid_location"        => "Se encontraron ubicaciones de stock no válidas: {0}. Solo se permiten ubicaciones de stock válidas.",
     "csv_import_nodata_wrongformat"      => "El archivo subido no tiene datos o el formato es incorrecto.",
     "csv_import_partially_failed"        => "Hubo {0} falla(s) en la importación de producto(s) en la(s) línea(s): {1}. Ninguna fila ha sido importada.",
     "csv_import_success"                 => "Se importaron los articulos exitosamente.",

app/Language/ka/Calendar.php

@@ -38,7 +38,7 @@ return [
     "february"  => "",
     "march"     => "",
     "april"     => "",
-    "mayl"      => "",
+    "may"       => "",
     "june"      => "",
     "july"      => "",
     "august"    => "",
@@ -46,4 +46,4 @@ return [
     "october"   => "",
     "november"  => "",
     "december"  => "",
-];
+];

app/Language/lo/Calendar.php

@@ -38,7 +38,7 @@ return [
     "february"  => "",
     "march"     => "",
     "april"     => "",
-    "mayl"      => "",
+    "may"       => "",
     "june"      => "",
     "july"      => "",
     "august"    => "",
@@ -46,4 +46,4 @@ return [
     "october"   => "",
     "november"  => "",
     "december"  => "",
-];
+];

app/Language/ml/Calendar.php

@@ -38,7 +38,7 @@ return [
     "february"  => "ഫെബ്രുവരി",
     "march"     => "മാർച്ച്",
     "april"     => "ഏപ്രിൽ",
-    "mayl"      => "മേയ്",
+    "may"       => "മേയ്",
     "june"      => "ജൂൺ",
     "july"      => "ജൂലൈ",
     "august"    => "ആഗസ്റ്റ്",
@@ -46,4 +46,4 @@ return [
     "october"   => "ഒക്ടോബർ",
     "november"  => "നവംബർ",
     "december"  => "ഡിസംബർ",
-];
+];

app/Language/nb/Calendar.php

@@ -38,7 +38,7 @@ return [
     "february"  => "Februar",
     "march"     => "Mars",
     "april"     => "April",
-    "mayl"      => "Mai",
+    "may"       => "Mai",
     "june"      => "Juni",
     "july"      => "Juli",
     "august"    => "August",
@@ -46,4 +46,4 @@ return [
     "october"   => "Oktober",
     "november"  => "November",
     "december"  => "Desember",
-];
+];

app/Language/th/Bootstrap_tables.php

@@ -1,12 +1,12 @@
 <?php
 
 return [
-    "all"                  => "ทั้งหมด",
-    "columns"              => "คอลัมน์",
-    "hide_show_pagination" => "ซ่อน/แสดง รายการหน้า",
-    "loading"              => "กำลังดำเนินการ รอสักครู่",
-    "page_from_to"         => "แสดง {0} ถึง {1} จาก {2} รายการ",
-    "refresh"              => "Refresh ข้อมูล",
-    "rows_per_page"        => "{0} รายการ/หน้า",
-    "toggle"               => "ซ่อน/แสดง",
+    'all' => "ทั้งหมด",
+    'columns' => "คอลัมน์",
+    'hide_show_pagination' => "ซ่อน/แสดง รายการหน้า",
+    'loading' => "กำลังดำเนินการ รอสักครู่ ...",
+    'page_from_to' => "แสดง {0} ถึง {1} จาก {2} รายการ",
+    'refresh' => "Refresh ข้อมูล",
+    'rows_per_page' => "{0} รายการ/หน้า",
+    'toggle' => "ซ่อน/แสดง",
 ];

app/Language/th/Login.php

@@ -9,7 +9,9 @@ return [
     "login"                         => "ลงชื่อเข้าใช้",
     "logout"                        => "ออกจากระบบ",
     "migration_needed"              => "การย้ายฐานข้อมูลไปยัง {0} จะเริ่มต้นหลังจากเข้าสู่ระบบ",
-    "migration_required"            => "",
+    "migration_required" => "จําเป็นต้องมีการปรับปรุงฐานข้อมูล",
+    "migration_auth_message" => "ผู้ดูแลระบบจำเป็นต้องมีสิทธิ์ในการปรับปรุงฐานข้อมูลเวอร์ชั่น {0} กรุณาเข้าระบบเพื่อดำเนินการต่อ",
+    "migration_complete_redirect" => "ทำการปรับปรุงฐานข้อมูลเรียบร้อย กำลังดำเนินการไปหน้าเข้าสู่ระบบ ...",
     "migration_auth_message"        => "",
     "migration_initializing"        => "",
     "migration_running"             => "",
@@ -17,7 +19,6 @@ return [
     "migration_complete_login"      => "",
     "migration_failed"              => "",
     "migration_error_connection"    => "",
-    "migration_complete_redirect"   => "",
     "password"                      => "รหัสผ่าน",
     "required_username"             => "จำเป็นต้องระบุชื่อผู้ใช้งาน",
     "username"                      => "ชื่อผู้ใช้",

app/Language/th/Sales.php

@@ -1,232 +1,232 @@
 <?php
 
 return [
-    "customers_available_points"       => "คะแนนที่มี",
-    "rewards_package"                  => "คะแนนสะสม",
-    "rewards_remaining_balance"        => "คะแนนสะสมคงเหลือ ",
-    "account_number"                   => "บัญชี #",
-    "add_payment"                      => "เพิ่มบิล",
-    "amount_due"                       => "ยอดค้างชำระ",
-    "amount_tendered"                  => "ชำระเข้ามา",
-    "authorized_signature"             => "ลายเซ็นผู้มีอำนาจ",
-    "cancel_sale"                      => "ยกเลิกการขาย",
-    "cash"                             => "เงินสด",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "การปรับเงินสดขาย",
-    "cash_deposit"                     => "ฝากเงินสด",
-    "cash_filter"                      => "เงินสด",
-    "change_due"                       => "เงินทอน",
-    "change_price"                     => "เปลี่ยนราคาขาย",
-    "check"                            => "โอนเงิน/พร้อมเพย์/เช็ค",
-    "check_balance"                    => "เช็คยอดคงเหลือ",
-    "check_filter"                     => "ตรวจสอบ",
-    "close"                            => "",
-    "comment"                          => "หมายเหตุ",
-    "comments"                         => "หมายเหตุ",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "จบการขาย",
-    "confirm_cancel_sale"              => "แน่ใจหรือไม่ที่จะล้างการขายนี้? ทุกรายการจะถูกลบทั้งหมด",
-    "confirm_delete"                   => "โปรดยืนยันการลบรายการขายที่เลือกไว้ ?",
-    "confirm_restore"                  => "คุณแน่ใจหรือไม่ว่าต้องการยกเลิกการขายที่เลือกไว้?",
-    "credit"                           => "เครดิตการ์ด",
-    "credit_deposit"                   => "เงินฝากเครดิต",
-    "credit_filter"                    => "บัตรเครติด",
-    "current_table"                    => "",
-    "customer"                         => "ลูกค้า",
-    "customer_address"                 => "Customer Address",
-    "customer_discount"                => "ส่วนลด",
-    "customer_email"                   => "Customer Email",
-    "customer_location"                => "Customer Location",
-    "customer_mailchimp_status"        => "สถานะของระบบส่งเมล์เมล์ชิม",
-    "customer_optional"                => "(ต้องระบุวันที่ชำระเงิน)",
-    "customer_required"                => "(ต้องระบุ)",
-    "customer_total"                   => "Total",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "วันที่ขาย",
-    "date_range"                       => "ระหว่างวันที่",
-    "date_required"                    => "กรุณากรอกวันที่ให้ถูกต้อง",
-    "date_type"                        => "กรุณากรอกข้อมูลในช่องวันที่",
-    "debit"                            => "บัตรประชารัฐ/เดบิตการ์ด",
-    "debit_filter"                     => "",
-    "delete"                           => "อนุญาตให้ลบ",
-    "delete_confirmation"              => "แน่ใจหรือไม่ที่จะลบรายการขายนี้, ลบแล้วไม่สามารถเรียกกลับคืนใด้",
-    "delete_entire_sale"               => "ลบการขายทั้งหมด",
-    "delete_successful"                => "คุณลบการขายสำเร็จ",
-    "delete_unsuccessful"              => "คุณลบการขายไม่สำเร็จ",
-    "description_abbrv"                => "รายละเอียด",
-    "discard"                          => "ยกเลิก",
-    "discard_quote"                    => "",
-    "discount"                         => "ส่วนลด %",
-    "discount_included"                => "% ส่วนลด",
-    "discount_short"                   => "%",
-    "due"                              => "วันครบกำหนด",
-    "due_filter"                       => "วันที่ครบกำหนด",
-    "edit"                             => "แก้ไข",
-    "edit_item"                        => "แก้ไขสินค้า",
-    "edit_sale"                        => "แก้ไขการขาย",
-    "email_receipt"                    => "อีเมลบิล",
-    "employee"                         => "พนักงาน",
-    "entry"                            => "การนำเข้า",
-    "error_editing_item"               => "แก้ไขสินค้าล้มเหลว",
-    "negative_price_invalid"           => "",
-    "negative_quantity_invalid"        => "",
-    "negative_discount_invalid"        => "",
-    "discount_percent_exceeds_100"     => "",
-    "discount_exceeds_item_total"      => "",
-    "negative_total_invalid"           => "",
-    "find_or_scan_item"                => "ค้นหาสินค้า",
-    "find_or_scan_item_or_receipt"     => "ค้นหา หรือ แสกนรายการ หรือ ใบเสร็จ",
-    "giftcard"                         => "บัตรของขวัญ",
-    "giftcard_balance"                 => "ยอดคงเหลือบัตรของขวัญ",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "เลขที่บัตรของขวัญ",
-    "group_by_category"                => "กลุ่มตามหมวดหมู่",
-    "group_by_type"                    => "กลุ่มตามประเภท",
-    "hsn"                              => "HSN",
-    "id"                               => "เลขที่ขาย",
-    "include_prices"                   => "รวมในราคา?",
-    "invoice"                          => "ใบแจ้งหนี้",
-    "invoice_confirm"                  => "ใบแจ้งหนี้นี้จะถูกส่งไปที่",
-    "invoice_enable"                   => "เลขที่ใบแจ้งหนี้",
-    "invoice_filter"                   => "ใบแจ้งหนี้",
-    "invoice_no_email"                 => "ลูกค้ารายนี้ไม่มีที่อยู่อีเมล",
-    "invoice_number"                   => "เลขใบแจ้งหนี้ #",
-    "invoice_number_duplicate"         => "ใบแจ้งหนี้หมายเลข {0} จะต้องไม่ซ้ำกัน",
-    "invoice_sent"                     => "ส่งใบแจ้งหนี้ไปที่",
-    "invoice_total"                    => "ยอดรวมในใบแจ้งหนี้",
-    "invoice_type_custom_invoice"      => "ใบแจ้งหนี้ที่กำหนดเอง (custom_invoice.php)",
-    "invoice_type_custom_tax_invoice"  => "ใบกำกับภาษีที่กำหนดเอง (custom_tax_invoice.php)",
-    "invoice_type_invoice"             => "ใบแจ้งหนี้ (invoice.php)",
-    "invoice_type_tax_invoice"         => "ใบกำกับภาษี (tax_invoice.php)",
-    "invoice_unsent"                   => "ไม่สามารถส่งใบแจ้งหนี้ถึง",
-    "invoice_update"                   => "คำนวณใหม่",
-    "item_insufficient_of_stock"       => "จำนวนสินค้าไม่เพียงพอ",
-    "item_name"                        => "ชื่อสินค้า",
-    "item_number"                      => "สินค้า #",
-    "item_out_of_stock"                => "สินค้าจำหน่ายหมด",
-    "key_browser"                      => "ความช่วยเหลือ",
-    "key_cancel"                       => "ยกเลิกใบเสนอราคา/ใบแจ้งหนี้ /ใบการขาย นี้",
-    "key_customer_search"              => "ค้นหาลูกค้า",
-    "key_finish_quote"                 => "จบใบเสนอราคา/ใบแจ้งหนี้โดยไม่ต้องชำระเงิน",
-    "key_finish_sale"                  => "เพิ่มการชำระเงินและใบแจ้งหนี้ /ใบรายการขาย",
-    "key_full"                         => "เปิดแบบเต็มหน้าจอ",
-    "key_function"                     => "ฟังก์ชั่น",
-    "key_help"                         => "คำสั่งลัดงานขาย",
-    "key_help_modal"                   => "เปิดหน้าต่างคำสั่งลัดงานขาย",
-    "key_in"                           => "ขยายเข้า",
-    "key_item_search"                  => "ค้นหารายการขาย",
-    "key_out"                          => "ขยายออก",
-    "key_payment"                      => "เพิ่มการชำระเงิน",
-    "key_print"                        => "พิมพ์หน้านี้",
-    "key_restore"                      => "คืนการแสดงผลแบบดั้งเดิม/ขยาย",
-    "key_search"                       => "ค้นหาตารางรายงาน",
-    "key_suspend"                      => "พักรายการขายปัจจุบัน",
-    "key_suspended"                    => "แสดงรายการขายที่พักไว้",
-    "key_system"                       => "ทางลัดระบบ",
-    "key_tendered"                     => "แก้ไขจำนวนเงินรับมา",
-    "key_title"                        => "ทางลัดคียบอร์ดงานขาย",
-    "mc"                               => "",
-    "mode"                             => "รูปแบบการลงทะเบียน",
-    "must_enter_numeric"               => "จำนวนที่ถุกประมูลต้องใส่ข้อมุลที่เปนตัวเลข",
-    "must_enter_numeric_giftcard"      => "เลขที่บัตรของขวัญ ต้องใส่ตัวเลขเท่านั้น",
-    "new_customer"                     => "ลูกค้าใหม่",
-    "new_item"                         => "สินค้าใหม่",
-    "no_description"                   => "ไม่ระบุรายละเอียด",
-    "no_filter"                        => "ทั้งหมด",
-    "no_items_in_cart"                 => "ไม่พบสินค้าในตระกร้า",
-    "no_sales_to_display"              => "ไม่มีการขายที่จะแสดง",
-    "none_selected"                    => "คุณยังไม่ได้เลือกการขายที่จะลบ",
-    "nontaxed_ind"                     => " . ",
-    "not_authorized"                   => "การกระทำนี้ไม่ได้รับอนุญาต",
-    "one_or_multiple"                  => "การขาย",
-    "payment"                          => "รูปแบบชำระเงิน",
-    "payment_amount"                   => "จำนวน",
-    "payment_not_cover_total"          => "จำนวนเงินที่ชำระต้องมากกว่าหรือเท่ากับยอดรวม",
-    "payment_type"                     => "ชำระโดย",
-    "payments"                         => "",
-    "payments_total"                   => "ยอดชำระแล้ว",
-    "price"                            => "ราคา",
-    "print_after_sale"                 => "พิมพ์บิลหลังการขาย",
-    "quantity"                         => "จำนวน",
-    "quantity_less_than_reorder_level" => "คำเตือน ถ้าจำนวนของไม่เพียงพอกับความต้องการหรือไม่ตรงกับยอดในบันชี ก็สามารถทำการขายได้ แต่ต้องเชคปริมานสินค้าคงคลัง",
-    "quantity_less_than_zero"          => "คำเตือน: ถ้าจำนวนของไม่เพียงพอกับความต้องการหรือไม่ตรงกับยอดในบัญชี ก็สามารถทำการขายได้ แต่ต้องตรวจสอบปริมาญสินค้าคงคลังก่อน",
-    "quantity_of_items"                => "ปริมาณของ {0} รายการ",
-    "quote"                            => "ใบเสนอราคา",
-    "quote_number"                     => "หมายเลขอ้างอิง",
-    "quote_number_duplicate"           => "หมายเลขอ้างอิงต้องไม่ซ้ำกัน",
-    "quote_sent"                       => "ส่งการอ้างอิงถึง",
-    "quote_unsent"                     => "ส่งการอ้างอิงถึงผิดพลาด",
-    "receipt"                          => "บิลขาย",
-    "receipt_no_email"                 => "ลูกค้านี้ไม่มีที่อยู่อีเมล์",
-    "receipt_number"                   => "จุดขาย#",
-    "receipt_sent"                     => "ส่งใบเสร็จไปที่",
-    "receipt_unsent"                   => "ไม่สามารถส่งใบเสร็จไปที่",
-    "refund"                           => "ประเภทการยกเลิกการขาย",
-    "register"                         => "ลงทะเบียนขาย",
-    "remove_customer"                  => "ลบลูกค้า",
-    "remove_discount"                  => "",
-    "return"                           => "คืน",
-    "rewards"                          => "คะแนนสะสม",
-    "rewards_balance"                  => "คะแนนสะสมคงเหลือ",
-    "sale"                             => "ขาย",
-    "sale_by_invoice"                  => "การขายโดยใบแจ้งหนี้",
-    "sale_for_customer"                => "ลูกค้า:",
-    "sale_time"                        => "เวลา",
-    "sales_tax"                        => "ภาษีการขาย",
-    "sales_total"                      => "",
-    "select_customer"                  => "เลือกลูกค้า (Optional)",
-    "send_invoice"                     => "ส่งใบแจ้งหนี้",
-    "send_quote"                       => "ส่งใบเสนอราคา",
-    "send_receipt"                     => "ส่งใบเสร็จ",
-    "send_work_order"                  => "ส่งคำสั่งงาน",
-    "serial"                           => "หมายเลขซีเรียล",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "ใบแจ้งหนี้",
-    "show_receipt"                     => "ใบเสร็จ",
-    "start_typing_customer_name"       => "เริ่มต้นพิมพ์ชื่อลูกค้า...",
-    "start_typing_item_name"           => "เริ่มต้นพิมพ์ชื่อสินค้า หรือ สแกนบาร์โค๊ด...",
-    "stock"                            => "คลังสินค้า",
-    "stock_location"                   => "ที่เก็บ",
-    "sub_total"                        => "ยอดรวมย่อย",
-    "successfully_deleted"             => "ลบการขายสมยูรณ์",
-    "successfully_restored"            => "คุณกู้คืนสำเร็จแล้ว",
-    "successfully_suspended_sale"      => "การขายของคุณถูกระงับเรียบร้อย",
-    "successfully_updated"             => "อัพเดทการขายสมบูรณ์",
-    "suspend_sale"                     => "พักรายการ",
-    "suspended_doc_id"                 => "รหัสเอกสาร",
-    "suspended_sale_id"                => "รหัสการขายที่ถูกพัก",
-    "suspended_sales"                  => "การขายที่พักไว้",
-    "table"                            => "โต๊ะ",
-    "takings"                          => "การขายประจำวัน",
-    "tax"                              => "ภาษี",
-    "tax_id"                           => "รหัสภาษี",
-    "tax_invoice"                      => "ใบกำกับภาษี",
-    "tax_percent"                      => "ภาษี %",
-    "taxed_ind"                        => "ภ",
-    "total"                            => "ยอดรวม",
-    "total_tax_exclusive"              => "ยอดไม่รวมภาษี",
-    "transaction_failed"               => "การดำเนินการขายล้มเหลว",
-    "unable_to_add_item"               => "เพิ่มรายการไปยังการขายล้มเหลว",
-    "unsuccessfully_deleted"           => "ลบการขายไม่สำเร็จ",
-    "unsuccessfully_restored"          => "การคืนค่ารายการขายล้มเหลว",
-    "unsuccessfully_suspended_sale"    => "การขายของคุณถูกระงับเรียบร้อย",
-    "unsuccessfully_updated"           => "อัพเดทการขายไม่สมบูรณ์",
-    "unsuspend"                        => "ยกเลิกการระงับ",
-    "unsuspend_and_delete"             => "ยกเลิกการระงับ และ ลบ",
-    "update"                           => "แก้ไข",
-    "upi"                              => "ยูพีไอ",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "คำสั่งงาน",
-    "work_order_number"                => "หมายเลขคำสั่งงาน",
-    "work_order_number_duplicate"      => "หมายเลขคำสั่งงานต้องไม่ซ้ำกัน",
-    "work_order_sent"                  => "คำสั่งงานส่งถึง",
-    "work_order_unsent"                => "ส่งคำสั่งงานล้มเหลว",
-    "selected_customer"                => "ลูกค้าที่เลือก",
+    'customers_available_points' => "คะแนนที่มี",
+    'rewards_package' => "คะแนนสะสม",
+    'rewards_remaining_balance' => "คะแนนสะสมคงเหลือ ",
+    'account_number' => "บัญชี #",
+    'add_payment' => "เพิ่มบิล",
+    'amount_due' => "ยอดค้างชำระ",
+    'amount_tendered' => "ชำระเข้ามา",
+    'authorized_signature' => "ลายเซ็นผู้มีอำนาจ",
+    'cancel_sale' => "ยกเลิกการขาย",
+    'cash' => "เงินสด",
+    'cash_1' => "",
+    'cash_2' => "",
+    'cash_3' => "",
+    'cash_4' => "",
+    'cash_adjustment' => "การปรับเงินสดขาย",
+    'cash_deposit' => "ฝากเงินสด",
+    'cash_filter' => "เงินสด",
+    'change_due' => "เงินทอน",
+    'change_price' => "เปลี่ยนราคาขาย",
+    'check' => "โอนเงิน/พร้อมเพย์/เช็ค",
+    'check_balance' => "เช็คยอดคงเหลือ",
+    'check_filter' => "ตรวจสอบ",
+    'close' => "",
+    'comment' => "หมายเหตุ",
+    'comments' => "หมายเหตุ",
+    'company_name' => "",
+    'complete' => "",
+    'complete_sale' => "จบการขาย",
+    'confirm_cancel_sale' => "แน่ใจหรือไม่ที่จะล้างการขายนี้? ทุกรายการจะถูกลบทั้งหมด",
+    'confirm_delete' => "โปรดยืนยันการลบรายการขายที่เลือกไว้ ?",
+    'confirm_restore' => "คุณแน่ใจหรือไม่ว่าต้องการยกเลิกการขายที่เลือกไว้?",
+    'credit' => "เครดิตการ์ด",
+    'credit_deposit' => "เงินฝากเครดิต",
+    'credit_filter' => "บัตรเครติด",
+    'current_table' => "",
+    'customer' => "ลูกค้า",
+    'customer_address' => "Customer Address",
+    'customer_discount' => "ส่วนลด",
+    'customer_email' => "Customer Email",
+    'customer_location' => "Customer Location",
+    'customer_mailchimp_status' => "สถานะของระบบส่งเมล์เมล์ชิม",
+    'customer_optional' => "(ต้องระบุวันที่ชำระเงิน)",
+    'customer_required' => "(ต้องระบุ)",
+    'customer_total' => "Total",
+    'customer_total_spent' => "",
+    'daily_sales' => "",
+    'date' => "วันที่ขาย",
+    'date_range' => "ระหว่างวันที่",
+    'date_required' => "กรุณากรอกวันที่ให้ถูกต้อง",
+    'date_type' => "กรุณากรอกข้อมูลในช่องวันที่",
+    'debit' => "บัตรประชารัฐ/เดบิตการ์ด",
+    'debit_filter' => "",
+    'delete' => "อนุญาตให้ลบ",
+    'delete_confirmation' => "แน่ใจหรือไม่ที่จะลบรายการขายนี้, ลบแล้วไม่สามารถเรียกกลับคืนใด้",
+    'delete_entire_sale' => "ลบการขายทั้งหมด",
+    'delete_successful' => "คุณลบการขายสำเร็จ",
+    'delete_unsuccessful' => "คุณลบการขายไม่สำเร็จ",
+    'description_abbrv' => "รายละเอียด",
+    'discard' => "ยกเลิก",
+    'discard_quote' => "",
+    'discount' => "ส่วนลด %",
+    'discount_included' => "% ส่วนลด",
+    'discount_short' => "%",
+    'due' => "วันครบกำหนด",
+    'due_filter' => "วันที่ครบกำหนด",
+    'edit' => "แก้ไข",
+    'edit_item' => "แก้ไขสินค้า",
+    'edit_sale' => "แก้ไขการขาย",
+    'email_receipt' => "อีเมลบิล",
+    'employee' => "พนักงาน",
+    'entry' => "การนำเข้า",
+    'error_editing_item' => "แก้ไขสินค้าล้มเหลว",
+    'negative_price_invalid' => "ราคาไม่สามารถเป็นค่าติดลบได้",
+    'negative_quantity_invalid' => "จำนวนไม่สามารถเป็นค่าติดลบได้",
+    'negative_discount_invalid' => "ส่วนลดไม่สามารถเป็นค่าติดลบได้",
+    'discount_percent_exceeds_100' => "ส่วนลดเปอร์เซ็นต์มีค่าได้ไม่เกิน 100%",
+    'discount_exceeds_item_total' => "ส่วนลดต้องไม่เกินจำนวนรายการขายทั้งหมด",
+    'negative_total_invalid' => "",
+    'find_or_scan_item' => "ค้นหาสินค้า",
+    'find_or_scan_item_or_receipt' => "ค้นหา หรือ แสกนรายการ หรือ ใบเสร็จ",
+    'giftcard' => "บัตรของขวัญ",
+    'giftcard_balance' => "ยอดคงเหลือบัตรของขวัญ",
+    'giftcard_filter' => "",
+    'giftcard_number' => "เลขที่บัตรของขวัญ",
+    'group_by_category' => "กลุ่มตามหมวดหมู่",
+    'group_by_type' => "กลุ่มตามประเภท",
+    'hsn' => "HSN",
+    'id' => "เลขที่ขาย",
+    'include_prices' => "รวมในราคา?",
+    'invoice' => "ใบแจ้งหนี้",
+    'invoice_confirm' => "ใบแจ้งหนี้นี้จะถูกส่งไปที่",
+    'invoice_enable' => "เลขที่ใบแจ้งหนี้",
+    'invoice_filter' => "ใบแจ้งหนี้",
+    'invoice_no_email' => "ลูกค้ารายนี้ไม่มีที่อยู่อีเมล",
+    'invoice_number' => "เลขใบแจ้งหนี้ #",
+    'invoice_number_duplicate' => "ใบแจ้งหนี้หมายเลข {0} จะต้องไม่ซ้ำกัน",
+    'invoice_sent' => "ส่งใบแจ้งหนี้ไปที่",
+    'invoice_total' => "ยอดรวมในใบแจ้งหนี้",
+    'invoice_type_custom_invoice' => "ใบแจ้งหนี้ที่กำหนดเอง (custom_invoice.php)",
+    'invoice_type_custom_tax_invoice' => "ใบกำกับภาษีที่กำหนดเอง (custom_tax_invoice.php)",
+    'invoice_type_invoice' => "ใบแจ้งหนี้ (invoice.php)",
+    'invoice_type_tax_invoice' => "ใบกำกับภาษี (tax_invoice.php)",
+    'invoice_unsent' => "ไม่สามารถส่งใบแจ้งหนี้ถึง",
+    'invoice_update' => "คำนวณใหม่",
+    'item_insufficient_of_stock' => "จำนวนสินค้าไม่เพียงพอ",
+    'item_name' => "ชื่อสินค้า",
+    'item_number' => "สินค้า #",
+    'item_out_of_stock' => "สินค้าจำหน่ายหมด",
+    'key_browser' => "ความช่วยเหลือ",
+    'key_cancel' => "ยกเลิกใบเสนอราคา/ใบแจ้งหนี้ /ใบการขาย นี้",
+    'key_customer_search' => "ค้นหาลูกค้า",
+    'key_finish_quote' => "จบใบเสนอราคา/ใบแจ้งหนี้โดยไม่ต้องชำระเงิน",
+    'key_finish_sale' => "เพิ่มการชำระเงินและใบแจ้งหนี้ /ใบรายการขาย",
+    'key_full' => "เปิดแบบเต็มหน้าจอ",
+    'key_function' => "ฟังก์ชั่น",
+    'key_help' => "คำสั่งลัดงานขาย",
+    'key_help_modal' => "เปิดหน้าต่างคำสั่งลัดงานขาย",
+    'key_in' => "ขยายเข้า",
+    'key_item_search' => "ค้นหารายการขาย",
+    'key_out' => "ขยายออก",
+    'key_payment' => "เพิ่มการชำระเงิน",
+    'key_print' => "พิมพ์หน้านี้",
+    'key_restore' => "คืนการแสดงผลแบบดั้งเดิม/ขยาย",
+    'key_search' => "ค้นหาตารางรายงาน",
+    'key_suspend' => "พักรายการขายปัจจุบัน",
+    'key_suspended' => "แสดงรายการขายที่พักไว้",
+    'key_system' => "ทางลัดระบบ",
+    'key_tendered' => "แก้ไขจำนวนเงินรับมา",
+    'key_title' => "ทางลัดคียบอร์ดงานขาย",
+    'mc' => "",
+    'mode' => "รูปแบบการลงทะเบียน",
+    'must_enter_numeric' => "จำนวนที่ถุกประมูลต้องใส่ข้อมุลที่เปนตัวเลข",
+    'must_enter_numeric_giftcard' => "เลขที่บัตรของขวัญ ต้องใส่ตัวเลขเท่านั้น",
+    'new_customer' => "ลูกค้าใหม่",
+    'new_item' => "สินค้าใหม่",
+    'no_description' => "ไม่ระบุรายละเอียด",
+    'no_filter' => "ทั้งหมด",
+    'no_items_in_cart' => "ไม่พบสินค้าในตระกร้า",
+    'no_sales_to_display' => "ไม่มีการขายที่จะแสดง",
+    'none_selected' => "คุณยังไม่ได้เลือกการขายที่จะลบ",
+    'nontaxed_ind' => " . ",
+    'not_authorized' => "การกระทำนี้ไม่ได้รับอนุญาต",
+    'one_or_multiple' => "การขาย",
+    'payment' => "รูปแบบชำระเงิน",
+    'payment_amount' => "จำนวน",
+    'payment_not_cover_total' => "จำนวนเงินที่ชำระต้องมากกว่าหรือเท่ากับยอดรวม",
+    'payment_type' => "ชำระโดย",
+    'payments' => "",
+    'payments_total' => "ยอดชำระแล้ว",
+    'price' => "ราคา",
+    'print_after_sale' => "พิมพ์บิลหลังการขาย",
+    'quantity' => "จำนวน",
+    'quantity_less_than_reorder_level' => "คำเตือน ถ้าจำนวนของไม่เพียงพอกับความต้องการหรือไม่ตรงกับยอดในบันชี ก็สามารถทำการขายได้ แต่ต้องเชคปริมานสินค้าคงคลัง",
+    'quantity_less_than_zero' => "คำเตือน: ถ้าจำนวนของไม่เพียงพอกับความต้องการหรือไม่ตรงกับยอดในบัญชี ก็สามารถทำการขายได้ แต่ต้องตรวจสอบปริมาญสินค้าคงคลังก่อน",
+    'quantity_of_items' => "ปริมาณของ {0} รายการ",
+    'quote' => "ใบเสนอราคา",
+    'quote_number' => "หมายเลขอ้างอิง",
+    'quote_number_duplicate' => "หมายเลขอ้างอิงต้องไม่ซ้ำกัน",
+    'quote_sent' => "ส่งการอ้างอิงถึง",
+    'quote_unsent' => "ส่งการอ้างอิงถึงผิดพลาด",
+    'receipt' => "บิลขาย",
+    'receipt_no_email' => "ลูกค้านี้ไม่มีที่อยู่อีเมล์",
+    'receipt_number' => "จุดขาย#",
+    'receipt_sent' => "ส่งใบเสร็จไปที่",
+    'receipt_unsent' => "ไม่สามารถส่งใบเสร็จไปที่",
+    'refund' => "ประเภทการยกเลิกการขาย",
+    'register' => "ลงทะเบียนขาย",
+    'remove_customer' => "ลบลูกค้า",
+    'remove_discount' => "",
+    'return' => "คืน",
+    'rewards' => "คะแนนสะสม",
+    'rewards_balance' => "คะแนนสะสมคงเหลือ",
+    'sale' => "ขาย",
+    'sale_by_invoice' => "การขายโดยใบแจ้งหนี้",
+    'sale_for_customer' => "ลูกค้า:",
+    'sale_time' => "เวลา",
+    'sales_tax' => "ภาษีการขาย",
+    'sales_total' => "",
+    'select_customer' => "เลือกลูกค้า (Optional)",
+    'send_invoice' => "ส่งใบแจ้งหนี้",
+    'send_quote' => "ส่งใบเสนอราคา",
+    'send_receipt' => "ส่งใบเสร็จ",
+    'send_work_order' => "ส่งคำสั่งงาน",
+    'serial' => "หมายเลขซีเรียล",
+    'service_charge' => "",
+    'show_due' => "",
+    'show_invoice' => "ใบแจ้งหนี้",
+    'show_receipt' => "ใบเสร็จ",
+    'start_typing_customer_name' => "เริ่มต้นพิมพ์ชื่อลูกค้า...",
+    'start_typing_item_name' => "เริ่มต้นพิมพ์ชื่อสินค้า หรือ สแกนบาร์โค๊ด...",
+    'stock' => "คลังสินค้า",
+    'stock_location' => "ที่เก็บ",
+    'sub_total' => "ยอดรวมย่อย",
+    'successfully_deleted' => "ลบการขายสมยูรณ์",
+    'successfully_restored' => "คุณกู้คืนสำเร็จแล้ว",
+    'successfully_suspended_sale' => "การขายของคุณถูกระงับเรียบร้อย",
+    'successfully_updated' => "อัพเดทการขายสมบูรณ์",
+    'suspend_sale' => "พักรายการ",
+    'suspended_doc_id' => "รหัสเอกสาร",
+    'suspended_sale_id' => "รหัสการขายที่ถูกพัก",
+    'suspended_sales' => "การขายที่พักไว้",
+    'table' => "โต๊ะ",
+    'takings' => "การขายประจำวัน",
+    'tax' => "ภาษี",
+    'tax_id' => "รหัสภาษี",
+    'tax_invoice' => "ใบกำกับภาษี",
+    'tax_percent' => "ภาษี %",
+    'taxed_ind' => "ภ",
+    'total' => "ยอดรวม",
+    'total_tax_exclusive' => "ยอดไม่รวมภาษี",
+    'transaction_failed' => "การดำเนินการขายล้มเหลว",
+    'unable_to_add_item' => "เพิ่มรายการไปยังการขายล้มเหลว",
+    'unsuccessfully_deleted' => "ลบการขายไม่สำเร็จ",
+    'unsuccessfully_restored' => "การคืนค่ารายการขายล้มเหลว",
+    'unsuccessfully_suspended_sale' => "การขายของคุณถูกระงับเรียบร้อย",
+    'unsuccessfully_updated' => "อัพเดทการขายไม่สมบูรณ์",
+    'unsuspend' => "ยกเลิกการระงับ",
+    'unsuspend_and_delete' => "ยกเลิกการระงับ และ ลบ",
+    'update' => "แก้ไข",
+    'upi' => "ยูพีไอ",
+    'visa' => "",
+    'wholesale' => "",
+    'work_order' => "คำสั่งงาน",
+    'work_order_number' => "หมายเลขคำสั่งงาน",
+    'work_order_number_duplicate' => "หมายเลขคำสั่งงานต้องไม่ซ้ำกัน",
+    'work_order_sent' => "คำสั่งงานส่งถึง",
+    'work_order_unsent' => "ส่งคำสั่งงานล้มเหลว",
+    'selected_customer' => "ลูกค้าที่เลือก",
 ];

app/Libraries/MY_Migration.php

@@ -2,7 +2,6 @@
 
 namespace App\Libraries;
 
-use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Database\MigrationRunner;
 use Config\Database;
 use stdClass;
@@ -44,7 +43,9 @@ class MY_Migration extends MigrationRunner
                 $result = $builder->get()->getRow();
                 return $result ? $result->version : 0;
             }
-        } catch (DatabaseException $e) {
+        } catch (\Exception $e) {
+            // Database not available yet (e.g. fresh install before schema).
+            // Catches mysqli_sql_exception which is not a DatabaseException.
             return 0;
         }
 
@@ -76,8 +77,9 @@ class MY_Migration extends MigrationRunner
                 $result = $builder->get()->getRow();
                 return $result ? $result->version : false;
             }
-        } catch (DatabaseException $e) {
-            // Database doesn't exist yet or connection failed
+        } catch (\Exception $e) {
+            // Database not available yet (e.g. fresh install before schema).
+            // Catches mysqli_sql_exception which is not a DatabaseException.
         }
 
         return false;

app/Libraries/Sale_lib.php

@@ -23,6 +23,19 @@ use ReflectionException;
  */
 class Sale_lib
 {
+    private const KEY_SHORTCUT_DEFAULTS = [
+        'cancel'    => ['value' => '27 | ESC', 'code' => 27, 'label' => 'ESC'],
+        'items'     => ['value' => '49 | ALT + 1', 'code' => 49, 'label' => 'ALT + 1'],
+        'customers' => ['value' => '50 | ALT + 2', 'code' => 50, 'label' => 'ALT + 2'],
+        'suspend'   => ['value' => '51 | ALT + 3', 'code' => 51, 'label' => 'ALT + 3'],
+        'suspended' => ['value' => '52 | ALT + 4', 'code' => 52, 'label' => 'ALT + 4'],
+        'amount'    => ['value' => '53 | ALT + 5', 'code' => 53, 'label' => 'ALT + 5'],
+        'payment'   => ['value' => '54 | ALT + 6', 'code' => 54, 'label' => 'ALT + 6'],
+        'complete'  => ['value' => '55 | ALT + 7', 'code' => 55, 'label' => 'ALT + 7'],
+        'finish'    => ['value' => '56 | ALT + 8', 'code' => 56, 'label' => 'ALT + 8'],
+        'help'      => ['value' => '57 | ALT + 9', 'code' => 57, 'label' => 'ALT + 9'],
+    ];
+
     private Attribute $attribute;
     private Customer $customer;
     private Dinner_table $dinner_table;
@@ -105,6 +118,44 @@ class Sale_lib
         return $invoice_types;
     }
 
+    /**
+     * Returns the available keyboard shortcut choices for the configuration screen.
+     *
+     * @return array<string, string>
+     */
+    public function getKeyShortcutsOptions(): array
+    {
+        $keyShortcuts = [];
+
+        foreach (self::KEY_SHORTCUT_DEFAULTS as $shortcut) {
+            $keyShortcuts[$shortcut['value']] = $shortcut['label'];
+        }
+
+        return $keyShortcuts;
+    }
+
+    /**
+     * Returns parsed shortcut bindings from app_config with sensible defaults.
+     *
+     * @return array<string, array{value:string,code:int,label:string}>
+     */
+    public function getKeyShortcuts(): array
+    {
+        $keyboardShortcuts = [];
+
+        foreach (self::KEY_SHORTCUT_DEFAULTS as $name => $default) {
+            $value = $this->config["key_$name"] ?? $default['value'];
+            $parts = array_map('trim', explode('|', $value, 2));
+            $keyboardShortcuts[$name] = [
+                'value' => $value,
+                'code'  => (int)($parts[0] ?? $default['code']),
+                'label' => $parts[1] ?? $default['label']
+            ];
+        }
+
+        return $keyboardShortcuts;
+    }
+
     public static function isValidInvoiceType(string $invoice_type): bool
     {
         return in_array($invoice_type, self::ALLOWED_INVOICE_TYPES, true);

app/Models/Attribute.php

@@ -27,14 +27,12 @@ class Attribute extends Model
         'definition_type',
         'definition_unit',
         'definition_flags',
-        'person_attribute',
         'deleted',
         'attribute_id',
         'definition_id',
         'item_id',
         'sale_id',
         'receiving_id',
-        'person_id',
         'attribute_value',
         'attribute_date',
         'attribute_decimal'
@@ -43,12 +41,7 @@ class Attribute extends Model
     public const SHOW_IN_ITEMS = 1;    // TODO: These need to be moved to constants.php
     public const SHOW_IN_SALES = 2;
     public const SHOW_IN_RECEIVINGS = 4;
-    public const SHOW_IN_SEARCH = 8;
-    public const SHOW_IN_CUSTOMERS = 16;
-    public const SHOW_IN_EMPLOYEES = 32;
-    public const SHOW_IN_SUPPLIERS = 64;
-
-    public function deleteDropdownAttributeValue(string $attributeValue, int $definitionId): bool
+    public function deleteDropdownAttributeValue(string $attribute_value, int $definition_id): bool
     {
         $attribute_id = $this->getAttributeIdByValue($attribute_value);
         $this->deleteAttributeLinksByDefinitionIdAndAttributeId($definition_id, $attribute_id);
@@ -276,7 +269,7 @@ class Attribute extends Model
     public function get_definitions_by_flags(int $definition_flags, bool $include_types = false): array
     {
         $builder = $this->db->table('attribute_definitions');
-        $builder->where(new RawSql("definition_flags & $definition_flags"));
+        $builder->where(new RawSql("definition_flags & $definition_flags"));    // TODO: we need to heed CI warnings to escape properly
         $builder->where('deleted', 0);
         $builder->where('definition_type <>', GROUP);
         $builder->orderBy('definition_id');
@@ -298,30 +291,11 @@ class Attribute extends Model
     }
 
     /**
-     * Gets attribute definitions filtered by type (person or item)
+     * Returns an array of attribute definition names and IDs
      *
-     * @param bool $isPersonAttribute True for person attributes, false for item attributes
-     * @param int $definitionFlags Optional visibility flags to further filter
-     * @return array
+     * @param     boolean        $groups        If false does not return GROUP type attributes in the array
+     * @return    array                    Array containing definition IDs, attribute names and -1 index with the local language '[SELECT]' line.
      */
-    public function getDefinitionsByType(bool $isPersonAttribute, int $definitionFlags = 0): array
-    {
-        $builder = $this->db->table('attribute_definitions');
-        $builder->where('person_attribute', $isPersonAttribute ? 1 : 0);
-        $builder->where('deleted', 0);
-        $builder->where('definition_type <>', GROUP);
-
-        if ($definitionFlags > 0) {
-            $builder->where(new RawSql("definition_flags & $definitionFlags"));
-        }
-
-        $builder->orderBy('definition_name', 'ASC');
-
-        $results = $builder->get()->getResultArray();
-
-        return $this->to_array($results, 'definition_id', 'definition_name');
-    }
-
     public function get_definition_names(bool $groups = true): array
     {
         $builder = $this->db->table('attribute_definitions');
@@ -1253,227 +1227,4 @@ class Attribute extends Model
             $itemsBuilder->update();
         }
     }
-
-    /**
-     * Gets all attributes connected to a person given the person_id
-     *
-     * @param int $personId Person to retrieve attributes for.
-     * @return array Attributes for the person.
-     */
-    public function getAttributesByPerson(int $personId): array
-    {
-        $builder = $this->db->table('attribute_definitions');
-        $builder->join('attribute_links', 'attribute_links.definition_id = attribute_definitions.definition_id');
-        $builder->where('person_id', $personId);
-        $builder->where('item_id', null);
-        $builder->where('sale_id', null);
-        $builder->where('receiving_id', null);
-        $builder->where('deleted', 0);
-        $builder->orderBy('definition_name', 'ASC');
-
-        $results = $builder->get()->getResultArray();
-
-        return $this->to_array($results, 'definition_id');
-    }
-
-    /**
-     * Returns whether an attribute_link row exists given a person_id and optionally a definition_id
-     *
-     * @param int $personId ID of the person to check for an associated attribute.
-     * @param int|bool $definitionId Attribute definition ID to check.
-     * @return bool Returns true if at least one attribute_link exists or false if no attributes exist for that person and attribute.
-     */
-    public function personAttributeLinkExists(int $personId, int|bool $definitionId = false): bool
-    {
-        $builder = $this->db->table('attribute_links');
-        $builder->where('person_id', $personId);
-        $builder->where('item_id', null);
-        $builder->where('sale_id', null);
-        $builder->where('receiving_id', null);
-
-        if ($definitionId) {
-            $builder->where('definition_id', $definitionId);
-        } else {
-            $builder->where('definition_id IS NOT NULL');
-            $builder->where('attribute_id', null);
-        }
-        $results = $builder->countAllResults();
-        return $results > 0;
-    }
-
-    /**
-     * Inserts or updates an attribute link for a person
-     *
-     * @param int $personId
-     * @param int $definitionId
-     * @param int $attributeId
-     * @return bool True if the attribute link was saved successfully, false otherwise.
-     */
-    public function savePersonAttributeLink(int $personId, int $definitionId, int $attributeId): bool
-    {
-        $this->db->transStart();
-
-        $builder = $this->db->table('attribute_links');
-
-        if ($this->personAttributeLinkExists($personId, $definitionId)) {
-            $builder->set(['attribute_id' => $attributeId]);
-            $builder->where('definition_id', $definitionId);
-            $builder->where('person_id', $personId);
-            $builder->where('item_id', null);
-            $builder->where('sale_id', null);
-            $builder->where('receiving_id', null);
-            $builder->update();
-        } else {
-            $data = [
-                'attribute_id'  => $attributeId,
-                'person_id'     => $personId,
-                'definition_id' => $definitionId
-            ];
-            $builder->insert($data);
-        }
-
-        $this->db->transComplete();
-
-        return $this->db->transStatus();
-    }
-
-    /**
-     * Deletes attribute links for a person
-     *
-     * @param int $personId
-     * @param int|bool $definitionId
-     * @return bool
-     */
-    public function deletePersonAttributeLinks(int $personId, int|bool $definitionId = false): bool
-    {
-        $deleteData = ['person_id' => $personId];
-
-        $builder = $this->db->table('attribute_links');
-        $builder->where('item_id', null);
-        $builder->where('sale_id', null);
-        $builder->where('receiving_id', null);
-
-        if (!empty($definitionId)) {
-            $deleteData['definition_id'] = $definitionId;
-        }
-
-        return $builder->delete($deleteData);
-    }
-
-    /**
-     * Gets the attribute value for a person and definition
-     *
-     * @param int $personId
-     * @param int $definitionId
-     * @return object|null
-     */
-    public function getPersonAttributeValue(int $personId, int $definitionId): ?object
-    {
-        $builder = $this->db->table('attribute_values');
-        $builder->join('attribute_links', 'attribute_links.attribute_id = attribute_values.attribute_id');
-        $builder->where('person_id', $personId);
-        $builder->where('item_id', null);
-        $builder->where('sale_id', null);
-        $builder->where('receiving_id', null);
-        $builder->where('definition_id', $definitionId);
-        $query = $builder->get();
-
-        if ($query->getNumRows() == 1) {
-            return $query->getRow();
-        }
-
-        return $this->getEmptyObject('attribute_values');
-    }
-
-    /**
-     * Saves an attribute value for a person
-     *
-     * @param string $attributeValue
-     * @param int $definitionId
-     * @param int $personId
-     * @param int|bool $attributeId
-     * @param string $definitionType
-     * @return int
-     */
-    public function savePersonAttributeValue(string $attributeValue, int $definitionId, int $personId, int|bool $attributeId = false, string $definitionType = DROPDOWN): int
-    {
-        $config = config(OSPOS::class)->settings;
-
-        $this->db->transStart();
-
-        switch ($definitionType) {
-            case DATE:
-                $dataType = 'date';
-                $attributeDateValue = DateTime::createFromFormat($config['dateformat'], $attributeValue);
-                $attributeValue = $attributeDateValue ? $attributeDateValue->format('Y-m-d') : $attributeValue;
-                break;
-            case DECIMAL:
-                $dataType = 'decimal';
-                break;
-            default:
-                $dataType = 'value';
-                break;
-        }
-
-        // New Attribute
-        if (empty($attributeId) || empty($personId) || $attributeId == -1) {
-            $attributeId = $this->attributeValueExists($attributeValue, $definitionType);
-
-            if (!$attributeId) {
-                $builder = $this->db->table('attribute_values');
-                $builder->set(["attribute_$dataType" => $attributeValue]);
-                $builder->insert();
-
-                $attributeId = $this->db->insertID();
-            }
-
-            $data = [
-                'attribute_id'  => empty($attributeId) ? null : $attributeId,
-                'person_id'     => $personId,
-                'definition_id' => $definitionId
-            ];
-
-            $builder = $this->db->table('attribute_links');
-            $builder->set($data);
-            $builder->insert();
-        }
-        // Existing Attribute
-        else {
-            $builder = $this->db->table('attribute_values');
-            $builder->set(["attribute_$dataType" => $attributeValue]);
-            $builder->where('attribute_id', $attributeId);
-            $builder->update();
-        }
-
-        $this->db->transComplete();
-
-        return $attributeId;
-    }
-
-    /**
-     * Gets link values for a person given the person_id and visibility flags
-     *
-     * @param int $personId
-     * @param int $definitionFlags
-     * @return ResultInterface
-     */
-    public function getPersonLinkValues(int $personId, int $definitionFlags): ResultInterface
-    {
-        $format = $this->db->escape(dateformat_mysql());
-
-        $builder = $this->db->table('attribute_links');
-        $builder->select("GROUP_CONCAT(attribute_value SEPARATOR ', ') AS attribute_values");
-        $builder->select("GROUP_CONCAT(DATE_FORMAT(attribute_date, $format) SEPARATOR ', ') AS attribute_dtvalues");
-        $builder->join('attribute_values', 'attribute_values.attribute_id = attribute_links.attribute_id');
-        $builder->join('attribute_definitions', 'attribute_definitions.definition_id = attribute_links.definition_id');
-        $builder->where('definition_type <>', GROUP);
-        $builder->where('deleted', ACTIVE);
-        $builder->where('person_id', $personId);
-        $builder->where('item_id', null);
-        $builder->where('sale_id', null);
-        $builder->where('receiving_id', null);
-        $builder->where(new RawSql("definition_flags & $definitionFlags"));
-
-        return $builder->get();
-    }
 }

app/Models/Item.php

@@ -391,7 +391,6 @@ class Item extends Model
     public function get_item_id(string $item_number, bool $ignore_deleted = false, bool $deleted = false): bool|int
     {
         $builder = $this->db->table('items');
-        $builder->join('suppliers', 'suppliers.person_id = items.supplier_id', 'left');
         $builder->groupStart();
         $builder->where('item_number', $item_number);
         $builder->orWhere('item_id', $item_number);

app/Views/attributes/person.php

@@ -1,169 +0,0 @@
-<?php
-/**
- * @var array $definition_names
- * @var array $definition_values
- * @var int $person_id
- * @var array $config
- */
-
-use App\Models\Attribute;
-?>
-
-<div class="form-group form-group-sm">
-    <?= form_label(lang('Attributes.definition_name'), 'definition_name_label', ['class' => 'control-label col-xs-3']) ?>
-    <div class="col-xs-8">
-        <?= form_dropdown([
-            'name'     => 'definition_name',
-            'options'  => $definition_names,
-            'selected' => -1,
-            'class'    => 'form-control',
-            'id'       => 'definition_name'
-        ]) ?>
-    </div>
-</div>
-
-<?php foreach ($definition_values as $definitionId => $definitionValue) { ?>
-
-    <div class="form-group form-group-sm">
-        <?= form_label(esc($definitionValue['definition_name']), esc($definitionValue['definition_name']), ['class' => 'control-label col-xs-3']) ?>
-        <div class="col-xs-8">
-            <div class="input-group">
-                <?php
-                echo form_hidden("attribute_ids[$definitionId]", strval($definitionValue['attribute_id']));
-                $attributeValue = $definitionValue['attribute_value'];
-
-                switch ($definitionValue['definition_type']) {
-                    case DATE:
-                        $value = (empty($attributeValue) || empty($attributeValue->attribute_date)) ? NOW : strtotime($attributeValue->attribute_date);
-                        echo form_input([
-                            'name'               => "attribute_links[$definitionId]",
-                            'value'              => to_date($value),
-                            'class'              => 'form-control input-sm datetime',
-                            'data-definition-id' => $definitionId,
-                            'readonly'           => 'true'
-                        ]);
-                        break;
-                    case DROPDOWN:
-                        $selectedValue = $definitionValue['selected_value'];
-                        echo form_dropdown([
-                            'name'               => "attribute_links[$definitionId]",
-                            'options'            => $definitionValue['values'],
-                            'selected'           => $selectedValue,
-                            'class'              => 'form-control',
-                            'data-definition-id' => $definitionId
-                        ]);
-                        break;
-                    case TEXT:
-                        $value = (empty($attributeValue) || empty($attributeValue->attribute_value)) ? $definitionValue['selected_value'] : $attributeValue->attribute_value;
-                        echo form_input([
-                            'name'               => "attribute_links[$definitionId]",
-                            'value'              => esc($value),
-                            'class'              => 'form-control valid_chars',
-                            'data-definition-id' => $definitionId
-                        ]);
-                        break;
-                    case DECIMAL:
-                        $value = (empty($attributeValue) || empty($attributeValue->attribute_decimal)) ? $definitionValue['selected_value'] : $attributeValue->attribute_decimal;
-                        echo form_input([
-                            'name'               => "attribute_links[$definitionId]",
-                            'value'              => to_decimals((float)$value),
-                            'class'              => 'form-control valid_chars',
-                            'data-definition-id' => $definitionId
-                        ]);
-                        break;
-                    case CHECKBOX:
-                        $value = (empty($attributeValue) || empty($attributeValue->attribute_value)) ? $definitionValue['selected_value'] : $attributeValue->attribute_value;
-
-                        // Sends 0 if the box is unchecked instead of not sending anything.
-                        echo form_input([
-                            'type'               => 'hidden',
-                            'name'               => "attribute_links[$definitionId]",
-                            'id'                 => "attribute_links[$definitionId]",
-                            'value'              => 0,
-                            'data-definition-id' => $definitionId
-                        ]);
-                        echo form_checkbox([
-                            'name'               => "attribute_links[$definitionId]",
-                            'id'                 => "attribute_links[$definitionId]",
-                            'value'              => 1,
-                            'checked'            => $value == 1,
-                            'class'              => 'checkbox-inline',
-                            'data-definition-id' => $definitionId
-                        ]);
-                        break;
-                }
-                ?>
-                <span class="input-group-addon input-sm btn btn-default remove_attribute_btn">
-                    <span class="glyphicon glyphicon-trash"></span>
-                </span>
-            </div>
-        </div>
-    </div>
-
-<?php } ?>
-
-<script type="text/javascript">
-    (function() {
-        <?= view('partial/datepicker_locale', ['format' => dateformat_bootstrap($config['dateformat'])]) ?>
-
-        var enableDelete = function() {
-            $('.remove_attribute_btn').click(function() {
-                $(this).parents('.form-group').remove();
-            });
-        };
-
-        enableDelete();
-
-        $("input[name*='attribute_links']").change(function() {
-            var definitionId = $(this).data('definition-id');
-            $("input[name='attribute_ids[" + definitionId + "]']").val('');
-        }).autocomplete({
-            source: function(request, response) {
-                $.get('<?= 'attributes/suggestAttribute/' ?>' + this.element.data('definition-id') + '?term=' + request.term, function(data) {
-                    return response(data);
-                }, 'json');
-            },
-            appendTo: '.modal-content',
-            select: function(event, ui) {
-                event.preventDefault();
-                $(this).val(ui.item.label);
-            },
-            delay: 10
-        });
-
-        var getDefinitionValues = function() {
-            var result = {};
-            $("[name*='attribute_links']").each(function() {
-                var definitionId = $(this).data('definition-id');
-                var element = $(this);
-
-                // For checkboxes, use the visible checkbox, not the hidden input
-                if (element.attr('type') === 'hidden' && element.siblings('input[type="checkbox"]').length > 0) {
-                    // Skip hidden inputs that have a corresponding checkbox
-                    return;
-                }
-
-                // For checkboxes, get the checked state
-                if (element.attr('type') === 'checkbox') {
-                    result[definitionId] = element.prop('checked') ? '1' : '0';
-                } else {
-                    result[definitionId] = element.val();
-                }
-            });
-            return result;
-        };
-
-        var refresh = function() {
-            var definitionId = $("#definition_name option:selected").val();
-            var attributeValues = getDefinitionValues();
-            attributeValues[definitionId] = '';
-            $('#person_attributes').load(window.location.href, {
-                'definition_ids': JSON.stringify(attributeValues)
-            }, enableDelete);
-        };
-
-        $('#definition_name').change(function() {
-            refresh();
-        });
-    })();
-</script>

app/Views/barcodes/barcode_sheet.php

@@ -11,31 +11,34 @@ $barcode_lib = new Barcode_lib();
 
 <!doctype html>
 <html lang="<?= current_language_code() ?>">
-    <head>
-        <meta charset="utf-8">
-        <title><?= esc(lang('Items.generate_barcodes')) ?></title>
-        <link rel="stylesheet" href="<?= esc(base_url('css/barcode_font.css'), 'url') ?>">
-        <style>
-            .barcode svg {
-                height: <?= (int) $barcode_config['barcode_height'] ?>px;
-                width: <?= (int) $barcode_config['barcode_width'] ?>px;
-            }
-        </style>
-    </head>
-    <body class="<?= esc('font_' . $barcode_lib->get_font_name($barcode_config['barcode_font']), 'attr') ?>" style="font-size: <?= (int) $barcode_config['barcode_font_size'] ?>px;">
-        <table style="border-spacing: <?= (int) $barcode_config['barcode_page_cellspacing'] ?>px; width: <?= (int) $barcode_config['barcode_page_width'] ?>%;">
-            <tr>
-                <?php
-                    $count = 0;
-                    foreach ($items as $item) {
-                        if ($count % $barcode_config['barcode_num_in_row'] == 0 && $count != 0) {
-                            echo '</tr><tr>';
-                        }
-                        echo '<td>' . $barcode_lib->display_barcode($item, $barcode_config) . '</td>';
-                        $count++;
+
+<head>
+    <meta charset="utf-8">
+    <title><?= esc(lang('Items.generate_barcodes')) ?></title>
+    <link rel="stylesheet" href="<?= esc(base_url('css/barcode_font.css'), 'url') ?>">
+    <style>
+        .barcode svg {
+            height: <?= (int) $barcode_config['barcode_height'] ?>px;
+            width: <?= (int) $barcode_config['barcode_width'] ?>px;
+        }
+    </style>
+</head>
+
+<body class="<?= esc('font_' . $barcode_lib->get_font_name($barcode_config['barcode_font']), 'attr') ?>" style="font-size: <?= (int) $barcode_config['barcode_font_size'] ?>px;">
+    <table style="border-spacing: <?= (int) $barcode_config['barcode_page_cellspacing'] ?>px; width: <?= (int) $barcode_config['barcode_page_width'] ?>%;">
+        <tr>
+            <?php
+                $count = 0;
+                foreach ($items as $item) {
+                    if ($count % $barcode_config['barcode_num_in_row'] == 0 && $count != 0) {
+                        echo '</tr><tr>';
                     }
-                ?>
-            </tr>
-        </table>
-    </body>
+                    echo '<td>' . $barcode_lib->display_barcode($item, $barcode_config) . '</td>';
+                    $count++;
+                }
+            ?>
+        </tr>
+    </table>
+</body>
+
 </html>

app/Views/configs/barcode_config.php

@@ -204,6 +204,7 @@
                 <?= form_label(lang('Config.barcode_number_in_row'), 'barcode_num_in_row', ['class' => 'control-label col-xs-2 required']) ?>
                 <div class="col-xs-2">
                     <?= form_input([
+                        'type'  => 'number',
                         'name'  => 'barcode_num_in_row',
                         'id'    => 'barcode_num_in_row',
                         'class' => 'form-control input-sm required',
@@ -217,6 +218,9 @@
                 <div class="col-sm-2">
                     <div class="input-group">
                         <?= form_input([
+                            'type'  => 'number',
+                            'min'   => '0',
+                            'max'   => '100',
                             'name'  => 'barcode_page_width',
                             'id'    => 'barcode_page_width',
                             'class' => 'form-control input-sm required',
@@ -232,6 +236,7 @@
                 <div class="col-sm-2">
                     <div class="input-group">
                         <?= form_input([
+                            'type'  => 'number',
                             'name'  => 'barcode_page_cellspacing',
                             'id'    => 'barcode_page_cellspacing',
                             'class' => 'form-control input-sm required',

app/Views/configs/email_config.php

@@ -17,9 +17,9 @@
                     <?= form_dropdown(
                         'protocol',
                         [
-                            'mail'     => 'mail',
-                            'sendmail' => 'sendmail',
-                            'smtp'     => 'smtp'
+                            'mail'     => 'Mail',
+                            'sendmail' => 'Sendmail',
+                            'smtp'     => 'SMTP'
                         ],
                         $config['protocol'],
                         'class="form-control input-sm" id="protocol"'
@@ -55,6 +55,7 @@
                 <?= form_label(lang('Config.email_smtp_port'), 'smtp_port', ['class' => 'control-label col-xs-2']) ?>
                 <div class="col-xs-2">
                     <?= form_input([
+                        'type'  => 'number',
                         'name'  => 'smtp_port',
                         'id'    => 'smtp_port',
                         'class' => 'form-control input-sm',
@@ -83,6 +84,7 @@
                 <?= form_label(lang('Config.email_smtp_timeout'), 'smtp_timeout', ['class' => 'control-label col-xs-2']) ?>
                 <div class="col-xs-2">
                     <?= form_input([
+                        'type'  => 'number',
                         'name'  => 'smtp_timeout',
                         'id'    => 'smtp_timeout',
                         'class' => 'form-control input-sm',

app/Views/configs/info_config.php

@@ -105,6 +105,7 @@
                             <span class="glyphicon glyphicon-phone-alt"></span>
                         </span>
                         <?= form_input([
+                            'type'  => 'tel',
                             'name'  => 'phone',
                             'id'    => 'phone',
                             'class' => 'form-control input-sm required',
@@ -122,6 +123,7 @@
                             <span class="glyphicon glyphicon-phone-alt"></span>
                         </span>
                         <?= form_input([
+                            'type'  => 'tel',
                             'name'  => 'fax',
                             'id'    => 'fax',
                             'class' => 'form-control input-sm',

app/Views/configs/manage.php

@@ -29,6 +29,9 @@
     <li role="presentation">
         <a data-toggle="tab" href="#invoice_tab" title="<?= lang('Config.invoice_configuration') ?>"><?= lang('Config.invoice') ?></a>
     </li>
+    <li role="presentation">
+        <a data-toggle="tab" href="#shortcuts_tab" title="<?= lang('Config.shortcuts_configuration') ?>"><?= lang('Config.shortcuts') ?></a>
+    </li>
     <li role="presentation">
         <a data-toggle="tab" href="#reward_tab" title="<?= lang('Config.reward_configuration') ?>"><?= lang('Config.reward') ?></a>
     </li>
@@ -65,6 +68,9 @@
     <div class="tab-pane" id="invoice_tab">
         <?= view('configs/invoice_config') ?>
     </div>
+    <div class="tab-pane" id="shortcuts_tab">
+        <?= view('configs/shortcuts_config') ?>
+    </div>
     <div class="tab-pane" id="reward_tab">
         <?= view('configs/reward_config') ?>
     </div>

app/Views/configs/shortcuts_config.php

@@ -0,0 +1,88 @@
+<?php
+/**
+ * @var array $config
+ * @var array $keyboardShortcutOptions
+ * @var array $keyboardShortcuts
+ */
+
+$keyboardShortcuts ??= [];
+$keyboardShortcutOptions ??= [];
+$config ??= [];
+
+$shortcutLabels = [
+    'cancel'    => lang('Sales.key_cancel'),
+    'items'     => lang('Sales.key_item_search'),
+    'customers' => lang('Sales.key_customer_search'),
+    'suspend'   => lang('Sales.key_suspend'),
+    'suspended' => lang('Sales.key_suspended'),
+    'amount'    => lang('Sales.key_tendered'),
+    'payment'   => lang('Sales.key_payment'),
+    'complete'  => lang('Sales.key_finish_sale'),
+    'finish'    => lang('Sales.key_finish_quote'),
+    'help'      => lang('Sales.key_help_modal')
+];
+?>
+
+<?= form_open('config/saveShortcuts', ['id' => 'shortcuts_config_form', 'class' => 'form-horizontal']) ?>
+    <div id="config_wrapper">
+        <div class="row">
+            <fieldset id="config_info">
+                <div class="col-md-8">
+                    <div id="required_fields_message"><?= esc(lang('Common.fields_required_message')) ?></div>
+                    <ul id="shortcuts_error_message_box" class="error_message_box"></ul>
+
+                    <?php foreach ($shortcutLabels as $name => $label): ?>
+                        <div class="form-group form-group-sm">
+                            <?= form_label($label, 'key_' . $name, ['class' => 'control-label col-xs-3']) ?>
+                            <div class="col-xs-4">
+                                <?php $keyboardShortcutSelectedValue = $keyboardShortcuts[$name]['value'] ?? ''; ?>
+                                <?= form_dropdown(
+                                    'key_' . $name,
+                                    $keyboardShortcutOptions,
+                                    $keyboardShortcutSelectedValue,
+                                    'class="form-control input-sm"'
+                                ) ?>
+                            </div>
+                        </div>
+                    <?php endforeach; ?>
+
+                    <div class="col-xs-12 clearfix">
+                        <?= form_submit([
+                            'name'  => 'submit_shortcuts',
+                            'id'    => 'submit_shortcuts',
+                            'value' => lang('Common.submit'),
+                            'class' => 'btn btn-primary btn-sm pull-right'
+                        ]) ?>
+                    </div>
+                </div>
+            </fieldset>
+        </div>
+    </div>
+<?= form_close() ?>
+
+<script type="text/javascript">
+    $('#shortcuts_config_form').validate($.extend(form_support.handler, {
+        submitHandler: function(form) {
+            $(form).ajaxSubmit({
+                success: function(response) {
+                    $.notify({
+                        message: response.message
+                    }, {
+                        type: response.success ? 'success' : 'danger'
+                    });
+                },
+                error: function(xhr) {
+                    const rawMessage = xhr.responseJSON?.message ?? xhr.responseText ?? <?= json_encode(lang('Config.shortcuts_save_error')) ?>;
+                    $.notify({
+                        message: DOMPurify.sanitize(rawMessage)
+                    }, {
+                        type: 'danger'
+                    });
+                },
+                dataType: 'json'
+            });
+        },
+
+        errorLabelContainer: '#shortcuts_error_message_box'
+    }));
+</script>

app/Views/configs/system_info.php

@@ -25,8 +25,8 @@ use Config\OSPOS;
     <div class="container">
         <div class="row">
             <div class="col-sm-2" style="text-align: left;"><br>
-                <p style="min-height: 14.7em; font-weight: bold;">General Info</p>
-                <p style="min-height: 10.5em; font-weight: bold;">User Setup</p><br>
+                <p style="min-height: 17.7em; font-weight: bold;">General Info</p>
+                <p style="min-height: 12.2em; font-weight: bold;">User Setup</p><br>
                 <p style="font-weight: bold;">Permissions</p>
             </div>
             <div class="col-sm-8" id="issuetemplate" style="text-align: left;"><br>
@@ -42,7 +42,7 @@ use Config\OSPOS;
                     echo "&#187; OpenSSL: ", extension_loaded('openssl') ? '<span style="color: green;">Enabled &#x2713</span>' : '<span style="color: red;">Disabled &#x2717</span>', '<br>';
                     echo "&#187; MBString: ", extension_loaded('mbstring') ? '<span style="color: green;">Enabled &#x2713</span>' : '<span style="color: red;">Disabled &#x2717</span>', '<br>';
                     echo "&#187; Curl: ", extension_loaded('curl') ? '<span style="color: green;">Enabled &#x2713</span>' : '<span style="color: red;">Disabled &#x2717</span>', '<br>';
-                    echo "&#187; Json: ", extension_loaded('json') ? '<span style="color: green;">Enabled &#x2713</span>' : '<span style="color: red;">Disabled &#x2717</span>', '<br><br>';
+                    echo "&#187; Json: ", extension_loaded('json') ? '<span style="color: green;">Enabled &#x2713</span>' : '<span style="color: red;">Disabled &#x2717</span>', '<br>';
                     echo "&#187; Xml: ", extension_loaded('xml') ? '<span style="color: green;">Enabled &#x2713</span>' : '<span style="color: red;">Disabled &#x2717</span>', '<br><br>';
                 ?>
                 User Configuration:<br>

app/Views/configs/tax_config.php

@@ -51,6 +51,10 @@
                 </div>
                 <div class="col-xs-1 input-group">
                     <?= form_input([
+                        'type'  => 'number',
+                        'step'  => 'any',
+                        'min'   => '0',
+                        'max'   => '100',
                         'name'  => 'default_tax_1_rate',
                         'id'    => 'default_tax_1_rate',
                         'class' => 'form-control input-sm',
@@ -72,6 +76,10 @@
                 </div>
                 <div class="col-xs-1 input-group">
                     <?= form_input([
+                        'type'  => 'number',
+                        'step'  => 'any',
+                        'min'   => '0',
+                        'max'   => '100',
                         'name'  => 'default_tax_2_rate',
                         'id'    => 'default_tax_2_rate',
                         'class' => 'form-control input-sm',

app/Views/customers/form.php

@@ -44,12 +44,6 @@
 
                 <?= view('people/form_basic_info') ?>
 
-                <div id="person_attributes">
-                    <script type="text/javascript">
-                        $('#person_attributes').load('<?= "customers/attributes/$person_info->person_id" ?>');
-                    </script>
-                </div>
-
                 <div class="form-group form-group-sm">
                     <?= form_label(lang('Customers.discount_type'), 'discount_type', ['class' => 'control-label col-xs-3']) ?>
                     <div class="col-xs-8">

app/Views/employees/form.php

@@ -29,12 +29,6 @@
         <div class="tab-pane fade in active" id="employee_basic_info">
             <fieldset>
                 <?= view('people/form_basic_info') ?>
-
-                <div id="person_attributes">
-                    <script type="text/javascript">
-                        $('#person_attributes').load('<?= "employees/attributes/$person_info->person_id" ?>');
-                    </script>
-                </div>
             </fieldset>
         </div>
 

app/Views/errors/html/debug.css

@@ -101,9 +101,11 @@ p.lead {
 }
 
 .tabs {
-    list-style: none inside none;
+    list-style: none;
+    list-style-position: inside;
+    margin: 0;
     padding: 0;
-    margin: 0 0 -1px;
+    margin-bottom: -1px;
 }
 .tabs li {
     display: inline;

app/Views/login.php

@@ -5,9 +5,14 @@
  * @var bool $is_new_install
  * @var string $latest_version
  * @var bool $gcaptcha_enabled
+ * @var CodeIgniter\HTTP\IncomingRequest $request
  * @var array $config
  * @var $validation
  */
+
+use Config\Services;
+
+$request = Services::request();
 ?>
 
 <!doctype html>
@@ -154,11 +159,6 @@
         </div>
     </footer>
 
-    <?php
-    use Config\Services;
-    $request = Services::request();
-    ?>
-
     <?php if (ENVIRONMENT == 'development' || get_cookie('debug') == 'true' || $request->getGet('debug') == 'true') : ?>
         <!-- inject:login:debug:js -->
         <!-- endinject -->

app/Views/partial/header.php

@@ -12,14 +12,16 @@ $request = Services::request();
 ?>
 
 <!doctype html>
-<html lang="<?= $request->getLocale() ?>">
+<html lang="<?= current_language_code() ?>">
 
 <head>
     <meta charset="utf-8">
     <base href="<?= base_url() ?>">
     <title><?= esc($config['company']) . ' | ' . lang('Common.powered_by') . ' OSPOS ' . esc(config('App')->application_version) ?></title>
+    <meta name="robots" content="noindex, nofollow">
     <link rel="shortcut icon" type="image/x-icon" href="images/favicon.ico">
-    <link rel="stylesheet" href="<?= 'resources/bootswatch/' . (empty($config['theme']) ? 'flatly' : esc($config['theme'])) . '/bootstrap.min.css' ?>">
+    <?php $theme = (empty($config['theme']) ? 'flatly' : esc($config['theme'])); ?>
+    <link rel="stylesheet" href="resources/bootswatch/<?= "$theme" ?>/bootstrap.min.css">
 
     <?php if (ENVIRONMENT == 'development' || get_cookie('debug') == 'true' || $request->getGet('debug') == 'true') : ?>
         <!-- inject:debug:css -->

app/Views/sales/help.php

@@ -1,3 +1,24 @@
+<?php
+/**
+ * @var array $keyboardShortcuts
+ */
+
+$keyboardShortcuts ??= [];
+
+$shortcut_labels = [
+    'cancel'    => lang('Sales.key_cancel'),
+    'items'     => lang('Sales.key_item_search'),
+    'customers' => lang('Sales.key_customer_search'),
+    'suspend'   => lang('Sales.key_suspend'),
+    'suspended' => lang('Sales.key_suspended'),
+    'amount'    => lang('Sales.key_tendered'),
+    'payment'   => lang('Sales.key_payment'),
+    'complete'  => lang('Sales.key_finish_sale'),
+    'finish'    => lang('Sales.key_finish_quote'),
+    'help'      => lang('Sales.key_help_modal')
+];
+?>
+
 <div class="container-fluid">
 
     <ul class="nav nav-tabs" id="SCTabs" data-toggle="tab">
@@ -15,46 +36,13 @@
                     </tr>
                 </thead>
                 <tbody>
-                    <tr>
-                        <td><code>ESC</code></td>
-                        <td><?= lang('Sales.key_cancel'); ?></td>
-                    </tr>
-                    <tr>
-                        <td><code>ALT + 1</code></td>
-                        <td><?= lang('Sales.key_item_search'); ?></td>
-                    </tr>
-                    <tr>
-                        <td><code>ALT + 2</code></td>
-                        <td><?= lang('Sales.key_customer_search'); ?></td>
-                    </tr>
-                    <tr>
-                        <td><code>ALT + 3</code></td>
-                        <td><?= lang('Sales.key_suspend'); ?></td>
-                    </tr>
-                    <tr>
-                        <td><code>ALT + 4</code></td>
-                        <td><?= lang('Sales.key_suspended'); ?></td>
-                    </tr>
-                    <tr>
-                        <td><code>ALT + 5</code></td>
-                        <td><?= lang('Sales.key_tendered'); ?></td>
-                    </tr>
-                    <tr>
-                        <td><code>ALT + 6</code></td>
-                        <td><?= lang('Sales.key_payment'); ?></td>
-                    </tr>
-                    <tr>
-                        <td><code>ALT + 7</code></td>
-                        <td><?= lang('Sales.key_finish_sale'); ?></td>
-                    </tr>
-                    <tr>
-                        <td><code>ALT + 8</code></td>
-                        <td><?= lang('Sales.key_finish_quote'); ?></td>
-                    </tr>
-                    <tr>
-                        <td><code>ALT + 9</code></td>
-                        <td><?= lang('Sales.key_help_modal'); ?></td>
-                    </tr>
+                    <?php foreach ($shortcut_labels as $name => $label): ?>
+                        <?php $shortcut = $keyboardShortcuts[$name] ?? ['label' => '', 'code' => '']; ?>
+                        <tr>
+                            <td><code><?= esc($shortcut['label'] !== '' ? $shortcut['label'] : $shortcut['code']) ?></code></td>
+                            <td><?= esc($label) ?></td>
+                        </tr>
+                    <?php endforeach; ?>
                 </tbody>
             </table>
         </div>

app/Views/sales/quote_email.php

@@ -15,7 +15,7 @@
 ?>
 
 <!doctype html>
-<html lang="<?= $this->request->getLocale() ?>">
+<html lang="<?= current_language_code() ?>">
 
 <head>
     <meta charset="utf-8">

app/Views/sales/register.php

@@ -405,6 +405,7 @@ helper('url');
             <div id="payment_details">
                 <?php if ($payments_cover_total) { // Show Complete sale button instead of Add Payment if there is no amount due left ?>
                     <?= form_open("$controller_name/addPayment", ['id' => 'add_payment_form', 'class' => 'form-horizontal']) ?>
+                        <input type="hidden" name="complete_after_payment" value="0">
                         <table class="sales_table_100">
                             <tr>
                                 <td><?= lang(ucfirst($controller_name) . '.payment') ?></td>
@@ -445,6 +446,7 @@ helper('url');
                     ?>
                 <?php } else { ?>
                     <?= form_open("$controller_name/addPayment", ['id' => 'add_payment_form', 'class' => 'form-horizontal']) ?>
+                        <input type="hidden" name="complete_after_payment" value="0">
                         <table class="sales_table_100">
                             <tr>
                                 <td><?= lang(ucfirst($controller_name) . '.payment') ?></td>
@@ -565,6 +567,21 @@ helper('url');
 </div>
 
 <script type="text/javascript">
+    const keyboardShortcuts = <?= json_encode($keyboardShortcuts ?? []) ?>;
+    const paymentsCoverTotal = <?= json_encode((bool) $payments_cover_total) ?>;
+    const shortcutCodes = {
+        items: keyboardShortcuts?.items?.code ?? null,
+        customers: keyboardShortcuts?.customers?.code ?? null,
+        suspend: keyboardShortcuts?.suspend?.code ?? null,
+        suspended: keyboardShortcuts?.suspended?.code ?? null,
+        amount: keyboardShortcuts?.amount?.code ?? null,
+        payment: keyboardShortcuts?.payment?.code ?? null,
+        complete: keyboardShortcuts?.complete?.code ?? null,
+        finish: keyboardShortcuts?.finish?.code ?? null,
+        help: keyboardShortcuts?.help?.code ?? null,
+        cancel: keyboardShortcuts?.cancel?.code ?? null
+    };
+
     $(document).ready(function() {
         const redirect = function() {
             window.location.href = "<?= site_url('sales'); ?>";
@@ -750,6 +767,7 @@ helper('url');
         });
 
         $('#add_payment_button').click(function() {
+            $('#add_payment_form').find('input[name="complete_after_payment"]').val('0');
             $('#add_payment_form').submit();
         });
 
@@ -839,43 +857,51 @@ helper('url');
     }
 
     // Add Keyboard Shortcuts/Hotkeys to Sale Register
-    document.body.onkeyup = function(e) {
-        switch (event.altKey && event.keyCode) {
-            case 49: // Alt + 1 Items Seach
-                $("#item").focus();
-                $("#item").select();
-                break;
-            case 50: // Alt + 2 Customers Search
-                $("#customer").focus();
-                $("#customer").select();
-                break;
-            case 51: // Alt + 3 Suspend Current Sale
-                $("#suspend_sale_button").click();
-                break;
-            case 52: // Alt + 4 Check Suspended
-                $("#show_suspended_sales_button").click();
-                break;
-            case 53: // Alt + 5 Edit Amount Tendered Value
-                $("#amount_tendered").focus();
-                $("#amount_tendered").select();
-                break;
-            case 54: // Alt + 6 Add Payment
-                $("#add_payment_button").click();
-                break;
-            case 55: // Alt + 7 Add Payment and Complete Sales/Invoice
-                $("#add_payment_button").click();
-                window.location.href = "<?= 'sales/complete' ?>";
-                break;
-            case 56: // Alt + 8 Finish Quote/Invoice without payment
-                $("#finish_invoice_quote_button").click();
-                break;
-            case 57: // Alt + 9 Open Shortcuts Help Modal
-                $("#show_keyboard_help").click();
-                break;
+    document.body.onkeyup = function(event) {
+        if ($(event.target).closest('.modal').length || $('.modal.in').length) {
+            return;
+        }
+        if (event.altKey) {
+            switch (event.keyCode) {
+                case shortcutCodes.items:
+                    $("#item").focus();
+                    $("#item").select();
+                    break;
+                case shortcutCodes.customers:
+                    $("#customer").focus();
+                    $("#customer").select();
+                    break;
+                case shortcutCodes.suspend:
+                    $("#suspend_sale_button").click();
+                    break;
+                case shortcutCodes.suspended:
+                    $("#show_suspended_sales_button").click();
+                    break;
+                case shortcutCodes.amount:
+                    $("#amount_tendered").focus();
+                    $("#amount_tendered").select();
+                    break;
+                case shortcutCodes.payment:
+                    $("#add_payment_button").click();
+                    break;
+                case shortcutCodes.complete:
+                    if (paymentsCoverTotal && $("#finish_sale_button").length) {
+                        $("#finish_sale_button").click();
+                    } else {
+                        $("#add_payment_button").click();
+                    }
+                    break;
+                case shortcutCodes.finish:
+                    $("#finish_invoice_quote_button").click();
+                    break;
+                case shortcutCodes.help:
+                    $("#show_keyboard_help").click();
+                    break;
+            }
         }
 
         switch (event.keyCode) {
-            case 27: // ESC Cancel Current Sale
+            case shortcutCodes.cancel:
                 $("#cancel_sale_button").click();
                 break;
         }

app/Views/sales/work_order_email.php

@@ -14,7 +14,7 @@
 ?>
 
 <!doctype html>
-<html lang="<?= $this->request->getLocale() ?>">
+<html lang="<?= current_language_code() ?>">
 
 <head>
     <meta charset="utf-8">

app/Views/suppliers/form.php

@@ -45,12 +45,6 @@
 
         <?= view('people/form_basic_info') ?>
 
-        <div id="person_attributes">
-            <script type="text/javascript">
-                $('#person_attributes').load('<?= "suppliers/attributes/$person_info->person_id" ?>');
-            </script>
-        </div>
-
         <div class="form-group form-group-sm">
             <?= form_label(lang('Suppliers.account_number'), 'account_number', ['class' => 'control-label col-xs-3']) ?>
             <div class="col-xs-8">

composer.json

@@ -2,25 +2,19 @@
     "name": "opensourcepos/opensourcepos",
     "description": "Open Source Point of Sale is a web based POS system written in the PHP language. It uses MySQL as backend and has a simple user interface",
     "license": "MIT",
+    "type": "project",
+    "keywords": [
+        "point-of-sale",
+        "POS"
+    ],
     "authors": [
         {
             "name": "jekkos"
         },
-        {
-            "name": "FrancescoUK"
-        },
         {
             "name": "objecttothis"
-        },
-        {
-            "name": "steveireland"
         }
     ],
-    "type": "project",
-    "keywords": [
-        "point-of-sale",
-        "POS"
-    ],
     "homepage": "https://opensourcepos.org",
     "support": {
         "issues": "https://github.com/opensourcepos/opensourcepos/issues",
@@ -31,8 +25,8 @@
         "matrix": "https://matrix.to/#/#opensourcepos_Lobby:gitter.im"
     },
     "require": {
-        "ext-intl": "*",
         "php": "^8.2",
+        "ext-intl": "*",
         "codeigniter4/framework": "4.7.2",
         "dompdf/dompdf": "^2.0.3",
         "ezyang/htmlpurifier": "^4.17",
@@ -56,7 +50,7 @@
     },
     "autoload": {
         "psr-4": {
-            "App\\":  "app/",
+            "App\\": "app/",
             "CodeIgniter\\": "vendor/codeigniter4/framework/system/"
         },
         "exclude-from-classmap": [
@@ -73,5 +67,8 @@
     },
     "scripts": {
         "test": "phpunit"
+    },
+    "scripts-descriptions": {
+        "test": "Run unit tests"
     }
 }

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "e95f6e5e86d323370ddb0df57c4d3fb3",
+    "content-hash": "eabbc14aefdea4c933869069d6eadadb",
     "packages": [
         {
             "name": "codeigniter4/framework",
@@ -5382,9 +5382,9 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "ext-intl": "*",
-        "php": "^8.1"
+        "php": "^8.2",
+        "ext-intl": "*"
     },
     "platform-dev": {},
-    "plugin-api-version": "2.6.0"
+    "plugin-api-version": "2.9.0"
 }

gulpfile.js

@@ -300,6 +300,7 @@ gulp.task('copy-menubar', function() {
 // Run all required tasks
 gulp.task('default',
     gulp.series('clean',
+        'update-licenses',
         'copy-bootswatch',
         'copy-bootswatch5',
         'copy-bootstrap',

package.json

@@ -1,34 +1,33 @@
 {
     "name": "@opensourcepos/opensourcepos",
     "version": "3.4.2",
-    "description": "pen Source Point of Sale is a web based point of sale system written in the PHP language. It uses MySQL as the data storage back-end and has a simple user interface.",
-    "main": "index.php",
-    "license": "MIT",
-    "authors": [
-        "jekkos <jekkos - at - opensourcepos.org>",
-        "FrancescoUK <francesco.lodolo.uk - at - gmail.com>",
-        "objecttothis <objecttothis - at - gmail.com>",
-        "SteveIreland <stevei - at - ruledomain.com>"
-    ],
-    "files": [
-        "dist/opensourcepos.$version.tgz"
-    ],
-    "publishConfig": {
-        "registry": "https://npm.pkg.github.com/"
-    },
+    "description": "Open Source Point of Sale is a web based point of sale system written in the PHP language. It uses MySQL as the data storage back-end and has a simple user interface.",
     "keywords": [
         "point-of-sale",
         "POS"
     ],
+    "homepage": "https://opensourcepos.org",
+    "bugs": {
+        "url": "https://github.com/opensourcepos/opensourcepos/issues"
+    },
     "repository": {
         "type": "git",
-        "url": "https://github.com/opensourcepos/opensourcepos"
+        "url": "git+https://github.com/opensourcepos/opensourcepos.git"
     },
+    "license": "MIT",
+    "contributors": [
+        "jekkos <jekkos - at - opensourcepos.org>",
+        "objecttothis <objecttothis - at - gmail.com>"
+    ],
+    "files": [
+        "dist/opensourcepos.$version.tgz"
+    ],
+    "type": "module",
+    "main": "index.php",
     "scripts": {
         "build": "gulp default",
         "gulp": "gulp"
     },
-    "type": "module",
     "dependencies": {
         "bootstrap": "^3.4.1",
         "bootstrap-daterangepicker": "^2.1.27",
@@ -39,9 +38,9 @@
         "bootstrap-tagsinput-2021": "^0.8.6",
         "bootstrap-toggle": "^2.2.2",
         "bootstrap3-dialog": "github:nakupanda/bootstrap3-dialog#master",
-        "bootstrap5": "npm:bootstrap@^5.3.5",
+        "bootstrap5": "npm:bootstrap@^5.3.8",
         "bootswatch": "^3.4.1",
-        "bootswatch5": "npm:bootswatch@^5.3.5",
+        "bootswatch5": "npm:bootswatch@^5.3.8",
         "chartist": "^0.11.4",
         "chartist-plugin-axistitle": "^0.0.7",
         "chartist-plugin-barlabels": "^0.0.5",
@@ -64,23 +63,26 @@
         "tableexport.jquery.plugin": "^1.30.0"
     },
     "devDependencies": {
-        "gulp": "^5.0.0",
+        "gulp": "^5.0.1",
         "gulp-clean": "^0.4.0",
         "gulp-clean-css": "^4.3.0",
         "gulp-concat": "^2.6.1",
         "gulp-debug": "^5.0.1",
         "gulp-gzip": "^1.4.2",
-        "gulp-header": "^2.0.9",
+        "gulp-header": "^2.0.12",
         "gulp-inject": "^5.0.5",
-        "gulp-rename": "^2.0.0",
-        "gulp-rev": "^10.0.0",
+        "gulp-rename": "^2.1.0",
+        "gulp-rev": "^12.0.0",
         "gulp-run": "^1.7.1",
-        "gulp-tar": "^4.0.0",
+        "gulp-tar": "^5.0.0",
         "gulp-uglify": "^3.0.2",
         "gulp-zip": "^6.1.0",
-        "license-report": "^6.7.2",
-        "npm-check-updates": "^17.1.14",
+        "license-report": "^6.8.2",
+        "npm-check-updates": "^22.1.1",
         "readable-stream": "^4.4.2",
         "stream-series": "^0.1.1"
+    },
+    "publishConfig": {
+        "registry": "https://npm.pkg.github.com/"
     }
 }

public/index.php

@@ -1,12 +1,15 @@
 <?php
 
+use CodeIgniter\Boot;
+use Config\Paths;
+
 /*
  *---------------------------------------------------------------
  * CHECK PHP VERSION
  *---------------------------------------------------------------
  */
 
-$minPhpVersion = '8.1'; // If you update this, don't forget to update `spark`.
+$minPhpVersion = '8.2'; // If you update this, don't forget to update `spark`.
 if (version_compare(PHP_VERSION, $minPhpVersion, '<')) {
     $message = sprintf(
         'Your PHP version must be %s or higher to run CodeIgniter. Current version: %s',
@@ -48,9 +51,9 @@ if (getcwd() . DIRECTORY_SEPARATOR !== FCPATH) {
 require FCPATH . '../app/Config/Paths.php';
 // ^^^ Change this line if you move your application folder
 
-$paths = new Config\Paths();
+$paths = new Paths();
 
 // LOAD THE FRAMEWORK BOOTSTRAP FILE
 require $paths->systemDirectory . '/Boot.php';
 
-exit(CodeIgniter\Boot::bootWeb($paths));
+exit(Boot::bootWeb($paths));

spark

@@ -10,6 +10,9 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+use CodeIgniter\Boot;
+use Config\Paths;
+
 /*
  * --------------------------------------------------------------------
  * CODEIGNITER COMMAND-LINE TOOLS
@@ -35,7 +38,7 @@ if (str_starts_with(PHP_SAPI, 'cgi')) {
  *---------------------------------------------------------------
  */
 
-$minPhpVersion = '8.1'; // If you update this, don't forget to update `public/index.php`.
+$minPhpVersion = '8.2'; // If you update this, don't forget to update `public/index.php`.
 if (version_compare(PHP_VERSION, $minPhpVersion, '<')) {
     $message = sprintf(
         'Your PHP version must be %s or higher to run CodeIgniter. Current version: %s',
@@ -76,9 +79,9 @@ chdir(FCPATH);
 require FCPATH . '../app/Config/Paths.php';
 // ^^^ Change this line if you move your application folder
 
-$paths = new Config\Paths();
+$paths = new Paths();
 
 // LOAD THE FRAMEWORK BOOTSTRAP FILE
 require $paths->systemDirectory . '/Boot.php';
 
-exit(CodeIgniter\Boot::bootSpark($paths));
+exit(Boot::bootSpark($paths));