feat: Add show_in_search language strings to all languages

- Add 'show_in_search' and 'show_in_search_visibility' to all language files - Translated: de-DE, es-ES, fr, it - Placeholder English for remaining languages (awaiting translation) This ensures the SHOW_IN_SEARCH attribute flag works in all locales.
fix: Make item_sort_columns return format compatible with sanitizeSortColumn
2026-05-25 16:54:58 -04:00 · 2026-05-16 21:02:34 +02:00 · 2026-05-16 21:02:34 +02:00 · 2026-05-16 21:02:34 +02:00 · 2026-05-16 21:02:34 +02:00 · 2026-05-16 21:02:34 +02:00
115 changed files with 2889 additions and 1197 deletions
--- a/.env.example
+++ b/.env.example
@@ -16,6 +16,9 @@ CI_ENVIRONMENT = production
 # Configure with comma-separated list of domains/subdomains:
 #   app.allowedHostnames = 'yourdomain.com,www.yourdomain.com'
 #
+# Or via environment variable (useful for Docker/Compose):
+#   ALLOWED_HOSTNAMES=yourdomain.com,www.yourdomain.com
+#
 # For local development:
 #   app.allowedHostnames = 'localhost'
 #
--- a/.github/workflows/build-release.yml
+++ b/.github/workflows/build-release.yml
@@ -123,6 +123,7 @@ jobs:
            .
            !.git
            !node_modules
+          include-hidden-files: true
          retention-days: 1

  docker:
--- a/CHANGELOG.md
+++ b/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
--- a/CODE_OF_CONDUCT.md
+++ b/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
--- a/3
+++ b/3
@@ -13,7 +13,8 @@ RUN echo "date.timezone = \"\${PHP_TIMEZONE}\"" > /usr/local/etc/php/conf.d/time

 WORKDIR /app
 COPY --chown=www-data:www-data . /app
-RUN chmod 770 /app/writable/uploads /app/writable/logs /app/writable/cache \
+RUN chmod 750 /app/writable/logs /app/writable/uploads /app/writable/cache /app/public/uploads /app/public/uploads/item_pics \
+    && chmod 640 /app/writable/uploads/importCustomers.csv \
    && ln -s /app/*[^public] /var/www \
    && rm -rf /var/www/html \
    && ln -nsf /app/public /var/www/html
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -5,8 +5,9 @@
  - [Supported Versions](#supported-versions)
  - [Security Advisories](#security-advisories)
  - [Reporting a Vulnerability](#reporting-a-vulnerability)
+  - [Disclosure Process](#disclosure-process)

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

 # Security Policy

@@ -21,26 +22,116 @@ We release patches for security vulnerabilities.

 ## Security Advisories

-The following security vulnerabilities have been published:
-
-### High Severity
-
-| CVE | Vulnerability | CVSS | Published | Fixed In | Credit |
-|-----|--------------|------|-----------|----------|--------|
-| [CVE-2025-68434](https://github.com/opensourcepos/opensourcepos/security/advisories/GHSA-wjm4-hfwg-5w5r) | CSRF leading to Admin Creation | 8.8 | 2025-12-17 | 3.4.2 | @Nixon-H, @jekkos |
-| [CVE-2025-68147](https://github.com/opensourcepos/opensourcepos/security/advisories/GHSA-xgr7-7pvw-fpmh) | Stored XSS in Return Policy | 8.1 | 2025-12-17 | 3.4.2 | @Nixon-H, @jekkos |
-| [CVE-2025-66924](https://github.com/opensourcepos/opensourcepos/security/advisories/GHSA-gv8j-f6gq-g59m) | Stored XSS in Item Kits | 7.2 | 2026-03-04 | 3.4.2 | @hungnqdz, @omkaryepre |
-
-### Medium Severity
-
-| CVE | Vulnerability | CVSS | Published | Fixed In | Credit |
-|-----|--------------|------|-----------|----------|--------|
-| [CVE-2025-68658](https://github.com/opensourcepos/opensourcepos/security/advisories/GHSA-32r8-8r9r-9chw) | Stored XSS in Company Name | 4.3 | 2026-01-13 | 3.4.2 | @hungnqdz |
-
-For a complete list including draft advisories, see our [GitHub Security Advisories page](https://github.com/opensourcepos/opensourcepos/security/advisories).
+For a complete list of published and draft security advisories with CVE details, see our [GitHub Security Advisories page](https://github.com/opensourcepos/opensourcepos/security/advisories).

 ## Reporting a Vulnerability

-Please report (suspected) security vulnerabilities to **[jeroen@steganos.dev](mailto:jeroen@steganos.dev)**. 
+**Option 1: GitHub Security Advisory (Preferred)**

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

        // Solution for CodeIgniter 4 limitation: arrays cannot be set from .env
        // See: https://github.com/codeigniter4/CodeIgniter4/issues/7311
-        $envAllowedHostnames = getenv('app.allowedHostnames');
+        // Support both: app.allowedHostnames (from .env) and ALLOWED_HOSTNAMES (from environment/Docker)
+        $envAllowedHostnames = getenv('ALLOWED_HOSTNAMES');
+        if ($envAllowedHostnames === false || trim($envAllowedHostnames) === '') {
+            $envAllowedHostnames = getenv('app.allowedHostnames');
+        }
        if ($envAllowedHostnames !== false && trim($envAllowedHostnames) !== '') {
            $this->allowedHostnames = array_values(array_filter(
                array_map('trim', explode(',', $envAllowedHostnames)),
@@ -327,7 +331,7 @@ class App extends BaseConfig
            $errorMessage =
                'Security: allowedHostnames is not configured. ' .
                'Host header injection protection is disabled. ' .
-                'Set app.allowedHostnames in your .env file. ' .
+                'Set app.allowedHostnames in your .env file or ALLOWED_HOSTNAMES environment variable. ' .
                'Example: app.allowedHostnames = "example.com,www.example.com" ' .
                'Received Host: ' . $httpHost;

--- a/app/Config/Mimes.php
+++ b/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;
--- a/app/Config/OSPOS.php
+++ b/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,13 +40,16 @@ 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',
-                    'company' => 'Home'
+                    'company' => 'Home',
+                    'barcode_type' => 'Code39'
                ];
            }
        }
--- a/app/Config/Session.php
+++ b/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';
            }
--- a/app/Controllers/Attributes.php
+++ b/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;
+        $show_all = Attribute::SHOW_IN_ITEMS | Attribute::SHOW_IN_RECEIVINGS | Attribute::SHOW_IN_SALES | Attribute::SHOW_IN_SEARCH;
        $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);
--- a/app/Controllers/BaseController.php
+++ b/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.
--- a/app/Controllers/Config.php
+++ b/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();
@@ -398,6 +401,9 @@ class Config extends Secure_Controller

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

+        $this->db->transStart();
+
+        $attributeSuccess = true;
        if ($batchSaveData['category_dropdown']) {
            $definitionData['definition_name'] = 'ospos_category';
            $definitionData['definition_flags'] = 0;
@@ -405,12 +411,16 @@ class Config extends Secure_Controller
            $definitionData['definition_id'] = CATEGORY_DEFINITION_ID;
            $definitionData['deleted'] = 0;

-            $this->attribute->saveDefinition($definitionData, CATEGORY_DEFINITION_ID);
+            $attributeSuccess = $this->attribute->saveDefinition($definitionData, CATEGORY_DEFINITION_ID);
        } elseif ($batchSaveData['category_dropdown'] == NO_DEFINITION_ID) {
-            $this->attribute->deleteDefinition(CATEGORY_DEFINITION_ID);
+            $attributeSuccess = $this->attribute->deleteDefinition(CATEGORY_DEFINITION_ID);
        }

-        $success = $this->appconfig->batch_save($batchSaveData);
+        $success = $attributeSuccess && $this->appconfig->batch_save($batchSaveData);
+
+        $this->db->transComplete();
+
+        $success = $success && $this->db->transStatus();

        return $this->response->setJSON(['success' => $success, 'message' => lang('Config.saved_' . ($success ? '' : 'un') . 'successfully')]);
    }
@@ -423,32 +433,35 @@ class Config extends Secure_Controller
     */
    public function postCheckNumberLocale(): ResponseInterface
    {
-        $number_locale = $this->request->getPost('number_locale');
-        $save_number_locale = $this->request->getPost('save_number_locale');
+        $numberLocale = $this->request->getPost('number_locale');
+        $saveNumberLocale = $this->request->getPost('save_number_locale');
+        $postedCurrencySymbol = $this->request->getPost('currency_symbol');
+        $postedCurrencyCode = $this->request->getPost('currency_code');

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

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

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

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

@@ -911,7 +924,9 @@ class Config extends Secure_Controller
    public function postSaveReceipt(): ResponseInterface
    {
        $batch_save_data = [
-            'receipt_template'              => $this->request->getPost('receipt_template'),
+            'receipt_template'              => Sale_lib::isValidReceiptTemplate($this->request->getPost('receipt_template'))
+                ? $this->request->getPost('receipt_template')
+                : 'receipt_default',
            'receipt_font_size'             => $this->request->getPost('receipt_font_size', FILTER_SANITIZE_NUMBER_INT),
            'print_delay_autoreturn'        => $this->request->getPost('print_delay_autoreturn', FILTER_SANITIZE_NUMBER_INT),
            'email_receipt_check_behaviour' => $this->request->getPost('email_receipt_check_behaviour'),
@@ -936,6 +951,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.
     *
--- a/app/Controllers/Home.php
+++ b/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')
--- a/app/Controllers/Items.php
+++ b/app/Controllers/Items.php
@@ -105,13 +105,14 @@ class Items extends Secure_Controller
        $search = $this->request->getGet('search', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
        $limit = $this->request->getGet('limit', FILTER_SANITIZE_NUMBER_INT);
        $offset = $this->request->getGet('offset', FILTER_SANITIZE_NUMBER_INT);
-        $sort = $this->sanitizeSortColumn(item_headers(), $this->request->getGet('sort', FILTER_SANITIZE_FULL_SPECIAL_CHARS), 'item_id');
+
+        $definition_names = $this->attribute->get_definitions_by_flags(Attribute::SHOW_IN_ITEMS);
+
+        $sort = $this->sanitizeSortColumn(item_sort_columns(), $this->request->getGet('sort', FILTER_SANITIZE_FULL_SPECIAL_CHARS), 'items.item_id');
        $order = $this->request->getGet('order', FILTER_SANITIZE_FULL_SPECIAL_CHARS);

        $this->item_lib->set_item_location($this->request->getGet('stock_location'));

-        $definition_names = $this->attribute->get_definitions_by_flags(Attribute::SHOW_IN_ITEMS);
-
        $filters = [
            'start_date'        => $this->request->getGet('start_date'),
            'end_date'          => $this->request->getGet('end_date'),
@@ -129,6 +130,13 @@ class Items extends Secure_Controller
        // Check if any filter is set in the multiselect dropdown
        $request_filters = array_fill_keys($this->request->getGet('filters', FILTER_SANITIZE_FULL_SPECIAL_CHARS) ?? [], true);
        $filters = array_merge($filters, $request_filters);
+
+        // When search_custom is enabled, include attributes that are searchable but may not be visible in table
+        if (!empty($filters['search_custom'])) {
+            $searchable_definitions = $this->attribute->get_definitions_by_flags(Attribute::SHOW_IN_ITEMS | Attribute::SHOW_IN_SEARCH);
+            $filters['definition_ids'] = array_keys($searchable_definitions);
+        }
+
        $items = $this->item->search($search, $filters, $limit, $offset, $sort, $order);
        $total_rows = $this->item->get_found_rows($search, $filters);
        $data_rows = [];
@@ -154,8 +162,23 @@ class Items extends Secure_Controller
    {
        helper('file');

-        $pic_filename = rawurldecode($pic_filename);
-        $file_extension = pathinfo($pic_filename, PATHINFO_EXTENSION);
+        // Security: Sanitize filename to prevent path traversal
+        // Use basename() to strip directory components and prevent '../' attacks
+        $pic_filename = basename(rawurldecode($pic_filename));
+        $file_extension = strtolower(pathinfo($pic_filename, PATHINFO_EXTENSION));
+
+        // Validate file extension against system-configured allowed image types
+        // Handle both legacy pipe-separated and current comma-separated formats
+        // Fallback to types that GD library can process for thumbnail generation
+        $allowed_types = $this->config['image_allowed_types'] ?? 'jpg,jpeg,gif,png,webp,bmp,tif,tiff';
+        $allowed_extensions = strpos($allowed_types, '|') !== false
+            ? explode('|', $allowed_types)
+            : explode(',', $allowed_types);
+
+        if (!in_array($file_extension, $allowed_extensions, true)) {
+            return $this->response->setStatusCode(400)->setBody('Invalid file type');
+        }
+
        $images = glob("./uploads/item_pics/$pic_filename");
        $base_path = './uploads/item_pics/' . pathinfo($pic_filename, PATHINFO_FILENAME);

@@ -482,9 +505,9 @@ class Items extends Secure_Controller
        foreach ($result as &$item) {
            if (isset($item['item_number']) && empty($item['item_number']) && $this->config['barcode_generate_if_empty']) {
                if (isset($item['item_id'])) {
-                     $save_item = ['item_number' => $item['item_number'], 'item_id' => $item['item_id']];
-                     $this->item->saveValue($save_item);
-                 }
+                    $save_item = ['item_number' => $item['item_number']];
+                    $this->item->save_value($save_item, $item['item_id']);
+                }
            }
        }
        $data['items'] = $result;
@@ -663,12 +686,7 @@ class Items extends Secure_Controller

        $employee_id = $this->employee->get_logged_in_employee_info()->person_id;

-        // For updates, include item_id in data array
-        if ($item_id !== NEW_ENTRY) {
-            $item_data['item_id'] = $item_id;
-        }
-
-        if ($this->item->saveValue($item_data)) {
+        if ($this->item->save_value($item_data, $item_id)) {
            $success = true;
            $new_item = false;

@@ -831,8 +849,8 @@ class Items extends Secure_Controller
     */
    public function getRemoveLogo($item_id): ResponseInterface
    {
-        $item_data = ['pic_filename' => null, 'item_id' => $item_id];
-        $result = $this->item->saveValue($item_data);
+        $item_data = ['pic_filename' => null];
+        $result = $this->item->save_value($item_data, $item_id);

        return $this->response->setJSON(['success' => $result]);
    }
@@ -1044,7 +1062,7 @@ class Items extends Secure_Controller
                            return $value !== null && strlen($value);
                        });

-                        if (!$isFailedRow && $this->item->saveValue($itemData)) {
+                        if (!$isFailedRow && $this->item->save_value($itemData, $itemId)) {
                            $this->save_tax_data($row, $itemData);
                            $this->save_inventory_quantities($row, $itemData, $allowedStockLocations, $employeeId);
                            $csvAttributeValues = $this->extractAttributeData($row);
@@ -1317,8 +1335,8 @@ class Items extends Secure_Controller
                $images = glob(FCPATH . "uploads/item_pics/$item->pic_filename.*");
                if (sizeof($images) > 0) {
                    $new_pic_filename = pathinfo($images[0], PATHINFO_BASENAME);
-                    $item_data = ['pic_filename' => $new_pic_filename, 'item_id' => $item->item_id];
-                    $this->item->saveValue($item_data);
+                    $item_data = ['pic_filename' => $new_pic_filename];
+                    $this->item->save_value($item_data, $item->item_id);
                }
            }
        }
--- a/app/Controllers/Reports.php
+++ b/app/Controllers/Reports.php
@@ -1246,13 +1246,15 @@ class Reports extends Secure_Controller
    public function get_payment_type(): array
    {
        return [
-            'all'      => lang('Common.none_selected_text'),
-            'cash'     => lang('Sales.cash'),
-            'due'      => lang('Sales.due'),
-            'check'    => lang('Sales.check'),
-            'credit'   => lang('Sales.credit'),
-            'debit'    => lang('Sales.debit'),
-            'invoices' => lang('Sales.invoice')
+            'all'           => lang('Common.none_selected_text'),
+            'cash'          => lang('Sales.cash'),
+            'due'           => lang('Sales.due'),
+            'check'         => lang('Sales.check'),
+            'credit'        => lang('Sales.credit'),
+            'debit'         => lang('Sales.debit'),
+            'bank_transfer' => lang('Sales.bank_transfer'),
+            'wallet'        => lang('Sales.wallet'),
+            'invoices'      => lang('Sales.invoice')
        ];
    }

--- a/app/Controllers/Sales.php
+++ b/app/Controllers/Sales.php
@@ -93,6 +93,8 @@ class Sales extends Secure_Controller
                'only_check'        => lang('Sales.check_filter'),
                'only_creditcard'   => lang('Sales.credit_filter'),
                'only_debit'        => lang('Sales.debit'),
+                'only_bank_transfer'=> lang('Sales.bank_transfer'),
+                'only_wallet'       => lang('Sales.wallet'),
                'only_invoices'     => lang('Sales.invoice_filter'),
                'selected_customer' => lang('Sales.selected_customer')
            ];
@@ -156,6 +158,8 @@ class Sales extends Secure_Controller
            'selected_customer' => false,
            'only_creditcard'   => false,
            'only_debit'        => false,
+            'only_bank_transfer'=> false,
+            'only_wallet'       => false,
            'only_invoices'     => $this->config['invoice_enable'] && $this->request->getGet('only_invoices', FILTER_SANITIZE_NUMBER_INT),
            'is_valid_receipt'  => $this->sale->is_valid_receipt($search)
        ];
@@ -904,6 +908,14 @@ class Sales extends Secure_Controller
                return $this->_reload($data);
            } else {
                $data['barcode'] = $this->barcode_lib->generate_receipt_barcode($data['sale_id']);
+
+                // Validate receipt template to prevent path traversal
+                $receipt_template = $this->config['receipt_template'] ?? '';
+                if (!Sale_lib::isValidReceiptTemplate($receipt_template)) {
+                    $receipt_template = 'receipt_default';
+                }
+                $data['receipt_template_view'] = $receipt_template;
+
                $this->sale_lib->clear_all();
                return view('sales/receipt', $data);
            }
@@ -937,7 +949,10 @@ class Sales extends Secure_Controller
                new Token_customer((array)$sale_data)
            ];
            $text = $this->token_lib->render($text, $tokens);
-            $sale_data['mimetype'] = mime_content_type(FCPATH . 'uploads/' . $this->config['company_logo']);
+            $sale_data['mimetype'] = $this->email_lib->getLogoMimeType();
+
+            // Build img_tag for email views that need it (receipt_email.php)
+            $sale_data['img_tag'] = $this->email_lib->buildLogoImgTag();

            // Generate email attachment: invoice in PDF format
            $view = Services::renderer();
@@ -974,13 +989,7 @@ class Sales extends Secure_Controller

        if (!empty($sale_data['customer_email'])) {
            $sale_data['barcode'] = $this->barcode_lib->generate_receipt_barcode($sale_data['sale_id']);
-            $sale_data['img_tag'] = '';
-
-            $logo_path = FCPATH . 'uploads/' . $this->config['company_logo'];
-            if (!empty($this->config['company_logo']) && file_exists($logo_path)) {
-                $logo_data = base64_encode(file_get_contents($logo_path));
-                $sale_data['img_tag'] = '<img id="image" src="data:image/png;base64,' . $logo_data . '" alt="company_logo">';
-            }
+            $sale_data['img_tag'] = $this->email_lib->buildLogoImgTag();

            $to = $sale_data['customer_email'];
            $subject = lang('Sales.receipt');
@@ -1162,6 +1171,13 @@ class Sales extends Secure_Controller
        }
        $data['invoice_view'] = $invoice_type;

+        // Validate receipt template to prevent path traversal
+        $receipt_template = $this->config['receipt_template'] ?? '';
+        if (!Sale_lib::isValidReceiptTemplate($receipt_template)) {
+            $receipt_template = 'receipt_default';
+        }
+        $data['receipt_template_view'] = $receipt_template;
+
        return $data;
    }

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

    /**
--- a/app/Database/Dockerfile
+++ b/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
--- a/app/Database/Migrations/20260506000000_AddShortcutKeys.php
+++ b/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();
+    }
+}
--- a/app/Helpers/locale_helper.php
+++ b/app/Helpers/locale_helper.php
@@ -22,7 +22,7 @@ function current_language_code(bool $load_system_language = false): string
        }
    }

-    return $config->language_code ?? DEFAULT_LANGUAGE_CODE;
+    return $config['language_code'] ?? DEFAULT_LANGUAGE_CODE;
 }

 /**
@@ -43,7 +43,7 @@ function current_language(bool $load_system_language = false): string
        }
    }

-    return $config->language ?? DEFAULT_LANGUAGE_CODE;
+    return $config['language'] ?? DEFAULT_LANGUAGE;
 }

 /**
@@ -272,6 +272,9 @@ function get_payment_options(): array
        $payments[lang('Sales.upi')] = lang('Sales.upi');
    }

+    $payments[lang('Sales.bank_transfer')] = lang('Sales.bank_transfer');
+    $payments[lang('Sales.wallet')]        = lang('Sales.wallet');
+
    return $payments;
 }

--- a/app/Helpers/tabular_helper.php
+++ b/app/Helpers/tabular_helper.php
@@ -402,6 +402,25 @@ function item_headers(): array
    ];
 }

+/**
+ * Get all sortable column keys for items table, including dynamic attribute columns.
+ *
+ * @return array Array of column headers in format expected by sanitizeSortColumn
+ */
+function item_sort_columns(): array
+{
+    $attribute = model(Attribute::class);
+    $definitionIds = array_keys($attribute->get_definitions_by_flags($attribute::SHOW_IN_ITEMS));
+
+    $headers = item_headers();
+
+    foreach ($definitionIds as $definitionId) {
+        $headers[] = [(string) $definitionId => ''];
+    }
+
+    return $headers;
+}
+
 /**
 * Get the header for the items tabular view
 */
@@ -422,7 +441,7 @@ function get_items_manage_table_headers(): string
    $headers[] = ['item_pic' => lang('Items.image'), 'sortable' => false];

    foreach ($definitionsWithTypes as $definition_id => $definitionInfo) {
-        $headers[] = [$definition_id => $definitionInfo['name'], 'sortable' => false];
+        $headers[] = [$definition_id => $definitionInfo['name'], 'sortable' => true];
    }

    $headers[] = ['inventory' => '', 'escape' => false];
--- a/app/Language/ar-EG/Attributes.php
+++ b/app/Language/ar-EG/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "استلام البضائع",
    "show_in_sales"                    => "اظهار خلال البيع",
    "show_in_sales_visibility"         => "البيع",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "تحديث الميزات",
 ];
--- a/app/Language/ar-LB/Attributes.php
+++ b/app/Language/ar-LB/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "استلام البضائع",
    "show_in_sales"                    => "اظهار خلال البيع",
    "show_in_sales_visibility"         => "البيع",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "تحديث الميزات",
 ];
--- a/app/Language/az/Attributes.php
+++ b/app/Language/az/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Alınanlar",
    "show_in_sales"                    => "Satışda göstərin",
    "show_in_sales_visibility"         => "Satışlar",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Atributları yenilə",
 ];
--- a/app/Language/bg/Attributes.php
+++ b/app/Language/bg/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "",
    "show_in_sales"                    => "",
    "show_in_sales_visibility"         => "",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "",
 ];
--- a/app/Language/bs/Attributes.php
+++ b/app/Language/bs/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Ulazi",
    "show_in_sales"                    => "Prikaži u prodaji",
    "show_in_sales_visibility"         => "Prodaja",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Ažuriraj atribut",
 ];
--- a/app/Language/ckb/Attributes.php
+++ b/app/Language/ckb/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "بەدەستگەیشتووکان",
    "show_in_sales"                    => "لە فرۆشتندا نیشانی بدە",
    "show_in_sales_visibility"         => "فرۆشتن",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "تایبەتمەندی نوێ بکەرەوە",
 ];
--- a/app/Language/cs/Attributes.php
+++ b/app/Language/cs/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "",
    "show_in_sales"                    => "",
    "show_in_sales_visibility"         => "",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "",
 ];
--- a/app/Language/da/Attributes.php
+++ b/app/Language/da/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Modtagelser",
    "show_in_sales"                    => "Vis i salg",
    "show_in_sales_visibility"         => "Salg",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Opdater egenskab",
 ];
--- a/app/Language/de-CH/Attributes.php
+++ b/app/Language/de-CH/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "",
    "show_in_sales"                    => "",
    "show_in_sales_visibility"         => "",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "",
 ];
--- a/app/Language/de-DE/Attributes.php
+++ b/app/Language/de-DE/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Eingänge",
    "show_in_sales"                    => "In Verkäufen anzeigen",
    "show_in_sales_visibility"         => "Verkauf",
+    "show_in_search"                   => "In Suche anzeigen",
+    "show_in_search_visibility"        => "Suche",
    "update"                           => "Attribut aktualisieren",
 ];
--- a/app/Language/el/Attributes.php
+++ b/app/Language/el/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "",
    "show_in_sales"                    => "",
    "show_in_sales_visibility"         => "",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "",
 ];
--- a/app/Language/en-GB/Attributes.php
+++ b/app/Language/en-GB/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Receivings",
    "show_in_sales"                    => "Show in sales",
    "show_in_sales_visibility"         => "Sales",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Update Attribute",
 ];
--- a/app/Language/en-GB/Sales.php
+++ b/app/Language/en-GB/Sales.php
@@ -9,6 +9,7 @@ return [
    "amount_due"                       => "Amount Due",
    "amount_tendered"                  => "Amount Tendered",
    "authorized_signature"             => "Authorised Signature",
+    "bank_transfer"                    => "Bank Transfer",
    "cancel_sale"                      => "Cancel",
    "cash"                             => "Cash",
    "cash_1"                           => "",
@@ -223,6 +224,7 @@ return [
    "update"                           => "Update",
    "upi"                              => "UPI",
    "visa"                             => "",
+    "wallet"                           => "Wallet",
    "wholesale"                        => "",
    "work_order"                       => "Work Order",
    "work_order_number"                => "Work Order Number",
--- a/app/Language/en/Attributes.php
+++ b/app/Language/en/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Receivings",
    "show_in_sales"                    => "Show in sales",
    "show_in_sales_visibility"         => "Sales",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Update Attribute",
 ];
--- a/app/Language/en/Config.php
+++ b/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",
--- a/app/Language/en/Sales.php
+++ b/app/Language/en/Sales.php
@@ -9,6 +9,7 @@ return [
    "amount_due"                       => "Amount Due",
    "amount_tendered"                  => "Amount Tendered",
    "authorized_signature"             => "Authorized Signature",
+    "bank_transfer"                    => "Bank Transfer",
    "cancel_sale"                      => "Cancel",
    "cash"                             => "Cash",
    "cash_1"                           => "",
@@ -223,6 +224,7 @@ return [
    "update"                           => "Update",
    "upi"                              => "UPI",
    "visa"                             => "",
+    "wallet"                           => "Wallet",
    "wholesale"                        => "",
    "work_order"                       => "Work Order",
    "work_order_number"                => "Work Order Number",
--- a/app/Language/es-ES/Attributes.php
+++ b/app/Language/es-ES/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Recibos",
    "show_in_sales"                    => "Mostrar en ventas",
    "show_in_sales_visibility"         => "Ventas",
+    "show_in_search"                   => "Mostrar en búsqueda",
+    "show_in_search_visibility"        => "Búsqueda",
    "update"                           => "Actualizar Atributo",
 ];
--- a/app/Language/es-ES/Items.php
+++ b/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.",
--- a/app/Language/es-ES/Sales.php
+++ b/app/Language/es-ES/Sales.php
@@ -9,6 +9,7 @@ return [
    "amount_due"                       => "Monto Adeudado",
    "amount_tendered"                  => "Cantidad Recibida",
    "authorized_signature"             => "Firma Autorizada",
+    "bank_transfer"                    => "Transferencia Bancaria",
    "cancel_sale"                      => "Cancelar Venta",
    "cash"                             => "Efectivo",
    "cash_1"                           => "1",
@@ -222,6 +223,7 @@ return [
    "update"                           => "Editar",
    "upi"                              => "PIN UPI",
    "visa"                             => "Tarjeta Visa",
+    "wallet"                           => "Monedero",
    "wholesale"                        => "Precio al por mayor",
    "work_order"                       => "Orden trabajo",
    "work_order_number"                => "Numero Orden Trabajo",
--- a/app/Language/es-MX/Attributes.php
+++ b/app/Language/es-MX/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Recepciones",
    "show_in_sales"                    => "Mostrar en Ventas",
    "show_in_sales_visibility"         => "Ventas",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Actualizar atributo",
 ];
--- a/app/Language/es-MX/Sales.php
+++ b/app/Language/es-MX/Sales.php
@@ -9,6 +9,7 @@ return [
    "amount_due"                       => "Monto de adeudo",
    "amount_tendered"                  => "Cantidad Recibida",
    "authorized_signature"             => "Firma Autorizada",
+    "bank_transfer"                    => "Transferencia Bancaria",
    "cancel_sale"                      => "Cancelar",
    "cash"                             => "Efectivo",
    "cash_1"                           => "",
@@ -222,6 +223,7 @@ return [
    "update"                           => "Actualizar",
    "upi"                              => "UPI",
    "visa"                             => "",
+    "wallet"                           => "Monedero",
    "wholesale"                        => "",
    "work_order"                       => "Orden de trabajo",
    "work_order_number"                => "Número de orden de trabajo",
--- a/app/Language/fa/Attributes.php
+++ b/app/Language/fa/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "دریافت",
    "show_in_sales"                    => "نمایش در فروش",
    "show_in_sales_visibility"         => "حراجی",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "به روز کردن ویژگی",
 ];
--- a/app/Language/fr/Attributes.php
+++ b/app/Language/fr/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Réceptions",
    "show_in_sales"                    => "Afficher dans les ventes",
    "show_in_sales_visibility"         => "Ventes",
+    "show_in_search"                   => "Afficher dans la recherche",
+    "show_in_search_visibility"        => "Recherche",
    "update"                           => "Mettre à jour l'attribut",
 ];
--- a/app/Language/fr/Sales.php
+++ b/app/Language/fr/Sales.php
@@ -9,6 +9,7 @@ return [
    "amount_due"                       => "Montant à Payer",
    "amount_tendered"                  => "Montant Présenté",
    "authorized_signature"             => "Signature autorisée",
+    "bank_transfer"                    => "Virement Bancaire",
    "cancel_sale"                      => "Annuler la Vente",
    "cash"                             => "Espèce",
    "cash_1"                           => "",
@@ -222,6 +223,7 @@ return [
    "update"                           => "Éditer",
    "upi"                              => "UPI",
    "visa"                             => "",
+    "wallet"                           => "Portefeuille",
    "wholesale"                        => "",
    "work_order"                       => "Commande de travail",
    "work_order_number"                => "Numéro de commande",
--- a/app/Language/he/Attributes.php
+++ b/app/Language/he/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "קבלת סחורה",
    "show_in_sales"                    => "הצג במכירות",
    "show_in_sales_visibility"         => "מכירות",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "עדכן מאפיין",
 ];
--- a/app/Language/hr-HR/Attributes.php
+++ b/app/Language/hr-HR/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "",
    "show_in_sales"                    => "",
    "show_in_sales_visibility"         => "",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "",
 ];
--- a/app/Language/hu/Attributes.php
+++ b/app/Language/hu/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Áruátvételek",
    "show_in_sales"                    => "Megjelenítés az értékesítésekben",
    "show_in_sales_visibility"         => "Értékesítések",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Tulajdonság frissítése",
 ];
--- a/app/Language/hy/Attributes.php
+++ b/app/Language/hy/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Receivings",
    "show_in_sales"                    => "Show in sales",
    "show_in_sales_visibility"         => "Sales",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Update Attribute",
 ];
--- a/app/Language/id/Attributes.php
+++ b/app/Language/id/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Penerimaan",
    "show_in_sales"                    => "Tampilkan dalam penjualan",
    "show_in_sales_visibility"         => "Penjualan",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Perbarui Atribut",
 ];
--- a/app/Language/it/Attributes.php
+++ b/app/Language/it/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Ricezione",
    "show_in_sales"                    => "Visualizza in vendite",
    "show_in_sales_visibility"         => "Vendite",
+    "show_in_search"                   => "Visualizza nella ricerca",
+    "show_in_search_visibility"        => "Ricerca",
    "update"                           => "Aggiorna attributo",
 ];
--- a/app/Language/ka/Calendar.php
+++ b/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"  => "",
-];
+];
--- a/app/Language/km/Attributes.php
+++ b/app/Language/km/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "",
    "show_in_sales"                    => "",
    "show_in_sales_visibility"         => "",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "",
 ];
--- a/app/Language/lo/Attributes.php
+++ b/app/Language/lo/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "",
    "show_in_sales"                    => "",
    "show_in_sales_visibility"         => "",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "",
 ];
--- a/app/Language/lo/Calendar.php
+++ b/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"  => "",
-];
+];
--- a/app/Language/ml/Attributes.php
+++ b/app/Language/ml/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Receivings",
    "show_in_sales"                    => "Show in sales",
    "show_in_sales_visibility"         => "Sales",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Update Attribute",
 ];
--- a/app/Language/ml/Calendar.php
+++ b/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"  => "ഡിസംബർ",
-];
+];
--- a/app/Language/nb/Attributes.php
+++ b/app/Language/nb/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Receivings",
    "show_in_sales"                    => "Show in sales",
    "show_in_sales_visibility"         => "Sales",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Update Attribute",
 ];
--- a/app/Language/nb/Calendar.php
+++ b/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",
-];
+];
--- a/app/Language/nl-BE/Attributes.php
+++ b/app/Language/nl-BE/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Orders",
    "show_in_sales"                    => "Toon in verkoop",
    "show_in_sales_visibility"         => "Verkoop",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Wijzig Attribuut",
 ];
--- a/app/Language/nl-NL/Attributes.php
+++ b/app/Language/nl-NL/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Leveringen",
    "show_in_sales"                    => "Weergeven in verkopen",
    "show_in_sales_visibility"         => "Verkopen",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Kenmerk bijwerken",
 ];
--- a/app/Language/pl/Attributes.php
+++ b/app/Language/pl/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Dostawy",
    "show_in_sales"                    => "Pokaż w sprzedażach",
    "show_in_sales_visibility"         => "Sprzedaże",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Zaktualizuj atrybut",
 ];
--- a/app/Language/pt-BR/Attributes.php
+++ b/app/Language/pt-BR/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Recebimentos",
    "show_in_sales"                    => "Mostrar em vendas",
    "show_in_sales_visibility"         => "Vendas",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Atualizar atributo",
 ];
--- a/app/Language/ro/Attributes.php
+++ b/app/Language/ro/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Receptii",
    "show_in_sales"                    => "Arata in vanzari",
    "show_in_sales_visibility"         => "Vanzari",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Actualizare Atribut",
 ];
--- a/app/Language/ru/Attributes.php
+++ b/app/Language/ru/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Закупки",
    "show_in_sales"                    => "Показать в продажах",
    "show_in_sales_visibility"         => "Продажи",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Обновить атрибут",
 ];
--- a/app/Language/sv/Attributes.php
+++ b/app/Language/sv/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Inleveranser",
    "show_in_sales"                    => "Visa i försäljning",
    "show_in_sales_visibility"         => "Försäljning",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Uppdatera attribut",
 ];
--- a/app/Language/sw-KE/Attributes.php
+++ b/app/Language/sw-KE/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Manunuzi",
    "show_in_sales"                    => "Onyesha kwenye Mauzo",
    "show_in_sales_visibility"         => "Mauzo",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Sasisha Sifa",
 ];
--- a/app/Language/sw-TZ/Attributes.php
+++ b/app/Language/sw-TZ/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Manunuzi",
    "show_in_sales"                    => "Onyesha kwenye Mauzo",
    "show_in_sales_visibility"         => "Mauzo",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Sasisha Sifa",
 ];
--- a/app/Language/ta/Attributes.php
+++ b/app/Language/ta/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Receivings",
    "show_in_sales"                    => "Show in sales",
    "show_in_sales_visibility"         => "Sales",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Update Attribute",
 ];
--- a/app/Language/th/Attributes.php
+++ b/app/Language/th/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "สินค้าขาเข้า",
    "show_in_sales"                    => "แสดงใน การขาย",
    "show_in_sales_visibility"         => "การขาย",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "ปรับปรุงแอตทริบิวต์",
 ];
--- a/app/Language/th/Bootstrap_tables.php
+++ b/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' => "ซ่อน/แสดง",
 ];
--- a/app/Language/th/Login.php
+++ b/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"                      => "ชื่อผู้ใช้",
--- a/app/Language/th/Sales.php
+++ b/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' => "ลูกค้าที่เลือก",
 ];
--- a/app/Language/tl/Attributes.php
+++ b/app/Language/tl/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Receivings",
    "show_in_sales"                    => "Show in sales",
    "show_in_sales_visibility"         => "Sales",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Update Attribute",
 ];
--- a/app/Language/tr/Attributes.php
+++ b/app/Language/tr/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Alacaklar",
    "show_in_sales"                    => "Satışlarda göster",
    "show_in_sales_visibility"         => "Satışlar",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Nitelik Güncelle",
 ];
--- a/app/Language/uk/Attributes.php
+++ b/app/Language/uk/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Надходження",
    "show_in_sales"                    => "Показати в продажах",
    "show_in_sales_visibility"         => "Продажі",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Оновити атрибут",
 ];
--- a/app/Language/ur/Attributes.php
+++ b/app/Language/ur/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Receivings",
    "show_in_sales"                    => "Show in sales",
    "show_in_sales_visibility"         => "Sales",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Update Attribute",
 ];
--- a/app/Language/vi/Attributes.php
+++ b/app/Language/vi/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "Nhập hàng",
    "show_in_sales"                    => "Hiển thị trong bán hàng",
    "show_in_sales_visibility"         => "Bán hàng",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "Cập nhật thuộc tính",
 ];
--- a/app/Language/zh-Hans/Attributes.php
+++ b/app/Language/zh-Hans/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "收据",
    "show_in_sales"                    => "在销售中显示",
    "show_in_sales_visibility"         => "销售",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "更新属性",
 ];
--- a/app/Language/zh-Hant/Attributes.php
+++ b/app/Language/zh-Hant/Attributes.php
@@ -30,5 +30,7 @@ return [
    "show_in_receivings_visibility"    => "收貨",
    "show_in_sales"                    => "在銷售中顯示",
    "show_in_sales_visibility"         => "銷售",
+    "show_in_search"                   => "Show in search",
+    "show_in_search_visibility"        => "Search",
    "update"                           => "更新屬性",
 ];
--- a/app/Libraries/Email_lib.php
+++ b/app/Libraries/Email_lib.php
@@ -82,4 +82,40 @@ class Email_lib

        return $result;
    }
+
+    /**
+     * Gets the mime type of the company logo file.
+     *
+     * @return string Mime type or empty string if logo doesn't exist
+     */
+    public function getLogoMimeType(): string
+    {
+        $logo_path = FCPATH . 'uploads/' . $this->config['company_logo'];
+
+        if (!empty($this->config['company_logo']) && file_exists($logo_path)) {
+            $mimeType = mime_content_type($logo_path);
+            return $mimeType !== false ? $mimeType : '';
+        }
+
+        return '';
+    }
+
+    /**
+     * Builds an img tag for the company logo to use in email templates.
+     *
+     * @return string HTML img tag with base64-encoded logo, or empty string if no logo
+     */
+    public function buildLogoImgTag(): string
+    {
+        $mimeType = $this->getLogoMimeType();
+
+        if ($mimeType === '') {
+            return '';
+        }
+
+        $logo_path = FCPATH . 'uploads/' . $this->config['company_logo'];
+        $logo_data = base64_encode(file_get_contents($logo_path));
+
+        return '<img id="image" src="data:' . $mimeType . ';base64,' . $logo_data . '" alt="company_logo">';
+    }
 }
--- a/app/Libraries/MY_Migration.php
+++ b/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;
--- a/app/Libraries/Sale_lib.php
+++ b/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;
@@ -95,6 +108,11 @@ class Sale_lib
        'custom_tax_invoice'
    ];

+    private const ALLOWED_RECEIPT_TEMPLATES = [
+        'receipt_default',
+        'receipt_short'
+    ];
+
    public function get_invoice_type_options(): array
    {
        $invoice_types = [];
@@ -105,11 +123,54 @@ 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);
    }

+    public static function isValidReceiptTemplate(string $receipt_template): bool
+    {
+        return in_array($receipt_template, self::ALLOWED_RECEIPT_TEMPLATES, true);
+    }
+
    /**
     * @return array
     */
--- a/app/Models/Attribute.php
+++ b/app/Models/Attribute.php
@@ -38,9 +38,10 @@ class Attribute extends Model
        'attribute_decimal'
    ];

-    public const SHOW_IN_ITEMS = 1;    // TODO: These need to be moved to constants.php
+    public const SHOW_IN_ITEMS = 1;
    public const SHOW_IN_SALES = 2;
    public const SHOW_IN_RECEIVINGS = 4;
+    public const SHOW_IN_SEARCH = 8;
    public function deleteDropdownAttributeValue(string $attribute_value, int $definition_id): bool
    {
        $attribute_id = $this->getAttributeIdByValue($attribute_value);
--- a/app/Models/Item.php
+++ b/app/Models/Item.php
@@ -31,6 +31,7 @@ class Item extends Model
        'allow_alt_description',
        'is_serialized'
    ];
+
    protected $table = 'items';
    protected $primaryKey = 'item_id';
    protected $useAutoIncrement = true;
@@ -58,15 +59,16 @@ class Item extends Model
        'hsn_code'
    ];

-
    /**
     * Determines if a given item_id is an item
     */
    public function exists(string $item_id, bool $ignore_deleted = false, bool $deleted = false): bool
    {
        $builder = $this->db->table('items');
+        $builder->groupStart();
        $builder->where('item_id', $item_id);
        $builder->orWhere('item_number', $item_id);
+        $builder->groupEnd();

        if (!$ignore_deleted) {
            $builder->where('deleted', $deleted);
@@ -130,32 +132,186 @@ class Item extends Model
        return $this->search($search, $filters, 0, 0, 'items.name', 'asc', true);
    }

+    /**
+     * Parse search string for attribute-specific queries
+     * Supports syntax like "color: blue size: large" or "color:blue AND size:large"
+     *
+     * @param string $search The raw search string
+     * @return array{terms: array, attributes: array} Parsed terms and attribute queries
+     */
+    public function parseAttributeSearch(string $search): array
+    {
+        $result = [
+            'terms'    => [],
+            'attributes' => []
+        ];
+
+        if ($search === '') {
+            return $result;
+        }
+
+        $pattern = '/([[:alpha:]][[:alnum:] _-]*?)\s*:\s*([^\s,]+)(?:\s+(?:AND|OR)\s+)?/iu';
+        $remaining = preg_replace($pattern, '', $search);
+
+        if (preg_match_all($pattern, $search, $matches, PREG_SET_ORDER)) {
+            foreach ($matches as $match) {
+                $attrName = strtolower(trim($match[1]));
+                $attrValue = trim($match[2]);
+                $result['attributes'][$attrName][] = $attrValue;
+            }
+        }
+
+        $remaining = trim(preg_replace('/\s+/', ' ', $remaining));
+        if ($remaining !== '') {
+            $result['terms'][] = $remaining;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Search for items by attribute values
+     * Returns an array of item_ids matching the attribute search criteria
+     *
+     * @param string $search Search term
+     * @param array $definitionIds Attribute definition IDs to search within
+     * @param bool $matchDeleted Whether to match items where deleted flag equals this value
+     * @param string $logic 'AND' or 'OR' for multiple attribute matching
+     * @return array Array of matching item_ids
+     */
+    public function searchByAttributes(string $search, array $definitionIds, bool $matchDeleted = false, string $logic = 'OR'): array
+    {
+        if ($definitionIds === [] || $search === '') {
+            return [];
+        }
+
+        $parsed = $this->parseAttributeSearch($search);
+        $matchingItemIds = [];
+
+        if (!empty($parsed['attributes'])) {
+            $attribute = model(Attribute::class);
+            $allDefinitions = $attribute->get_definitions_by_flags(Attribute::SHOW_IN_ITEMS | Attribute::SHOW_IN_SEARCH, true);
+            $definitionNameToId = [];
+
+            foreach ($allDefinitions as $id => $defInfo) {
+                $name = is_array($defInfo) ? $defInfo['name'] : $defInfo;
+                $definitionNameToId[strtolower($name)] = (int) $id;
+            }
+
+            foreach ($parsed['attributes'] as $attrName => $values) {
+                if (!isset($definitionNameToId[$attrName])) {
+                    continue;
+                }
+
+                $definitionId = $definitionNameToId[$attrName];
+
+                // Skip if this attribute is not in the caller-provided definitionIds filter
+                if (!in_array($definitionId, $definitionIds, true)) {
+                    continue;
+                }
+
+                foreach ($values as $value) {
+                    $builder = $this->db->table('attribute_links');
+                    $builder->select('DISTINCT attribute_links.item_id');
+                    $builder->join('attribute_values', 'attribute_values.attribute_id = attribute_links.attribute_id');
+                    $builder->join('items', 'items.item_id = attribute_links.item_id');
+                    $builder->groupStart();
+                    $builder->like('attribute_values.attribute_value', $value);
+                    $builder->orWhere('attribute_values.attribute_decimal', $value);
+                    $builder->orWhere('attribute_values.attribute_date', $value);
+                    $builder->groupEnd();
+                    $builder->where('attribute_links.definition_id', $definitionId);
+                    $builder->where('attribute_links.sale_id', null);
+                    $builder->where('attribute_links.receiving_id', null);
+                    $builder->where('items.deleted', $matchDeleted);
+
+                    $foundIds = array_column($builder->get()->getResultArray(), 'item_id');
+
+                    if ($logic === 'AND') {
+                        if (empty($matchingItemIds)) {
+                            $matchingItemIds = $foundIds;
+                        } else {
+                            $matchingItemIds = array_intersect($matchingItemIds, $foundIds);
+                        }
+                    } else {
+                        $matchingItemIds = array_unique(array_merge($matchingItemIds, $foundIds));
+                    }
+                }
+            }
+        }
+
+        if (!empty($parsed['terms'])) {
+            $term = implode(' ', $parsed['terms']);
+            $termIds = $this->searchByAttributeValue($term, $definitionIds, $matchDeleted);
+
+            if (empty($matchingItemIds)) {
+                return $termIds;
+            }
+
+            return $logic === 'AND'
+                ? array_values(array_intersect($matchingItemIds, $termIds))
+                : array_values(array_unique(array_merge($matchingItemIds, $termIds)));
+        }
+
+        return $matchingItemIds;
+    }
+
+    /**
+     * Search for items by a single attribute value
+     *
+     * @param string $search Search term
+     * @param array $definitionIds Attribute definition IDs to search within
+     * @param bool $matchDeleted Whether to match items where deleted flag equals this value
+     * @return array Array of matching item_ids
+     */
+    private function searchByAttributeValue(string $search, array $definitionIds, bool $matchDeleted = false): array
+    {
+        $builder = $this->db->table('attribute_links');
+        $builder->select('DISTINCT attribute_links.item_id');
+        $builder->join('attribute_values', 'attribute_values.attribute_id = attribute_links.attribute_id');
+        $builder->join('items', 'items.item_id = attribute_links.item_id');
+        $builder->groupStart();
+        $builder->like('attribute_values.attribute_value', $search);
+        $builder->orWhere('attribute_values.attribute_decimal', $search);
+        $builder->orWhere('attribute_values.attribute_date', $search);
+        $builder->groupEnd();
+        $builder->whereIn('attribute_links.definition_id', $definitionIds);
+        $builder->where('attribute_links.sale_id', null);
+        $builder->where('attribute_links.receiving_id', null);
+        $builder->where('items.deleted', $matchDeleted);
+
+        return array_column($builder->get()->getResultArray(), 'item_id');
+    }
+
+    /**
+     * Get attribute definition ID from column name for sorting
+     *
+     * @param string $sortColumn The sort column name
+     * @return int|null The definition ID or null if not an attribute column
+     */
+    private function getAttributeSortDefinitionId(string $sortColumn): ?int
+    {
+        if (!ctype_digit($sortColumn)) {
+            return null;
+        }
+
+        return (int) $sortColumn;
+    }
+
    /**
     * Perform a search on items
     */
    public function search(string $search, array $filters, ?int $rows = 0, ?int $limit_from = 0, ?string $sort = 'items.name', ?string $order = 'asc', ?bool $count_only = false)
    {
-        // Set default values
-        if ($rows == null) {
-            $rows = 0;
-        }
-        if ($limit_from == null) {
-            $limit_from = 0;
-        }
-        if ($sort == null) {
-            $sort = 'items.name';
-        }
-        if ($order == null) {
-            $order = 'asc';
-        }
-        if ($count_only == null) {
-            $count_only = false;
-        }
+        $rows = $rows ?? 0;
+        $limit_from = $limit_from ?? 0;
+        $sort = $sort ?? 'items.name';
+        $order = $order ?? 'asc';
+        $count_only = $count_only ?? false;

        $config = config(OSPOS::class)->settings;
-        $builder = $this->db->table('items AS items');    // TODO: I'm not sure if it's needed to write items AS items... I think you can just get away with items
+        $builder = $this->db->table('items AS items');

-        // get_found_rows case
        if ($count_only) {
            $builder->select('COUNT(DISTINCT items.item_id) AS count');
        } else {
@@ -210,13 +366,33 @@ class Item extends Model
            : 'trans_date BETWEEN ' . $this->db->escape(rawurldecode($filters['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($filters['end_date']));
        $builder->where($where);

-        $attributes_enabled = count($filters['definition_ids']) > 0;
+        $attributesEnabled = count($filters['definition_ids']) > 0;
+        $matchingItemIds = [];

-        if (!empty($search)) {
-            if ($attributes_enabled && $filters['search_custom']) {
-                $builder->havingLike('attribute_values', $search);
-                $builder->orHavingLike('attribute_dtvalues', $search);
-                $builder->orHavingLike('attribute_dvalues', $search);
+        if ($search !== '' && $attributesEnabled && $filters['search_custom']) {
+            $matchingItemIds = $this->searchByAttributes($search, $filters['definition_ids'], $filters['is_deleted']);
+        }
+
+        if ($search !== '') {
+            if ($attributesEnabled && $filters['search_custom']) {
+                if (empty($matchingItemIds)) {
+                    $builder->groupStart();
+                    $builder->like('name', $search);
+                    $builder->orLike('item_number', $search);
+                    $builder->orLike('items.item_id', $search);
+                    $builder->orLike('company_name', $search);
+                    $builder->orLike('items.category', $search);
+                    $builder->groupEnd();
+                } else {
+                    $builder->groupStart();
+                    $builder->whereIn('items.item_id', $matchingItemIds);
+                    $builder->orLike('name', $search);
+                    $builder->orLike('item_number', $search);
+                    $builder->orLike('items.item_id', $search);
+                    $builder->orLike('company_name', $search);
+                    $builder->orLike('items.category', $search);
+                    $builder->groupEnd();
+                }
            } else {
                $builder->groupStart();
                $builder->like('name', $search);
@@ -228,16 +404,43 @@ class Item extends Model
            }
        }

-        if ($attributes_enabled) {
+        if ($attributesEnabled && !$count_only) {
            $format = $this->db->escape(dateformat_mysql());
            $this->db->simpleQuery('SET SESSION group_concat_max_len=49152');
            $builder->select('GROUP_CONCAT(DISTINCT CONCAT_WS(\'_\', definition_id, attribute_value) ORDER BY definition_id SEPARATOR \'|\') AS attribute_values');
            $builder->select("GROUP_CONCAT(DISTINCT CONCAT_WS('_', definition_id, DATE_FORMAT(attribute_date, $format)) SEPARATOR '|') AS attribute_dtvalues");
            $builder->select('GROUP_CONCAT(DISTINCT CONCAT_WS(\'_\', definition_id, attribute_decimal) SEPARATOR \'|\') AS attribute_dvalues');
-            $builder->join('attribute_links', 'attribute_links.item_id = items.item_id AND attribute_links.receiving_id IS NULL AND attribute_links.sale_id IS NULL AND definition_id IN (' . implode(',', $filters['definition_ids']) . ')', 'left');
+            $sanitizedIds = array_map('intval', $filters['definition_ids']);
+            $builder->join('attribute_links', 'attribute_links.item_id = items.item_id AND attribute_links.receiving_id IS NULL AND attribute_links.sale_id IS NULL AND definition_id IN (' . implode(',', $sanitizedIds) . ')', 'left');
            $builder->join('attribute_values', 'attribute_values.attribute_id = attribute_links.attribute_id', 'left');
        }

+        // Handle attribute column sorting
+        $sortDefinitionId = $this->getAttributeSortDefinitionId($sort);
+        if ($sortDefinitionId !== null && $attributesEnabled && !$count_only) {
+            $sortAlias = "sort_attr_{$sortDefinitionId}";
+            $builder->join("attribute_links AS {$sortAlias}", "{$sortAlias}.item_id = items.item_id AND {$sortAlias}.definition_id = {$sortDefinitionId} AND {$sortAlias}.sale_id IS NULL AND {$sortAlias}.receiving_id IS NULL", 'left');
+            $builder->join("attribute_values AS {$sortAlias}_val", "{$sortAlias}_val.attribute_id = {$sortAlias}.attribute_id", 'left');
+            
+            // Determine the correct column to sort by based on attribute type
+            $attribute = model(Attribute::class);
+            $definitionInfo = $attribute->get_definitions_by_flags(Attribute::SHOW_IN_ITEMS, true);
+            $sortColumn = "{$sortAlias}_val.attribute_value"; // default to text
+            
+            if (isset($definitionInfo[$sortDefinitionId])) {
+                $defType = is_array($definitionInfo[$sortDefinitionId]) ? ($definitionInfo[$sortDefinitionId]['type'] ?? TEXT) : TEXT;
+                if ($defType === DECIMAL) {
+                    $sortColumn = "{$sortAlias}_val.attribute_decimal";
+                } elseif ($defType === DATE) {
+                    $sortColumn = "{$sortAlias}_val.attribute_date";
+                }
+            }
+            
+            $builder->orderBy($sortColumn, $order);
+        } else {
+            $builder->orderBy($sort, $order);
+        }
+
        $builder->where('items.deleted', $filters['is_deleted']);

        if ($filters['empty_upc']) {
@@ -259,17 +462,12 @@ class Item extends Model
            $builder->whereIn('items.item_type', $non_temp);
        }

-        // get_found_rows case
        if ($count_only) {
            return $builder->get()->getRow()->count;
        }

-        // Avoid duplicated entries with same name because of inventory reporting multiple changes on the same item in the same date range
        $builder->groupBy('items.item_id');

-        // Order by name of item by default
-        $builder->orderBy($sort, $order);
-
        if ($rows > 0) {
            $builder->limit($rows, $limit_from);
        }
@@ -389,9 +587,10 @@ 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);
+        $builder->groupEnd();

        if (!$ignore_deleted) {
            $builder->where('items.deleted', $deleted);
@@ -436,62 +635,32 @@ class Item extends Model

    /**
     * Inserts or updates an item
-     * 
-     * If the primary key (item_id) is present in the data array and the record exists,
-     * it will update the existing record. Otherwise, it will insert a new record.
-     * 
-     * @param array $data The item data to save (passed by reference to set item_id on insert)
-     * @return bool True on success, false on failure
     */
-    public function saveValue(array &$data): bool
+    public function save_value(array &$item_data, int $item_id = NEW_ENTRY): bool    // TODO: need to bring this in line with parent or change the name
    {
-        $primaryKey = $this->primaryKey;
-        $id = $data[$primaryKey] ?? NEW_ENTRY;
-
-        // If id > 0 and record exists by primary key only, update it
-        if ($id > 0) {
-            // Check existence strictly by primary key (regardless of soft-delete status)
-            $builder = $this->db->table('items');
-            $builder->where($primaryKey, $id);
-            $exists = $builder->countAllResults() > 0;
-            
-            if ($exists) {
-                // Remove primary key from data array for update
-                $updateData = $data;
-                unset($updateData[$primaryKey]);
-                
-                $builder = $this->db->table('items');
-                $builder->where($primaryKey, $id);
-                return $builder->update($updateData);
-            }
-        }
-
-        // Insert new record with transaction for atomicity
-        $this->db->transBegin();
-        
-        // Remove primary key from insert payload if present
-        $insertData = $data;
-        unset($insertData[$primaryKey]);
-        
        $builder = $this->db->table('items');
-        $success = $builder->insert($insertData);
-        
-        if ($success) {
-            $data[$primaryKey] = (int)$this->db->insertID();
-            
-            // Update low_sell_item_id for new items
-            $builder = $this->db->table('items');
-            $builder->where($primaryKey, $data[$primaryKey]);
-            $success = $builder->update(['low_sell_item_id' => $data[$primaryKey]]);
+
+        if ($item_id < 1 || !$this->exists($item_id, true)) {
+            if ($builder->insert($item_data)) {
+                $item_data['item_id'] = (int)$this->db->insertID();
+                if ($item_id < 1) {
+                    $builder = $this->db->table('items');
+                    $builder->where('item_id', $item_data['item_id']);
+                    $builder->update(['low_sell_item_id' => $item_data['item_id']]);
+                }
+
+                return true;
+            }
+
+            return false;
+        } else {
+            $item_data['item_id'] = $item_id;
        }
-        
-        if ($success) {
-            $this->db->transCommit();
-            return true;
-        }
-        
-        $this->db->transRollback();
-        return false;
+
+        $builder = $this->db->table('items');
+        $builder->where('item_id', $item_id);
+
+        return $builder->update($item_data);
    }

    /**
@@ -1109,9 +1278,9 @@ class Item extends Model
        $total_quantity = $old_total_quantity + $items_received;
        $average_price = bcdiv(bcadd(bcmul((string)$items_received, (string)$new_price), bcmul((string)$old_total_quantity, (string)$old_price)), (string)$total_quantity);

-        $data = ['cost_price' => $average_price, 'item_id' => $item_id];
+        $data = ['cost_price' => $average_price];

-        return $this->saveValue($data);
+        return $this->save_value($data, $item_id);
    }

    /**
--- a/app/Models/Receiving.php
+++ b/app/Models/Receiving.php
@@ -294,7 +294,9 @@ class Receiving extends Model
            lang('Sales.check') => lang('Sales.check'),
            lang('Sales.debit') => lang('Sales.debit'),
            lang('Sales.credit') => lang('Sales.credit'),
-            lang('Sales.due') => lang('Sales.due')
+            lang('Sales.due') => lang('Sales.due'),
+            lang('Sales.bank_transfer') => lang('Sales.bank_transfer'),
+            lang('Sales.wallet') => lang('Sales.wallet')
        ];
    }

--- a/app/Models/Reports/Summary_sales_taxes.php
+++ b/app/Models/Reports/Summary_sales_taxes.php
@@ -33,14 +33,16 @@ class Summary_sales_taxes extends Summary_report
     * @param object $builder
     * @return void
     */
-    protected function _where(array $inputs, object &$builder): void    // TODO: hungarian notation
+    protected function _where(array $inputs, object &$builder): void
    {
        $builder->where('sales.sale_status', COMPLETED);

-        if (empty($this->config['date_or_time_format'])) {    // TODO: Duplicated code
-            $builder->where('DATE(sales.sale_time) BETWEEN ' . $this->db->escape($inputs['start_date']) . ' AND ' . $this->db->escape($inputs['end_date']));
+        if (empty($this->config['date_or_time_format'])) {
+            $builder->where('DATE(sales.sale_time) >=', $inputs['start_date']);
+            $builder->where('DATE(sales.sale_time) <=', $inputs['end_date']);
        } else {
-            $builder->where('sales.sale_time BETWEEN ' . $this->db->escape(rawurldecode($inputs['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($inputs['end_date'])));
+            $builder->where('sales.sale_time >=', $inputs['start_date']);
+            $builder->where('sales.sale_time <=', $inputs['end_date']);
        }
    }

@@ -53,9 +55,11 @@ class Summary_sales_taxes extends Summary_report
        $builder = $this->db->table('sales_taxes');

        if (empty($this->config['date_or_time_format'])) {
-            $builder->where('DATE(sale_time) BETWEEN ' . $inputs['start_date'] . ' AND ' . $inputs['end_date']);
+            $builder->where('DATE(sale_time) >=', $inputs['start_date']);
+            $builder->where('DATE(sale_time) <=', $inputs['end_date']);
        } else {
-            $builder->where('sale_time BETWEEN ' . $this->db->escape(rawurldecode($inputs['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($inputs['end_date'])));
+            $builder->where('sale_time >=', $inputs['start_date']);
+            $builder->where('sale_time <=', $inputs['end_date']);
        }

        $builder->select('reporting_authority, jurisdiction_name, tax_category, tax_rate, SUM(sale_tax_amount) AS tax');
--- a/app/Models/Sale.php
+++ b/app/Models/Sale.php
@@ -277,6 +277,14 @@ class Sale extends Model
            $builder->like('payment_type', lang('Sales.debit'));
        }

+        if ($filters['only_bank_transfer']) {
+            $builder->like('payment_type', lang('Sales.bank_transfer'));
+        }
+
+        if ($filters['only_wallet']) {
+            $builder->like('payment_type', lang('Sales.wallet'));
+        }
+
        $builder->groupBy('payment_type');

        $payments = $builder->get()->getResultArray();
@@ -1509,5 +1517,13 @@ class Sale extends Model
        if ($filters['only_check']) {
            $builder->like('payments.payment_type', lang('Sales.check'));
        }
+
+        if ($filters['only_bank_transfer']) {
+            $builder->like('payments.payment_type', lang('Sales.bank_transfer'));
+        }
+
+        if ($filters['only_wallet']) {
+            $builder->like('payments.payment_type', lang('Sales.wallet'));
+        }
    }
 }
--- a/app/Views/barcodes/barcode_sheet.php
+++ b/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><?= lang('Items.generate_barcodes') ?></title>
-        <link rel="stylesheet" href="<?= base_url() ?>css/barcode_font.css">
-        <style>
-            .barcode svg {
-                height: <?= $barcode_config['barcode_height'] ?>px;
-                width: <?= $barcode_config['barcode_width'] ?>px;
-            }
-        </style>
-    </head>
-    <body class=<?= 'font_' . $barcode_lib->get_font_name($barcode_config['barcode_font']) ?> style="font-size: <?= $barcode_config['barcode_font_size'] ?>px;">
-        <table style="border-spacing: <?= $barcode_config['barcode_page_cellspacing'] ?>; width: <?= $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>
--- a/app/Views/configs/barcode_config.php
+++ b/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',
--- a/app/Views/configs/email_config.php
+++ b/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',
--- a/app/Views/configs/info_config.php
+++ b/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',
--- a/app/Views/configs/manage.php
+++ b/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>
--- a/app/Views/configs/shortcuts_config.php
+++ b/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>
--- a/app/Views/configs/system_info.php
+++ b/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>
--- a/app/Views/configs/tax_config.php
+++ b/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',
--- a/app/Views/errors/html/debug.css
+++ b/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;
--- a/app/Views/login.php
+++ b/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 -->
--- a/app/Views/partial/header.php
+++ b/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 -->
--- a/app/Views/sales/help.php
+++ b/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>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ollama	e3c2175b04	feat: Add show_in_search language strings to all languages - Add 'show_in_search' and 'show_in_search_visibility' to all language files - Translated: de-DE, es-ES, fr, it - Placeholder English for remaining languages (awaiting translation) This ensures the SHOW_IN_SEARCH attribute flag works in all locales.	2026-05-16 21:02:34 +02:00
Ollama	2d93a96ac9	fix: Make item_sort_columns return format compatible with sanitizeSortColumn - sanitizeSortColumn expects nested array format [['col' => 'label'], ...] - Reuse item_headers() as base and add attribute columns - This maintains DRY principle by not redefining columns twice	2026-05-16 21:02:34 +02:00
Ollama	c681dc51ed	fix: Use typed column for attribute sorting (DECIMAL/DATE/TEXT) - When sorting by attribute column, determine the attribute type - Use attribute_decimal for DECIMAL type - Use attribute_date for DATE type - Use attribute_value for TEXT/DROPDOWN/CHECKBOX types - This ensures numeric and date attributes sort correctly instead of lexicographically Fixes CodeRabbit feedback on PR #4442.	2026-05-16 21:02:34 +02:00
Ollama	65568cf224	fix: Address remaining PR review comments - Update regex pattern to support multi-word attribute names (e.g., 'aspect ratio') - Rename $includeDeleted to $matchDeleted for clarity (matches deleted flag value) - Add check to skip attributes not in caller-provided definitionIds filter - Use Unicode pattern modifier 'u' for international character support in attribute names This addresses CodeRabbit's feedback on PR #4442.	2026-05-16 21:02:34 +02:00
Ollama	5cb4371344	fix: Address PR review comments - Rename methods to camelCase (PSR-12): parseAttributeSearch, searchByAttributes, searchByAttributeValue, getAttributeSortDefinitionId - Rename variables to camelCase (PSR-12) - Add DATE attribute search support in searchByAttributeValue - Fix get_definitions_by_flags to request typed payload (second param true) - Handle both array and string return shapes for definition info - Fix term-only search to merge with attribute matches instead of replacing - Use strict emptiness checks (=== '' instead of empty()) - Sanitize definition_ids before SQL interpolation (array_map intval) - Include DATE in attribute search conditions	2026-05-16 21:02:34 +02:00
Ollama	281f402b8e	style: Apply PSR-12 formatting - Fix PHPDoc comment format in item_sort_columns() helper - Remove duplicate blank line after properties in Item model - Remove unused variable assignment in Items controller	2026-05-16 21:02:34 +02:00
Ollama	c74fa7aeb5	Refactor: Use existing sanitizeSortColumn method with item_sort_columns helper - Add item_sort_columns() helper function in tabular_helper.php - Helper returns all sortable columns including dynamic attribute IDs - Remove duplicate sanitizeSortColumnAttribute method from Items controller - Remove unused ALLOWED_SORT_COLUMNS constant from Item model - Reuses existing sanitizeSortColumn method from Secure_Controller	2026-05-16 21:02:34 +02:00
Ollama	be01555a34	Refactor: Add ALLOWED_SORT_COLUMNS constant and reuse in sanitization - Add Item::ALLOWED_SORT_COLUMNS constant for allowed sort columns - Use constant in sanitizeSortColumnAttribute() instead of inline array - Enables reuse across the codebase for sort column validation	2026-05-16 21:02:34 +02:00
Ollama	abc381d35c	Implement Phase 3: Multi-attribute search AND logic and Phase 4: Sort by attribute columns Phase 3 - Multi-attribute Search: - Add parse_attribute_search() method to parse search syntax like 'color: blue size: large' or 'color:blue AND size:large' - Update search_by_attributes() to support AND/OR logic for multiple attribute queries - Add search_by_attribute_value() private method for single value search Phase 4 - Sort by Attribute Columns: - Add get_attribute_sort_definition_id() method to detect attribute column sorting - Update Item::search() to join attribute tables when sorting by attribute columns - Update tabular_helper to make attribute columns sortable - Add sanitizeSortColumnAttribute() method in Items controller to validate attribute definition IDs as sort columns Fixes #2722 - sorting by attribute columns now works	2026-05-16 21:02:34 +02:00
Ollama	cacd320206	Add SHOW_IN_SEARCH flag to separate attribute search from visibility Phase 2 implementation: - Add SHOW_IN_SEARCH constant (value 8) to Attribute model - Update Items controller to include searchable attributes when search_custom filter is enabled - Add language strings for the new visibility flag - Update Attributes controller to include new flag in form This allows attributes to be searchable even if they are not displayed in the items table, addressing issue #2919. Fixes #2919	2026-05-16 21:02:34 +02:00
Ollama	a7a52f800c	Refactor attribute search to fix pagination and multi-attribute search - Add new search_by_attributes() method that returns matching item_ids - Refactor search() method to use subquery approach instead of HAVING LIKE - Fix pagination count issue (#2819) - get_found_rows() now returns correct count - Enable combined search (attributes OR regular fields) - GROUP_CONCAT still used for display but removed from search/count logic - Fixes #2407 - multi-attribute search now works correctly Related: #2819, #2407, #2722, #2919	2026-05-16 21:02:34 +02:00
jekkos	2f51c4ef52	fix(security): SQL injection and path traversal vulnerabilities (#4539 ) Security fixes for two vulnerabilities: 1. SQL Injection in Summary Sales Taxes Report (GHSA-5j9m-2f98-cjqw) - Fixed unsanitized user input concatenation in getData() method - Applied proper escaping using $this->db->escape() for start_date/end_date - Consistent with existing _where() method implementation 2. Path Traversal in Receipt Template (GHSA-h6wm-fhw2-m3q3) - Added ALLOWED_RECEIPT_TEMPLATES whitelist constant - Added isValidReceiptTemplate() validation method - Validate receipt_template before saving in Config controller - Validate receipt_template before rendering in receipt view - Default to 'receipt_default' for invalid values - Consistent with invoice_type fix pattern (commit `31d25e06d`) Affected files: - app/Models/Reports/Summary_sales_taxes.php - app/Libraries/Sale_lib.php - app/Controllers/Config.php - app/Views/sales/receipt.php Co-authored-by: Ollama <ollama@steganos.dev>	2026-05-15 23:10:04 +02:00
jekkos	def0c27a0e	fix(security): Path traversal vulnerability in getPicThumb (#4545 ) Security impact: - Authenticated attackers could read arbitrary files on the server - Path traversal via unsanitized pic_filename parameter - Could read .env, config files, encryption keys Fix: - Apply basename() to strip directory components - Validate file extension to allowlist image types only - Add explicit error response for invalid file types CVE: Pending Affected: <= 3.4.2 Reported by: Kamran Saifullah (VulDB) Co-authored-by: Ollama <ollama@steganos.dev>	2026-05-15 22:04:29 +02:00
BhojKamal	90c981b6b7	feat: Bank transfer and wallet payment option added #4540 (#4547 ) --------- Co-authored-by: Lotussoft Youngtech <lotussoftyoungtech@gmail.com> Co-authored-by: objecttothis <17935339+objecttothis@users.noreply.github.com>	2026-05-15 20:50:34 +02:00
jekkos	6ff28d8a4d	docs: Update SECURITY.md with disclosure process (#4549 ) * docs: Update SECURITY.md with disclosure process and advisory template - Update published advisories table with CVE-2026-41306 and CVE-2026-41307 - Add disclosure process timeline - Add vulnerability template for researchers - Explain GitHub advisory creation workflow - Document security best practices for researchers This streamlines the vulnerability reporting process by allowing researchers to create draft advisories directly on GitHub, reducing triage overhead. * docs: Update SECURITY.md with CVE process and reporter acknowledgments - Add CVE request procedure through GitHub - Document that existing CVEs should be shared in reports - Clarify no bug bounty program (voluntary triage) - Add security best practices for researchers - Thank security researchers for contributions - Explain vulnerability template format * docs: Simplify SECURITY.md - remove CVE table, link to GitHub advisories --------- Co-authored-by: Ollama <ollama@steganos.dev>	2026-05-15 12:24:39 +02:00
jekkos	70fb347fc4	fix(docker): correct permissions and fix migration barcode_type error (#4546 ) * fix(ci): include hidden files in Docker build context actions/upload-artifact@v4 excludes hidden files (dotfiles) by default, causing .htaccess files to be missing from the Docker image. Add include-hidden-files: true to preserve .htaccess in the build artifact. * fix(docker): correct permissions and add barcode_type default - Set proper permissions (750) for writable/logs, writable/uploads, writable/cache, public/uploads, and public/uploads/item_pics - Set permissions (640) for writable/uploads/importCustomers.csv - Add barcode_type default value to prevent 'unknown key' error during initial migration when database is not yet initialized --------- Co-authored-by: Ollama <ollama@steganos.dev> Co-authored-by: objecttothis <17935339+objecttothis@users.noreply.github.com>	2026-05-13 20:55:59 +02:00
jekkos	2f5c0130f4	feat: add ALLOWED_HOSTNAMES environment variable support for Docker/Compose (#4544 ) Allow configuring allowed hostnames via ALLOWED_HOSTNAMES environment variable as an alternative to app.allowedHostnames in .env file. This is more convenient for Docker/Compose deployments where environment variables are set directly in compose files. The ALLOWED_HOSTNAMES variable takes precedence over app.allowedHostnames if both are set, allowing deployment-specific overrides. Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent) Co-authored-by: Ollama <ollama@steganos.dev> Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>	2026-05-13 09:03:32 +02:00
jekkos	fdd6a408ec	fix(ci): include hidden files in Docker build context (#4543 ) actions/upload-artifact@v4 excludes hidden files (dotfiles) by default, causing .htaccess files to be missing from the Docker image. Add include-hidden-files: true to preserve .htaccess in the build artifact. Co-authored-by: Ollama <ollama@steganos.dev>	2026-05-13 07:06:23 +02:00
BudsieBuds	ef91e6a9df	chore: sync project files to match upstream templates (#4537 ) - updated some files to match the official CodeIgniter 4 skeleton. - rebuilt package.json from a clean init and modernized metadata and formatting - rebuilt composer.json with modernized metadata and formatting - replaced code of conduct text with markdown - updated Dockerfile to replace deprecated instruction	2026-05-12 15:55:36 +02:00
dependabot[bot]	144e73eba6	chore(deps): bump minimatch from 3.1.2 to 3.1.5 (#4536 ) Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.1.2 to 3.1.5. - [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md) - [Commits](https://github.com/isaacs/minimatch/compare/v3.1.2...v3.1.5) --- updated-dependencies: - dependency-name: minimatch dependency-version: 3.1.5 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2026-05-08 16:49:39 +04:00
BudsieBuds	42ba39d290	chore: miscellaneous updates and improvements (#4530 ) - reinstated 'update-licenses' task in gulp (accidentally removed in `3e844f2f89`) - updated bootstrap, bootswatch, and various dev dependencies - refinded text across UI - applied consistency fixes - added 'number' and 'tel' input types to relevant settings - improved system info layout (still room for improvement, but better) - updated and fixed changelog	2026-05-08 09:07:52 +02:00
WShells	81213f0434	Assignable Keyboard Shortcuts Updates (#4532 ) * Add configurable sales shortcuts * Fix sales shortcut payment flow * Resolve shortcut keys review comment * Sanitize shortcut config notifications * Clarify keyboard shortcut configuration labels --------- Co-authored-by: WShells <26513147+WShells@users.noreply.github.com>	2026-05-07 22:53:25 +04:00
khao_lek	7edefe8ee1	Translated using Weblate (Thai) Currently translated at 100.0% (15 of 15 strings) Translation: opensourcepos/login Translate-URL: https://translate.opensourcepos.org/projects/opensourcepos/login/th/	2026-04-28 10:06:38 +02:00
khao_lek	68e14191f9	Translated using Weblate (Thai) Currently translated at 100.0% (8 of 8 strings) Translation: opensourcepos/bootstrap_tables Translate-URL: https://translate.opensourcepos.org/projects/opensourcepos/bootstrap_tables/th/	2026-04-28 10:05:06 +02:00
khao_lek	a381c3ca54	Translated using Weblate (Thai) Currently translated at 99.5% (227 of 228 strings) Translation: opensourcepos/sales Translate-URL: https://translate.opensourcepos.org/projects/opensourcepos/sales/th/	2026-04-28 10:05:06 +02:00
enricodelarosa	058e12244e	fix(home): improve internal data type handling for user identification in auth process	2026-04-28 09:56:56 +02:00
jekkos	f1c6fe2981	fix: Catch mysqli_sql_exception in DB fallback handlers for fresh Docker installs (#4525 ) * fix: Catch mysqli_sql_exception in DB fallback handlers for fresh Docker installs On a fresh Docker install with an empty database, the ospos_sessions table doesn't exist yet. The CSRF filter triggers session initialization before the login/migration page can be reached. The existing code in Session.php, OSPOS.php, and MY_Migration.php catches DatabaseException, but the MySQLi driver throws mysqli_sql_exception (which extends RuntimeException, not DatabaseException) when the table doesn't exist. This causes an unhandled exception resulting in HTTP 500. Fix: Change all three catch blocks from to so that mysqli_sql_exception and any other unexpected database errors are caught, allowing the app to fall back gracefully: - Session.php: Falls back to FileHandler so sessions work without DB - OSPOS.php: Falls back to empty settings so config loads work - MY_Migration.php: Falls back to version 0 / false so the migration check passes gracefully This allows the login page with migration UI to be served on first access, so the initial schema migration can run. Fixes #4524 --------- Co-authored-by: Ollama <ollama@steganos.dev>	2026-04-22 21:13:52 +02:00
jekkos	ff7a8d2e88	fix: Update calendar translations (#4498 ) - Fix typo 'mayl' to 'may' in Calendar.php for lo, ka, ml, nb locales - Improve Spanish translation in Items.php for csv_import_invalid_location - Add trailing newlines to Calendar.php files (ka, ml, nb, lo) per PSR-12 Co-authored-by: Ollama <ollama@steganos.dev>	2026-04-20 06:48:57 +00:00
jekkos	e602eddb47	fix: Scope orWhere clauses in Item::exists() and Item::get_item_id() (#4520 ) In PR #4250 (commit `29c3c55`), orWhere was added to match items by either item_id or item_number, but the OR condition was not wrapped in groupStart()/groupEnd(). This causes: 1. Wrong SQL semantics: generates WHERE item_id = ? OR item_number = ? AND deleted = 0 instead of WHERE (item_id = ? OR item_number = ?) AND deleted = 0 Due to AND binding tighter than OR, the deleted filter only applies to the item_number branch, allowing deleted items to match via item_id. 2. Performance: the unscoped OR causes MySQL to bypass the item_id primary key index and fall back to full table scans when item_number is a string column compared against a numeric parameter. Both exists() and get_item_id() are fixed by wrapping the OR conditions in groupStart()/groupEnd() for proper parenthesization. Co-authored-by: Ollama <ollama@steganos.dev>	2026-04-20 06:22:42 +00:00
jekkos	0a313aa09d	fix: Language dropdown not displaying saved language correctly (#4518 ) Root cause: In commit `7f9321eca`, the refactoring incorrectly used object notation ($config->language_code) on an array instead of array notation ($config['language_code']). The settings property in OSPOS config is an array, so: - $config->language_code returns null (object access on array) - $config['language_code'] returns the actual value This caused both functions to always fall back to defaults, making the language dropdown show incorrect values. Fix: Change both functions to use array notation: - Line 25: $config['language_code'] (returns saved language code) - Line 46: $config['language'] (returns saved language name) Also fixed the wrong DEFAULT_LANGUAGE_CODE fallback on line 46 - should be DEFAULT_LANGUAGE since current_language() returns a name not a code. Fixes #4517 Co-authored-by: Ollama <ollama@steganos.dev>	2026-04-19 22:06:11 +02:00
jekkos	12e3c7e31f	fix: Add missing $img_tag variable in Sales::getSendPdf() (#4515 ) * fix: Add missing $img_tag variable in Sales::getSendPdf() The receipt_email.php view expects $img_tag but getSendPdf() wasn't passing it. This caused 'Undefined variable $img_tag' error when sending receipt emails. Closes #4514 * refactor: Extract img_tag building into helper method Refactored duplicate img_tag building code into _build_img_tag helper method. Both getSendPdf and getSendReceipt now use this shared method. * refactor: Move logo-related methods to Email_lib Moved buildLogoImgTag and getLogoMimeType methods to Email_lib library where they logically belong alongside email-related functionality. This removes duplicate code and centralizes email-related helpers. Sales controller now uses email_lib->buildLogoImgTag() and email_lib->getLogoMimeType() instead of private methods. * fix: Address CodeRabbit review comments - buildLogoImgTag now uses getLogoMimeType for actual MIME type instead of hardcoding image/png - getLogoMimeType returns empty string instead of false for consistency - Consolidated logo path/exists check logic between both methods --------- Co-authored-by: Ollama <ollama@steganos.dev>	2026-04-17 21:02:45 +00:00
jekkos	de62e9f3bd	Fix CRC currency reverting to EUR/LAK in locale config (#4511 ) Root cause: In postCheckNumberLocale(), when number_locale differed from save_number_locale (which happens during form typing/validation), the code ignored user-provided currency values and always used locale defaults. For example: - User sets currency_code to "CRC" (Costa Rica Colon) - checkNumberLocale is called with save_number_locale from hidden field - If locale values don't match, original code overwrites with locale defaults - This caused CRC to revert to the default currency for that locale (EUR, LAK, etc.) Fix: Always respect user-provided currency_symbol and currency_code values when they are non-empty, regardless of whether locale changed or not. Fixes #4494 Co-authored-by: Ollama <ollama@steganos.dev>	2026-04-17 17:53:46 +00:00
jekkos	97ca738b2d	fix: Escape dynamic output and fix CSS property in barcode_sheet.php (#4501 ) - Add esc() for dynamic output in HTML attributes and URLs - Cast numeric values to int for CSS properties - Fix invalid 'borderspacing' CSS property to 'border-spacing' - Add quotes around class attribute Closes #4487 Co-authored-by: Ollama <ollama@steganos.dev>	2026-04-16 19:37:06 +00:00
jekkos	c714dd6f68	fix: propagate attribute definition failures in postSaveGeneral() (#4509 ) - Wrap attribute definition and appconfig save in single transaction - Capture return values from saveDefinition() and deleteDefinition() - Only call batch_save() if attribute operation succeeds - Combine success status with transStatus() for atomic result - Prevents category_dropdown config persistence when attribute fails Fixes #4461 Co-authored-by: Ollama <ollama@steganos.dev>	2026-04-16 19:14:50 +00:00
dependabot[bot]	b6f28da058	Bump dompurify from 3.3.2 to 3.4.0 (#4512 ) Bumps [dompurify](https://github.com/cure53/DOMPurify) from 3.3.2 to 3.4.0. - [Release notes](https://github.com/cure53/DOMPurify/releases) - [Commits](https://github.com/cure53/DOMPurify/compare/3.3.2...3.4.0) --- updated-dependencies: - dependency-name: dompurify dependency-version: 3.4.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2026-04-16 14:14:29 +04:00