fix: Pin nesbot/carbon to ^2.72 for PHP 8.2 compatibility

The num-num/ubl-invoice package allows Carbon 2.x or 3.x, but Carbon 3.x
pulls in Symfony 8.x components that require PHP 8.4+. Pinning Carbon to
2.x ensures compatibility with OSPOS's PHP 8.2 requirement.

.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'
 #

.github/workflows/build-release.yml

@@ -123,6 +123,7 @@ jobs:
             .
             !.git
             !node_modules
+          include-hidden-files: true
           retention-days: 1
 
   docker:

CHANGELOG.md

@@ -1,5 +1,4 @@
-[unreleased]: https://github.com/opensourcepos/opensourcepos/compare/3.4.0...HEAD
-[3.4.2]: https://github.com/opensourcepos/opensourcepos/compare/3.4.1...3.4.2
+[unreleased]: https://github.com/opensourcepos/opensourcepos/compare/3.4.1...HEAD
 [3.4.1]: https://github.com/opensourcepos/opensourcepos/compare/3.4.0...3.4.1
 [3.4.0]: https://github.com/opensourcepos/opensourcepos/compare/3.3.9...3.4.0
 [3.3.9]: https://github.com/opensourcepos/opensourcepos/compare/3.3.8...3.3.9
@@ -34,10 +33,36 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
-## [3.4.0] - 2025-02-06
+## [3.4.1] - 2025-06-05
+- Feature: PSR-12 Compliant Indentation by @objecttothis in ([#4196](https://github.com/opensourcepos/opensourcepos/pull/4196))
+- Add .env to dist zip by @jekkos in ([#4199](https://github.com/opensourcepos/opensourcepos/pull/4199))
+- Add CI4 coding standards linter ([#3708](https://github.com/opensourcepos/opensourcepos/issues/3708)) by @jekkos in ([#4198](https://github.com/opensourcepos/opensourcepos/pull/4198))
+- Bump canvg from 3.0.10 to 3.0.11 by @dependabot in ([#4189](https://github.com/opensourcepos/opensourcepos/pull/4189))
+- Bump jspdf and jspdf-autotable by @dependabot in ([#4190](https://github.com/opensourcepos/opensourcepos/pull/4190))
+- Feature bump ci to 4.6.0 by @objecttothis in ([#4197](https://github.com/opensourcepos/opensourcepos/pull/4197))
+- Add Kurdish language option to UI by @BudsieBuds in ([#4210](https://github.com/opensourcepos/opensourcepos/pull/4210))
+- Convert language ku to ckb by @BudsieBuds in ([#4211](https://github.com/opensourcepos/opensourcepos/pull/4211))
+- Fix PHP 8.4 errors by @BudsieBuds in ([#4215](https://github.com/opensourcepos/opensourcepos/pull/4215))
+- Add default bootstrap to themes by @BudsieBuds in ([#4219](https://github.com/opensourcepos/opensourcepos/pull/4219))
+- Update language names by @BudsieBuds in ([#4218](https://github.com/opensourcepos/opensourcepos/pull/4218))
+- Update install docs by @BudsieBuds in ([#4217](https://github.com/opensourcepos/opensourcepos/pull/4217))
+- Convert menu icons to SVG by @BudsieBuds in ([#4220](https://github.com/opensourcepos/opensourcepos/pull/4220))
+- Enhance license handling by @BudsieBuds in ([#4223](https://github.com/opensourcepos/opensourcepos/pull/4223))
+- Fix datetime rendering ([#4226](https://github.com/opensourcepos/opensourcepos/issues/4226)) by @jekkos in ([#4227](https://github.com/opensourcepos/opensourcepos/pull/4227))
+- Fix datetime rendering by @jekkos in ([#4228](https://github.com/opensourcepos/opensourcepos/pull/4228))
+- Fix null error when sending by email a receipt of a sale that has no invoice by @diego-ramos in ([#4229](https://github.com/opensourcepos/opensourcepos/pull/4229))
+- Update Receivings.php to save form. by @odiea in ([#4231](https://github.com/opensourcepos/opensourcepos/pull/4231))
+- Update Cashups.php for ajax cashup total to work. by @odiea in ([#4238](https://github.com/opensourcepos/opensourcepos/pull/4238))
+- Coding style updates for PSR-12 compliance & improved readability by @BudsieBuds in ([#4204](https://github.com/opensourcepos/opensourcepos/pull/4204))
+- Fix Codeigniter disallowed characters error with payment types that have accents by @diego-ramos in ([#4232](https://github.com/opensourcepos/opensourcepos/pull/4232))
+- Fixed broken escape string for success & warning messages by @Franchovy in ([#4253](https://github.com/opensourcepos/opensourcepos/pull/4253))
+- Bugfix constraint migration fix by @objecttothis in ([#4230](https://github.com/opensourcepos/opensourcepos/pull/4230))
+- Fix item number lookup in sales/receivings ([#4212](https://github.com/opensourcepos/opensourcepos/issues/4212)) by @jekkos in ([#4250](https://github.com/opensourcepos/opensourcepos/pull/4250))
+
+## [3.4.0] - 2025-03-23
 
 - Translation updates (Spanish, Indonesian, Swedish, Urdu, Chinese, Thai, French, Dutch)
-- PHP 8.x support
+- PHP `8.x` support
 - Security fixes (XSS, SQLi)
 - Migration to Gulp as buildsystem
 - Decimal validation fix

CODE_OF_CONDUCT.md

@@ -1,98 +1,85 @@
-Contributor Covenant Code of Conduct
-Our Pledge
-We as members, contributors, and leaders pledge to make participation in our
-community a harassment-free experience for everyone, regardless of age, body
-size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, caste, color, religion, or sexual
-identity and orientation.
-We pledge to act and interact in ways that contribute to an open, welcoming,
-diverse, inclusive, and healthy community.
-Our Standards
-Examples of behavior that contributes to a positive environment for our
-community include:
+[comment]: # (Contributor Covenant 2.1 - from https://www.contributor-covenant.org/version/2/1/code_of_conduct/code_of_conduct.md)
+
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, caste, color, religion, or sexual identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our community include:
 
 * Demonstrating empathy and kindness toward other people
 * Being respectful of differing opinions, viewpoints, and experiences
 * Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
-and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the overall
-community
+* Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall community
 
 Examples of unacceptable behavior include:
 
-* The use of sexualized language or imagery, and sexual attention or advances of
-any kind
+* The use of sexualized language or imagery, and sexual attention or advances of any kind
 * Trolling, insulting or derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing others’ private information, such as a physical or email address,
-without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-professional setting
+* Publishing others' private information, such as a physical or email address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
 
-Enforcement Responsibilities
-Community leaders are responsible for clarifying and enforcing our standards of
-acceptable behavior and will take appropriate and fair corrective action in
-response to any behavior that they deem inappropriate, threatening, offensive,
-or harmful.
-Community leaders have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, and will communicate reasons for moderation
-decisions when appropriate.
-Scope
-This Code of Conduct applies within all community spaces, and also applies when
-an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official email address,
-posting via an official social media account, or acting as an appointed
-representative at an online or offline event.
-Enforcement
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at
-[INSERT CONTACT METHOD].
-All complaints will be reviewed and investigated promptly and fairly.
-All community leaders are obligated to respect the privacy and security of the
-reporter of any incident.
-Enforcement Guidelines
-Community leaders will follow these Community Impact Guidelines in determining
-the consequences for any action they deem in violation of this Code of Conduct:
-1. Correction
-Community Impact: Use of inappropriate language or other behavior deemed
-unprofessional or unwelcome in the community.
-Consequence: A private, written warning from community leaders, providing
-clarity around the nature of the violation and an explanation of why the
-behavior was inappropriate. A public apology may be requested.
-2. Warning
-Community Impact: A violation through a single incident or series of
-actions.
-Consequence: A warning with consequences for continued behavior. No
-interaction with the people involved, including unsolicited interaction with
-those enforcing the Code of Conduct, for a specified period of time. This
-includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or permanent
-ban.
-3. Temporary Ban
-Community Impact: A serious violation of community standards, including
-sustained inappropriate behavior.
-Consequence: A temporary ban from any sort of interaction or public
-communication with the community for a specified period of time. No public or
-private interaction with the people involved, including unsolicited interaction
-with those enforcing the Code of Conduct, is allowed during this period.
-Violating these terms may lead to a permanent ban.
-4. Permanent Ban
-Community Impact: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior, harassment of an
-individual, or aggression toward or disparagement of classes of individuals.
-Consequence: A permanent ban from any sort of public interaction within the
-community.
-Attribution
-This Code of Conduct is adapted from the Contributor Covenant,
-version 2.1, available at
-https://www.contributor-covenant.org/version/2/1/code_of_conduct.html.
-Community Impact Guidelines were inspired by
-Mozilla’s code of conduct enforcement ladder.
-For answers to common questions about this code of conduct, see the FAQ at
-https://www.contributor-covenant.org/faq. Translations are available at
-https://www.contributor-covenant.org/translations.
+## Enforcement Responsibilities
 
+Community leaders are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, or harmful.
 
+Community leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for moderation decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing the community in public spaces. Examples of representing our community include using an official e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at [INSERT CONTACT METHOD]. All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding interactions in community spaces as well as external channels like social media. Violating these terms may lead to a temporary or permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior, harassment of an individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 2.1, available at [https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct enforcement ladder][Mozilla CoC].
+
+For answers to common questions about this code of conduct, see the FAQ at [https://www.contributor-covenant.org/faq][FAQ]. Translations are available at [https://www.contributor-covenant.org/translations][translations].
+
+[homepage]: https://www.contributor-covenant.org
+[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
+[Mozilla CoC]: https://github.com/mozilla/diversity
+[FAQ]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations

Dockerfile

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

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

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;
 

app/Config/Mimes.php

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

app/Config/OSPOS.php

@@ -5,7 +5,6 @@ namespace Config;
 use App\Models\Appconfig;
 use CodeIgniter\Cache\CacheInterface;
 use CodeIgniter\Config\BaseConfig;
-use CodeIgniter\Database\Exceptions\DatabaseException;
 
 /**
  * This class holds the configuration options stored from the database so that on launch those settings can be cached
@@ -41,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'
                 ];
             }
         }

app/Config/Session.php

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

app/Controllers/BaseController.php

@@ -28,12 +28,9 @@ abstract class BaseController extends Controller
     // protected $session;
 
     /**
-     * @param RequestInterface $request
-     * @param ResponseInterface $response
-     * @param LoggerInterface $logger
      * @return void
      */
-    public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger): void
+    public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger)
     {
         // Load here all helpers you want to be available in your controllers that extend BaseController.
         // Caution: Do not put the this below the parent::initController() call below.

app/Controllers/Config.php

@@ -82,7 +82,7 @@ class Config extends Secure_Controller
         $npmDev = false;
         $license = [];
 
-        $license[$i]['title'] = 'Open Source Point Of Sale ' . config('App')->application_version;
+        $license[$i]['title'] = 'Open Source Point of Sale ' . config('App')->application_version;
 
         if (file_exists('license/LICENSE')) {
             $license[$i]['text'] = file_get_contents('license/LICENSE', false, null, 0, 3000);
@@ -221,6 +221,7 @@ class Config extends Secure_Controller
      */
     public function getIndex(): string
     {
+        $data['config'] = $this->config;
         $data['stock_locations'] = $this->stock_location->get_all()->getResultArray();
         $data['dinner_tables'] = $this->dinner_table->get_all()->getResultArray();
         $data['customer_rewards'] = $this->customer_rewards->get_all()->getResultArray();
@@ -231,6 +232,8 @@ class Config extends Secure_Controller
         $data['line_sequence_options'] = $this->sale_lib->get_line_sequence_options();
         $data['register_mode_options'] = $this->sale_lib->get_register_mode_options();
         $data['invoice_type_options'] = $this->sale_lib->get_invoice_type_options();
+        $data['keyboardShortcutOptions'] = $this->sale_lib->getKeyShortcutsOptions();
+        $data['keyboardShortcuts'] = $this->sale_lib->getKeyShortcuts();
         $data['rounding_options'] = rounding_mode::get_rounding_options();
         $data['tax_code_options'] = $this->tax_lib->get_tax_code_options();
         $data['tax_category_options'] = $this->tax_lib->get_tax_category_options();
@@ -921,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'),
@@ -946,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.
      *

app/Controllers/Home.php

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

app/Controllers/Items.php

@@ -154,8 +154,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);
 
@@ -1040,14 +1055,20 @@ class Items extends Secure_Controller
                         });
 
                         if (!$isFailedRow && $this->item->save_value($itemData, $itemId)) {
-                            $this->save_tax_data($row, $itemData);
-                            $this->save_inventory_quantities($row, $itemData, $allowedStockLocations, $employeeId);
+                            if (!$this->save_tax_data($row, $itemData)) {
+                                $isFailedRow = true;
+                            }
+                            if (!$this->save_inventory_quantities($row, $itemData, $allowedStockLocations, $employeeId)) {
+                                $isFailedRow = true;
+                            }
                             $csvAttributeValues = $this->extractAttributeData($row);
-                            $isFailedRow = !$this->attribute->saveCSVRowAttributeData($csvAttributeValues, $itemData, $attributeData);
+                            if (!$this->attribute->saveCSVRowAttributeData($csvAttributeValues, $itemData, $attributeData)) {
+                                $isFailedRow = true;
+                            }
                             if ($isFailedRow) {
                                 $failedRow = $key + 2;
                                 $failCodes[] = $failedRow;
-                                log_message('error', "CSV Item import failed on line $failedRow while saving attributes.");
+                                log_message('error', "CSV Item import failed on line $failedRow while saving item.");
                                 continue;
                             }
 
@@ -1237,13 +1258,15 @@ class Items extends Secure_Controller
      * @param array $item_data
      * @param array $allowed_locations
      * @param int $employee_id
+     * @return bool Returns true on success, false on failure
      * @throws ReflectionException
      */
-    private function save_inventory_quantities(array $row, array $item_data, array $allowed_locations, int $employee_id): void
+    private function save_inventory_quantities(array $row, array $item_data, array $allowed_locations, int $employee_id): bool
     {
         // Quantities & Inventory Section
         $comment = lang('Items.inventory_CSV_import_quantity');
         $is_update = (bool)$row['Id'];
+        $success = true;
 
         foreach ($allowed_locations as $location_id => $location_name) {
             $item_quantity_data = ['item_id' => $item_data['item_id'], 'location_id' => $location_id];
@@ -1257,20 +1280,22 @@ class Items extends Secure_Controller
 
             if (!empty($row["location_$location_name"]) || $row["location_$location_name"] === '0') {
                 $item_quantity_data['quantity'] = $row["location_$location_name"];
-                $this->item_quantity->save_value($item_quantity_data, $item_data['item_id'], $location_id);
+                $success &= $this->item_quantity->save_value($item_quantity_data, $item_data['item_id'], $location_id);
 
                 $csv_data['trans_inventory'] = $row["location_$location_name"];
-                $this->inventory->insert($csv_data, false);
+                $success &= (bool)$this->inventory->insert($csv_data, false);
             } elseif ($is_update) {
-                return;
+                continue;
             } else {
                 $item_quantity_data['quantity'] = 0;
-                $this->item_quantity->save_value($item_quantity_data, $item_data['item_id'], $location_id);
+                $success &= $this->item_quantity->save_value($item_quantity_data, $item_data['item_id'], $location_id);
 
                 $csv_data['trans_inventory'] = 0;
-                $this->inventory->insert($csv_data, false);
+                $success &= (bool)$this->inventory->insert($csv_data, false);
             }
         }
+
+        return (bool)$success;
     }
 
     /**
@@ -1278,8 +1303,9 @@ class Items extends Secure_Controller
      *
      * @param array $row
      * @param array $item_data
+     * @return bool Returns true on success, false on failure
      */
-    private function save_tax_data(array $row, array $item_data): void
+    private function save_tax_data(array $row, array $item_data): bool
     {
         $items_taxes_data = [];
 
@@ -1291,9 +1317,11 @@ class Items extends Secure_Controller
             $items_taxes_data[] = ['name' => $row['Tax 2 Name'], 'percent' => $row['Tax 2 Percent']];
         }
 
-        if (isset($items_taxes_data)) {
-            $this->item_taxes->save_value($items_taxes_data, $item_data['item_id']);
+        if (!empty($items_taxes_data)) {
+            return $this->item_taxes->save_value($items_taxes_data, $item_data['item_id']);
         }
+
+        return true;
     }
 
     /**

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

app/Database/Dockerfile

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

app/Database/Migrations/20260304000000_AddUBLConfig.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class AddUBLConfig extends Migration
+{
+    public function up(): void
+    {
+        log_message('info', 'Adding UBL configuration.');
+
+        $config_values = [
+            ['key' => 'invoice_format', 'value' => 'pdf_only'],
+        ];
+
+        $this->db->table('app_config')->ignore(true)->insertBatch($config_values);
+    }
+
+    public function down(): void
+    {
+        $this->db->table('app_config')->whereIn('key', ['invoice_format'])->delete();
+    }
+}

app/Database/Migrations/20260506000000_AddShortcutKeys.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class AddShortcutKeys extends Migration
+{
+    public function up(): void
+    {
+        $shortcutValues = [
+            ['key' => 'key_cancel', 'value' => '27 | ESC'],
+            ['key' => 'key_items', 'value' => '49 | ALT + 1'],
+            ['key' => 'key_customers', 'value' => '50 | ALT + 2'],
+            ['key' => 'key_suspend', 'value' => '51 | ALT + 3'],
+            ['key' => 'key_suspended', 'value' => '52 | ALT + 4'],
+            ['key' => 'key_amount', 'value' => '53 | ALT + 5'],
+            ['key' => 'key_payment', 'value' => '54 | ALT + 6'],
+            ['key' => 'key_complete', 'value' => '55 | ALT + 7'],
+            ['key' => 'key_finish', 'value' => '56 | ALT + 8'],
+            ['key' => 'key_help', 'value' => '57 | ALT + 9'],
+        ];
+
+        $this->db->table('app_config')->ignore(true)->insertBatch($shortcutValues);
+    }
+
+    public function down(): void
+    {
+        $shortcutKeys = [
+            'key_cancel',
+            'key_items',
+            'key_customers',
+            'key_suspend',
+            'key_suspended',
+            'key_amount',
+            'key_payment',
+            'key_complete',
+            'key_finish',
+            'key_help',
+        ];
+
+        $this->db->table('app_config')
+            ->whereIn('key', $shortcutKeys)
+            ->delete();
+    }
+}

app/Helpers/country_helper.php

@@ -0,0 +1,229 @@
+<?php
+
+use Config\OSPOS;
+
+/**
+ * Country code helper for mapping country names to ISO 3166-1 alpha-2 codes
+ */
+if (!function_exists('getCountryCode')) {
+    /**
+     * Convert country name to ISO 3166-1 alpha-2 code
+     * 
+     * @param string $countryName Country name (full name in English)
+     * @return string ISO 3166-1 alpha-2 code, or 'BE' as default for Belgium
+     */
+    function getCountryCode(string $countryName): string
+    {
+        if (empty($countryName)) {
+            return 'BE'; // Default to Belgium
+        }
+
+        $countryMap = [
+            // Major countries
+            'Belgium' => 'BE',
+            'Belgique' => 'BE',
+            'België' => 'BE',
+            'United States' => 'US',
+            'USA' => 'US',
+            'United States of America' => 'US',
+            'United Kingdom' => 'GB',
+            'UK' => 'GB',
+            'Great Britain' => 'GB',
+            'France' => 'FR',
+            'Germany' => 'DE',
+            'Deutschland' => 'DE',
+            'Netherlands' => 'NL',
+            'The Netherlands' => 'NL',
+            'Nederland' => 'NL',
+            'Italy' => 'IT',
+            'Italia' => 'IT',
+            'Spain' => 'ES',
+            'España' => 'ES',
+            'Poland' => 'PL',
+            'Polska' => 'PL',
+            'Portugal' => 'PT',
+            'Sweden' => 'SE',
+            'Sverige' => 'SE',
+            'Norway' => 'NO',
+            'Norge' => 'NO',
+            'Denmark' => 'DK',
+            'Danmark' => 'DK',
+            'Finland' => 'FI',
+            'Suomi' => 'FI',
+            'Switzerland' => 'CH',
+            'Suisse' => 'CH',
+            'Schweiz' => 'CH',
+            'Austria' => 'AT',
+            'Österreich' => 'AT',
+            'Ireland' => 'IE',
+            'Luxembourg' => 'LU',
+            'Greece' => 'GR',
+            'Czech Republic' => 'CZ',
+            'Czechia' => 'CZ',
+            'Hungary' => 'HU',
+            'Romania' => 'RO',
+            'Bulgaria' => 'BG',
+            'Slovakia' => 'SK',
+            'Slovenia' => 'SI',
+            'Estonia' => 'EE',
+            'Latvia' => 'LV',
+            'Lithuania' => 'LT',
+            'Croatia' => 'HR',
+            'Serbia' => 'RS',
+            'Montenegro' => 'ME',
+            'Bosnia and Herzegovina' => 'BA',
+            'North Macedonia' => 'MK',
+            'Albania' => 'AL',
+            'Kosovo' => 'XK',
+            'Turkey' => 'TR',
+            'Türkiye' => 'TR',
+            'Russia' => 'RU',
+            'Russian Federation' => 'RU',
+            'Ukraine' => 'UA',
+            'Belarus' => 'BY',
+            'Moldova' => 'MD',
+            'Georgia' => 'GE',
+            'Armenia' => 'AM',
+            'Azerbaijan' => 'AZ',
+            'Kazakhstan' => 'KZ',
+            'Uzbekistan' => 'UZ',
+            
+            // Other major economies
+            'China' => 'CN',
+            'Japan' => 'JP',
+            'South Korea' => 'KR',
+            'Korea' => 'KR',
+            'India' => 'IN',
+            'Australia' => 'AU',
+            'New Zealand' => 'NZ',
+            'Canada' => 'CA',
+            'Mexico' => 'MX',
+            'Brazil' => 'BR',
+            'Argentina' => 'AR',
+            'Chile' => 'CL',
+            'Colombia' => 'CO',
+            'Peru' => 'PE',
+            'South Africa' => 'ZA',
+            'Egypt' => 'EG',
+            'Nigeria' => 'NG',
+            'Kenya' => 'KE',
+            'Morocco' => 'MA',
+            
+            // If already ISO code, return as-is
+            'BE' => 'BE',
+            'US' => 'US',
+            'GB' => 'GB',
+            'FR' => 'FR',
+            'DE' => 'DE',
+            'NL' => 'NL',
+            'IT' => 'IT',
+            'ES' => 'ES',
+            'PT' => 'PT',
+            'SE' => 'SE',
+            'NO' => 'NO',
+            'DK' => 'DK',
+            'FI' => 'FI',
+            'CH' => 'CH',
+            'AT' => 'AT',
+            'IE' => 'IE',
+            'LU' => 'LU',
+            'GR' => 'GR',
+            'CZ' => 'CZ',
+            'HU' => 'HU',
+            'RO' => 'RO',
+            'BG' => 'BG',
+            'SK' => 'SK',
+            'SI' => 'SI',
+            'EE' => 'EE',
+            'LV' => 'LV',
+            'LT' => 'LT',
+            'HR' => 'HR',
+            'RS' => 'RS',
+            'ME' => 'ME',
+            'BA' => 'BA',
+            'MK' => 'MK',
+            'AL' => 'AL',
+            'TR' => 'TR',
+            'RU' => 'RU',
+            'UA' => 'UA',
+        ];
+
+        // Try exact match first
+        $normalized = trim($countryName);
+        if (isset($countryMap[$normalized])) {
+            return $countryMap[$normalized];
+        }
+
+        // Try case-insensitive match
+        $normalizedLower = strtolower($normalized);
+        foreach ($countryMap as $key => $code) {
+            if (strtolower($key) === $normalizedLower) {
+                return $code;
+            }
+        }
+
+        // Try partial match (e.g., "United States" → "US")
+        foreach ($countryMap as $key => $code) {
+            if (stripos($key, $normalized) !== false || stripos($normalized, $key) !== false) {
+                return $code;
+            }
+        }
+
+        // Try matching ISO code directly
+        if (preg_match('/^[A-Z]{2}$/i', $normalized)) {
+            return strtoupper($normalized);
+        }
+
+        // Check if the country_codes config has a default
+        $config = config(OSPOS::class)->settings;
+        if (isset($config['country_codes']) && !empty($config['country_codes'])) {
+            $countries = explode(',', $config['country_codes']);
+            if (!empty($countries)) {
+                return strtoupper(trim($countries[0]));
+            }
+        }
+
+        // Default to Belgium (for Peppol compliance in Belgium)
+        return 'BE';
+    }
+}
+
+if (!function_exists('getCurrencyCode')) {
+    /**
+     * Get ISO 4217 currency code for a country
+     * 
+     * @param string $countryCode ISO 3166-1 alpha-2 country code
+     * @return string ISO 4217 currency code
+     */
+    function getCurrencyCode(string $countryCode): string
+    {
+        $currencyMap = [
+            'BE' => 'EUR',
+            'FR' => 'EUR',
+            'DE' => 'EUR',
+            'NL' => 'EUR',
+            'IT' => 'EUR',
+            'ES' => 'EUR',
+            'PT' => 'EUR',
+            'IE' => 'EUR',
+            'AT' => 'EUR',
+            'LU' => 'EUR',
+            'FI' => 'EUR',
+            'GR' => 'EUR',
+            'US' => 'USD',
+            'GB' => 'GBP',
+            'CH' => 'CHF',
+            'JP' => 'JPY',
+            'CN' => 'CNY',
+            'CA' => 'CAD',
+            'AU' => 'AUD',
+            'NZ' => 'NZD',
+            'IN' => 'INR',
+            'BR' => 'BRL',
+            'MX' => 'MXN',
+            'ZA' => 'ZAR',
+        ];
+
+        return $currencyMap[$countryCode] ?? 'EUR'; // Default to EUR
+    }
+}

app/Helpers/locale_helper.php

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

app/Helpers/tabular_helper.php

@@ -85,6 +85,7 @@ function get_sales_manage_table_headers(): string
     if ($config['invoice_enable']) {
         $headers[] = ['invoice_number' => lang('Sales.invoice_number')];
         $headers[] = ['invoice' => '', 'sortable' => false, 'escape' => false];
+        $headers[] = ['ubl' => '', 'sortable' => false, 'escape' => false];
     }
 
     $headers[] = ['receipt' => '', 'sortable' => false, 'escape' => false];
@@ -121,6 +122,13 @@ function get_sale_data_row(object $sale): array
                 '<span class="glyphicon glyphicon-list-alt"></span>',
                 ['title' => lang('Sales.show_invoice')]
             );
+        $row['ubl'] = empty($sale->invoice_number)
+            ? '-'
+            : anchor(
+                "$controller/ublInvoice/$sale->sale_id",
+                '<span class="glyphicon glyphicon-download"></span>',
+                ['title' => lang('Sales.download_ubl'), 'target' => '_blank']
+            );
     }
 
     $row['receipt'] = anchor(

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

app/Language/en/Config.php

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

app/Language/en/Sales.php

@@ -1,232 +1,237 @@
 <?php
 
 return [
-    "customers_available_points"       => "Points Available",
-    "rewards_package"                  => "Rewards",
-    "rewards_remaining_balance"        => "Reward Points remaining value is ",
-    "account_number"                   => "Account #",
-    "add_payment"                      => "Add Payment",
-    "amount_due"                       => "Amount Due",
-    "amount_tendered"                  => "Amount Tendered",
-    "authorized_signature"             => "Authorized Signature",
-    "cancel_sale"                      => "Cancel",
-    "cash"                             => "Cash",
-    "cash_1"                           => "",
-    "cash_2"                           => "",
-    "cash_3"                           => "",
-    "cash_4"                           => "",
-    "cash_adjustment"                  => "Cash Adjustment",
-    "cash_deposit"                     => "Cash Deposit",
-    "cash_filter"                      => "Cash",
-    "change_due"                       => "Change Due",
-    "change_price"                     => "Change Selling Price",
-    "check"                            => "Check",
-    "check_balance"                    => "Check remainder",
-    "check_filter"                     => "Check",
-    "close"                            => "",
-    "comment"                          => "Comment",
-    "comments"                         => "Comments",
-    "company_name"                     => "",
-    "complete"                         => "",
-    "complete_sale"                    => "Complete",
-    "confirm_cancel_sale"              => "Are you sure you want to clear this sale? All items will be cleared.",
-    "confirm_delete"                   => "Are you sure you want to delete the selected Sale(s)?",
-    "confirm_restore"                  => "Are you sure you want to restore the selected Sale(s)?",
-    "credit"                           => "Credit Card",
-    "credit_deposit"                   => "Credit Deposit",
-    "credit_filter"                    => "Credit Card",
-    "current_table"                    => "",
-    "customer"                         => "Customer",
-    "customer_address"                 => "Address",
-    "customer_discount"                => "Discount",
-    "customer_email"                   => "Email",
-    "customer_location"                => "Location",
-    "customer_mailchimp_status"        => "MailChimp Status",
-    "customer_optional"                => "(Required for Due Payments)",
-    "customer_required"                => "(Required)",
-    "customer_total"                   => "Total",
-    "customer_total_spent"             => "",
-    "daily_sales"                      => "",
-    "date"                             => "Sale Date",
-    "date_range"                       => "Date Range",
-    "date_required"                    => "A correct date must be entered.",
-    "date_type"                        => "Date is a required field.",
-    "debit"                            => "Debit Card",
-    "debit_filter"                     => "",
-    "delete"                           => "Allow Delete",
-    "delete_confirmation"              => "Are you sure you want to delete this sale? This action cannot be undone.",
-    "delete_entire_sale"               => "Delete Entire Sale",
-    "delete_successful"                => "Sale delete successful.",
-    "delete_unsuccessful"              => "Sale delete failed.",
-    "description_abbrv"                => "Desc.",
-    "discard"                          => "Discard",
-    "discard_quote"                    => "",
-    "discount"                         => "Disc",
-    "discount_included"                => "% Discount",
-    "discount_short"                   => "%",
-    "due"                              => "Due",
-    "due_filter"                       => "Due",
-    "edit"                             => "Edit",
-    "edit_item"                        => "Edit Item",
-    "edit_sale"                        => "Edit Sale",
-    "email_receipt"                    => "Email Receipt",
-    "employee"                         => "Employee",
-    "entry"                            => "Entry",
-    "error_editing_item"               => "Error editing item",
-    "negative_price_invalid"           => "Price cannot be negative.",
-    "negative_quantity_invalid"        => "Quantity cannot be negative.",
-    "negative_discount_invalid"        => "Discount cannot be negative.",
-    "discount_percent_exceeds_100"     => "Percentage discount cannot exceed 100%.",
-    "discount_exceeds_item_total"      => "Discount cannot exceed the item total.",
-    "negative_total_invalid"           => "Sale total cannot be negative. Check item discounts and quantities.",
-    "find_or_scan_item"                => "Find or Scan Item",
-    "find_or_scan_item_or_receipt"     => "Find or Scan Item or Receipt",
-    "giftcard"                         => "Gift Card",
-    "giftcard_balance"                 => "Gift Card Balance",
-    "giftcard_filter"                  => "",
-    "giftcard_number"                  => "Gift Card Number",
-    "group_by_category"                => "Group by Category",
-    "group_by_type"                    => "Group by Type",
-    "hsn"                              => "HSN",
-    "id"                               => "Sale ID",
-    "include_prices"                   => "Include Prices?",
-    "invoice"                          => "Invoice",
-    "invoice_confirm"                  => "This invoice will be sent to",
-    "invoice_enable"                   => "Invoice Number",
-    "invoice_filter"                   => "Invoices",
-    "invoice_no_email"                 => "This customer does not have a valid email address.",
-    "invoice_number"                   => "Invoice #",
-    "invoice_number_duplicate"         => "Invoice Number {0} must be unique.",
-    "invoice_sent"                     => "Invoice sent to",
-    "invoice_total"                    => "Invoice Total",
-    "invoice_type_custom_invoice"      => "Custom Invoice (custom_invoice.php)",
-    "invoice_type_custom_tax_invoice"  => "Custom Tax Invoice (custom_tax_invoice.php)",
-    "invoice_type_invoice"             => "Invoice (invoice.php)",
-    "invoice_type_tax_invoice"         => "Tax Invoice (tax_invoice.php)",
-    "invoice_unsent"                   => "Invoice failed to be sent to",
-    "invoice_update"                   => "Recount",
-    "item_insufficient_of_stock"       => "Item has insufficient stock.",
-    "item_name"                        => "Item Name",
-    "item_number"                      => "Item #",
-    "item_out_of_stock"                => "Item is out of stock.",
-    "key_browser"                      => "Helpful Shortcuts",
-    "key_cancel"                       => "Cancels Current Quote/Invoice/Sale",
-    "key_customer_search"              => "Customer Search",
-    "key_finish_quote"                 => "Finish Quote/Invoice without payment",
-    "key_finish_sale"                  => "Add Payment and Complete Invoice/Sale",
-    "key_full"                         => "Open in Full Screen Mode",
-    "key_function"                     => "Function",
-    "key_help"                         => "Shortcuts",
-    "key_help_modal"                   => "Open Shortcuts Window",
-    "key_in"                           => "Zoom in",
-    "key_item_search"                  => "Item Search",
-    "key_out"                          => "Zoom Out",
-    "key_payment"                      => "Add Payment",
-    "key_print"                        => "Print Current Page",
-    "key_restore"                      => "Restore Original Display/Zoom",
-    "key_search"                       => "Search Reports Tables",
-    "key_suspend"                      => "Suspend Current Sale",
-    "key_suspended"                    => "Show Suspended Sales",
-    "key_system"                       => "System Shortcuts",
-    "key_tendered"                     => "Edit Amount Tendered",
-    "key_title"                        => "Sales Keyboard Shortcuts",
-    "mc"                               => "",
-    "mode"                             => "Register Mode",
-    "must_enter_numeric"               => "Amount Tendered must be a number.",
-    "must_enter_numeric_giftcard"      => "Gift Card Number must be a number.",
-    "new_customer"                     => "New Customer",
-    "new_item"                         => "New Item",
-    "no_description"                   => "No description",
-    "no_filter"                        => "All",
-    "no_items_in_cart"                 => "There are no Items in the cart.",
-    "no_sales_to_display"              => "No Sales to display.",
-    "none_selected"                    => "You have not selected any Sale(s) to delete.",
-    "nontaxed_ind"                     => " ",
-    "not_authorized"                   => "This action is not authorized.",
-    "one_or_multiple"                  => "Sale(s)",
-    "payment"                          => "Payment Type",
-    "payment_amount"                   => "Amount",
-    "payment_not_cover_total"          => "Payment Amount must be greater than or equal to Total.",
-    "payment_type"                     => "Type",
-    "payments"                         => "",
-    "payments_total"                   => "Payments Total",
-    "price"                            => "Price",
-    "print_after_sale"                 => "Print after Sale",
-    "quantity"                         => "Quantity",
-    "quantity_less_than_reorder_level" => "Warning: Desired Quantity is below Reorder Level for that Item.",
-    "quantity_less_than_zero"          => "Warning: Desired Quantity is insufficient. You can still process the sale, but audit your inventory.",
-    "quantity_of_items"                => "Quantity of {0} Items",
-    "quote"                            => "Quote",
-    "quote_number"                     => "Quote Number",
-    "quote_number_duplicate"           => "Quote Number must be unique.",
-    "quote_sent"                       => "Quote sent to",
-    "quote_unsent"                     => "Quote failed to be sent to",
-    "receipt"                          => "Sales Receipt",
-    "receipt_no_email"                 => "This customer does not have a valid email address.",
-    "receipt_number"                   => "Sale #",
-    "receipt_sent"                     => "Receipt sent to",
-    "receipt_unsent"                   => "Receipt failed to be sent to",
-    "refund"                           => "Refund Type",
-    "register"                         => "Sales Register",
-    "remove_customer"                  => "Remove Customer",
-    "remove_discount"                  => "",
-    "return"                           => "Return",
-    "rewards"                          => "Reward Points",
-    "rewards_balance"                  => "Reward Points Balance",
-    "sale"                             => "Sale",
-    "sale_by_invoice"                  => "Sale by Invoice",
-    "sale_for_customer"                => "Customer:",
-    "sale_time"                        => "Time",
-    "sales_tax"                        => "Sales Tax",
-    "sales_total"                      => "",
-    "select_customer"                  => "Select Customer",
-    "selected_customer"                => "Selected Customer",
-    "send_invoice"                     => "Send Invoice",
-    "send_quote"                       => "Send Quote",
-    "send_receipt"                     => "Send Receipt",
-    "send_work_order"                  => "Send Work Order",
-    "serial"                           => "Serial",
-    "service_charge"                   => "",
-    "show_due"                         => "",
-    "show_invoice"                     => "Show Invoice",
-    "show_receipt"                     => "Show Receipt",
-    "start_typing_customer_name"       => "Start typing customer details...",
-    "start_typing_item_name"           => "Start typing Item Name or scan Barcode...",
-    "stock"                            => "Stock",
-    "stock_location"                   => "Stock Location",
-    "sub_total"                        => "Subtotal",
-    "successfully_deleted"             => "You have successfully deleted",
-    "successfully_restored"            => "You have successfully restored",
-    "successfully_suspended_sale"      => "Sale suspend successful.",
-    "successfully_updated"             => "Sale update successful.",
-    "suspend_sale"                     => "Suspend",
-    "suspended_doc_id"                 => "Document",
-    "suspended_sale_id"                => "ID",
-    "suspended_sales"                  => "Suspended",
-    "table"                            => "Table",
-    "takings"                          => "Daily Sales",
-    "tax"                              => "Tax",
-    "tax_id"                           => "Tax Id",
-    "tax_invoice"                      => "Tax Invoice",
-    "tax_percent"                      => "Tax %",
-    "taxed_ind"                        => "T",
-    "total"                            => "Total",
-    "total_tax_exclusive"              => "Tax excluded",
-    "transaction_failed"               => "Sales Transaction failed.",
-    "unable_to_add_item"               => "Item add to Sale failed",
-    "unsuccessfully_deleted"           => "Sale(s) delete failed.",
-    "unsuccessfully_restored"          => "Sale(s) restore failed.",
-    "unsuccessfully_suspended_sale"    => "Sale suspend failed.",
-    "unsuccessfully_updated"           => "Sale update failed.",
-    "unsuspend"                        => "Unsuspend",
-    "unsuspend_and_delete"             => "Action",
-    "update"                           => "Update",
-    "upi"                              => "UPI",
-    "visa"                             => "",
-    "wholesale"                        => "",
-    "work_order"                       => "Work Order",
-    "work_order_number"                => "Work Order Number",
-    "work_order_number_duplicate"      => "Work Order Number must be unique.",
-    "work_order_sent"                  => "Work Order sent to",
-    "work_order_unsent"                => "Work Order failed to be sent to",
+    'customers_available_points'       => 'Points Available',
+    'rewards_package'                  => 'Rewards',
+    'rewards_remaining_balance'        => 'Reward Points remaining value is ',
+    'account_number'                   => 'Account #',
+    'add_payment'                      => 'Add Payment',
+    'amount_due'                       => 'Amount Due',
+    'amount_tendered'                  => 'Amount Tendered',
+    'authorized_signature'             => 'Authorized Signature',
+    'bank_transfer'                    => 'Bank Transfer',
+    'cancel_sale'                      => 'Cancel',
+    'cash'                             => 'Cash',
+    'cash_1'                           => '',
+    'cash_2'                           => '',
+    'cash_3'                           => '',
+    'cash_4'                           => '',
+    'cash_adjustment'                  => 'Cash Adjustment',
+    'cash_deposit'                     => 'Cash Deposit',
+    'cash_filter'                      => 'Cash',
+    'change_due'                       => 'Change Due',
+    'change_price'                     => 'Change Selling Price',
+    'check'                            => 'Check',
+    'check_balance'                    => 'Check remainder',
+    'check_filter'                     => 'Check',
+    'close'                            => '',
+    'comment'                          => 'Comment',
+    'comments'                         => 'Comments',
+    'company_name'                     => '',
+    'complete'                         => '',
+    'complete_sale'                    => 'Complete',
+    'confirm_cancel_sale'              => 'Are you sure you want to clear this sale? All items will be cleared.',
+    'confirm_delete'                   => 'Are you sure you want to delete the selected Sale(s)?',
+    'confirm_restore'                  => 'Are you sure you want to restore the selected Sale(s)?',
+    'credit'                           => 'Credit Card',
+    'credit_deposit'                   => 'Credit Deposit',
+    'credit_filter'                    => 'Credit Card',
+    'current_table'                    => '',
+    'customer'                         => 'Customer',
+    'customer_address'                 => 'Address',
+    'customer_discount'                => 'Discount',
+    'customer_email'                   => 'Email',
+    'customer_location'                => 'Location',
+    'customer_mailchimp_status'        => 'MailChimp Status',
+    'customer_optional'                => '(Required for Due Payments)',
+    'customer_required'                => '(Required)',
+    'customer_total'                   => 'Total',
+    'customer_total_spent'             => '',
+    'daily_sales'                      => '',
+    'date'                             => 'Sale Date',
+    'date_range'                       => 'Date Range',
+    'date_required'                    => 'A correct date must be entered.',
+    'date_type'                        => 'Date is a required field.',
+    'debit'                            => 'Debit Card',
+    'debit_filter'                     => '',
+    'delete'                           => 'Allow Delete',
+    'delete_confirmation'              => 'Are you sure you want to delete this sale? This action cannot be undone.',
+    'delete_entire_sale'               => 'Delete Entire Sale',
+    'delete_successful'                => 'Sale delete successful.',
+    'delete_unsuccessful'              => 'Sale delete failed.',
+    'description_abbrv'                => 'Desc.',
+    'discard'                          => 'Discard',
+    'discard_quote'                    => '',
+    'discount'                         => 'Disc',
+    'discount_included'                => '% Discount',
+    'discount_short'                   => '%',
+    'due'                              => 'Due',
+    'due_filter'                       => 'Due',
+    'edit'                             => 'Edit',
+    'edit_item'                        => 'Edit Item',
+    'edit_sale'                        => 'Edit Sale',
+    'email_receipt'                    => 'Email Receipt',
+    'employee'                         => 'Employee',
+    'entry'                            => 'Entry',
+    'error_editing_item'               => 'Error editing item',
+    'negative_price_invalid'           => 'Price cannot be negative.',
+    'negative_quantity_invalid'        => 'Quantity cannot be negative.',
+    'negative_discount_invalid'        => 'Discount cannot be negative.',
+    'discount_percent_exceeds_100'     => 'Percentage discount cannot exceed 100%.',
+    'discount_exceeds_item_total'      => 'Discount cannot exceed the item total.',
+    'negative_total_invalid'           => 'Sale total cannot be negative. Check item discounts and quantities.',
+    'find_or_scan_item'                => 'Find or Scan Item',
+    'find_or_scan_item_or_receipt'     => 'Find or Scan Item or Receipt',
+    'giftcard'                         => 'Gift Card',
+    'giftcard_balance'                 => 'Gift Card Balance',
+    'giftcard_filter'                  => '',
+    'giftcard_number'                  => 'Gift Card Number',
+    'group_by_category'                => 'Group by Category',
+    'group_by_type'                    => 'Group by Type',
+    'hsn'                              => 'HSN',
+    'id'                               => 'Sale ID',
+    'include_prices'                   => 'Include Prices?',
+    'invoice'                          => 'Invoice',
+    'invoice_confirm'                  => 'This invoice will be sent to',
+    'invoice_enable'                   => 'Invoice Number',
+    'invoice_filter'                   => 'Invoices',
+    'invoice_no_email'                 => 'This customer does not have a valid email address.',
+    'invoice_number'                   => 'Invoice #',
+    'invoice_number_duplicate'         => 'Invoice Number {0} must be unique.',
+    'invoice_sent'                     => 'Invoice sent to',
+    'invoice_total'                    => 'Invoice Total',
+    'invoice_type_custom_invoice'      => 'Custom Invoice (custom_invoice.php)',
+    'invoice_type_custom_tax_invoice'  => 'Custom Tax Invoice (custom_tax_invoice.php)',
+    'invoice_type_invoice'             => 'Invoice (invoice.php)',
+    'invoice_type_tax_invoice'         => 'Tax Invoice (tax_invoice.php)',
+    'invoice_unsent'                   => 'Invoice failed to be sent to',
+    'invoice_update'                   => 'Recount',
+    'item_insufficient_of_stock'       => 'Item has insufficient stock.',
+    'item_name'                        => 'Item Name',
+    'item_number'                      => 'Item #',
+    'item_out_of_stock'                => 'Item is out of stock.',
+    'key_browser'                      => 'Helpful Shortcuts',
+    'key_cancel'                       => 'Cancels Current Quote/Invoice/Sale',
+    'key_customer_search'              => 'Customer Search',
+    'key_finish_quote'                 => 'Finish Quote/Invoice without payment',
+    'key_finish_sale'                  => 'Add Payment and Complete Invoice/Sale',
+    'key_full'                         => 'Open in Full Screen Mode',
+    'key_function'                     => 'Function',
+    'key_help'                         => 'Shortcuts',
+    'key_help_modal'                   => 'Open Shortcuts Window',
+    'key_in'                           => 'Zoom in',
+    'key_item_search'                  => 'Item Search',
+    'key_out'                          => 'Zoom Out',
+    'key_payment'                      => 'Add Payment',
+    'key_print'                        => 'Print Current Page',
+    'key_restore'                      => 'Restore Original Display/Zoom',
+    'key_search'                       => 'Search Reports Tables',
+    'key_suspend'                      => 'Suspend Current Sale',
+    'key_suspended'                    => 'Show Suspended Sales',
+    'key_system'                       => 'System Shortcuts',
+    'key_tendered'                     => 'Edit Amount Tendered',
+    'key_title'                        => 'Sales Keyboard Shortcuts',
+    'mc'                               => '',
+    'mode'                             => 'Register Mode',
+    'must_enter_numeric'               => 'Amount Tendered must be a number.',
+    'must_enter_numeric_giftcard'      => 'Gift Card Number must be a number.',
+    'new_customer'                     => 'New Customer',
+    'new_item'                         => 'New Item',
+    'no_description'                   => 'No description',
+    'no_filter'                        => 'All',
+    'no_items_in_cart'                 => 'There are no Items in the cart.',
+    'no_sales_to_display'              => 'No Sales to display.',
+    'none_selected'                    => 'You have not selected any Sale(s) to delete.',
+    'nontaxed_ind'                     => ' ',
+    'not_authorized'                   => 'This action is not authorized.',
+    'one_or_multiple'                  => 'Sale(s)',
+    'payment'                          => 'Payment Type',
+    'payment_amount'                   => 'Amount',
+    'payment_not_cover_total'          => 'Payment Amount must be greater than or equal to Total.',
+    'payment_type'                     => 'Type',
+    'payments'                         => '',
+    'payments_total'                   => 'Payments Total',
+    'price'                            => 'Price',
+    'print_after_sale'                 => 'Print after Sale',
+    'quantity'                         => 'Quantity',
+    'quantity_less_than_reorder_level' => 'Warning: Desired Quantity is below Reorder Level for that Item.',
+    'quantity_less_than_zero'          => 'Warning: Desired Quantity is insufficient. You can still process the sale, but audit your inventory.',
+    'quantity_of_items'                => 'Quantity of {0} Items',
+    'quote'                            => 'Quote',
+    'quote_number'                     => 'Quote Number',
+    'quote_number_duplicate'           => 'Quote Number must be unique.',
+    'quote_sent'                       => 'Quote sent to',
+    'quote_unsent'                     => 'Quote failed to be sent to',
+    'receipt'                          => 'Sales Receipt',
+    'receipt_no_email'                 => 'This customer does not have a valid email address.',
+    'receipt_number'                   => 'Sale #',
+    'receipt_sent'                     => 'Receipt sent to',
+    'receipt_unsent'                   => 'Receipt failed to be sent to',
+    'refund'                           => 'Refund Type',
+    'register'                         => 'Sales Register',
+    'remove_customer'                  => 'Remove Customer',
+    'remove_discount'                  => '',
+    'return'                           => 'Return',
+    'rewards'                          => 'Reward Points',
+    'rewards_balance'                  => 'Reward Points Balance',
+    'sale'                             => 'Sale',
+    'sale_by_invoice'                  => 'Sale by Invoice',
+    'sale_for_customer'                => 'Customer:',
+    'sale_time'                        => 'Time',
+    'sales_tax'                        => 'Sales Tax',
+    'sales_total'                      => '',
+    'select_customer'                  => 'Select Customer',
+    'selected_customer'                => 'Selected Customer',
+    'send_invoice'                     => 'Send Invoice',
+    'send_quote'                       => 'Send Quote',
+    'send_receipt'                     => 'Send Receipt',
+    'send_work_order'                  => 'Send Work Order',
+    'serial'                           => 'Serial',
+    'service_charge'                   => '',
+    'show_due'                         => '',
+    'show_invoice'                     => 'Show Invoice',
+    'show_receipt'                     => 'Show Receipt',
+    'start_typing_customer_name'       => 'Start typing customer details...',
+    'start_typing_item_name'           => 'Start typing Item Name or scan Barcode...',
+    'stock'                            => 'Stock',
+    'stock_location'                   => 'Stock Location',
+    'sub_total'                        => 'Subtotal',
+    'successfully_deleted'             => 'You have successfully deleted',
+    'successfully_restored'            => 'You have successfully restored',
+    'successfully_suspended_sale'      => 'Sale suspend successful.',
+    'successfully_updated'             => 'Sale update successful.',
+    'suspend_sale'                     => 'Suspend',
+    'suspended_doc_id'                 => 'Document',
+    'suspended_sale_id'                => 'ID',
+    'suspended_sales'                  => 'Suspended',
+    'table'                            => 'Table',
+    'takings'                          => 'Daily Sales',
+    'tax'                              => 'Tax',
+    'tax_id'                           => 'Tax Id',
+    'tax_invoice'                      => 'Tax Invoice',
+    'tax_percent'                      => 'Tax %',
+    'taxed_ind'                        => 'T',
+    'total'                            => 'Total',
+    'total_tax_exclusive'              => 'Tax excluded',
+    'transaction_failed'               => 'Sales Transaction failed.',
+    'unable_to_add_item'               => 'Item add to Sale failed',
+    'unsuccessfully_deleted'           => 'Sale(s) delete failed.',
+    'unsuccessfully_restored'          => 'Sale(s) restore failed.',
+    'unsuccessfully_suspended_sale'    => 'Sale suspend failed.',
+    'unsuccessfully_updated'           => 'Sale update failed.',
+    'unsuspend'                        => 'Unsuspend',
+    'unsuspend_and_delete'             => 'Action',
+    'update'                           => 'Update',
+    'upi'                              => 'UPI',
+    'visa'                             => '',
+    'wallet'                           => 'Wallet',
+    'wholesale'                        => '',
+    'work_order'                       => 'Work Order',
+    'work_order_number'                => 'Work Order Number',
+    'work_order_number_duplicate'      => 'Work Order Number must be unique.',
+    'work_order_sent'                  => 'Work Order sent to',
+    'work_order_unsent'                => 'Work Order failed to be sent to',
+    'download_ubl'                     => 'Download UBL Invoice',
+    'ubl_generation_failed'            => 'UBL invoice generation failed',
+    'sale_not_found'                   => 'Sale not found',
 ];

app/Language/es-ES/Items.php

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

app/Language/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",

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

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

app/Language/ka/Calendar.php

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

app/Language/lo/Calendar.php

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

app/Language/ml/Calendar.php

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

app/Language/nb/Calendar.php

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

app/Language/th/Bootstrap_tables.php

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

app/Language/th/Login.php

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

app/Language/th/Sales.php

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

app/Libraries/Email_lib.php

@@ -118,4 +118,38 @@ class Email_lib
 
         return '<img id="image" src="data:' . $mimeType . ';base64,' . $logo_data . '" alt="company_logo">';
     }
+    
+    /**
+     * Send email with multiple attachments
+     *
+     * @param string $to
+     * @param string $subject
+     * @param string $message
+     * @param array $attachments
+     * @return bool
+     */
+    public function sendMultipleAttachments(string $to, string $subject, string $message, array $attachments): bool
+    {
+        $email = $this->email;
+
+        $email->setFrom($this->config['email'], $this->config['company']);
+        $email->setTo($to);
+        $email->setSubject($subject);
+        $email->setMessage($message);
+
+        foreach ($attachments as $attachment) {
+            if (!empty($attachment) && file_exists($attachment)) {
+                $email->attach($attachment);
+            }
+        }
+
+        $result = $email->send();
+
+        if (!$result) {
+            log_message('error', $email->printDebugger());
+        }
+
+        return $result;
+    }
+
 }

app/Libraries/InvoiceAttachment/InvoiceAttachment.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Libraries\InvoiceAttachment;
+
+interface InvoiceAttachment
+{
+    /**
+     * Generate the attachment content and write to a temp file.
+     *
+     * @param array $saleData The sale data from _load_sale_data()
+     * @param string $type The document type (invoice, tax_invoice, quote, work_order, receipt)
+     * @return string|null Absolute path to generated file, or null on failure
+     */
+    public function generate(array $saleData, string $type): ?string;
+
+    /**
+     * Check if this attachment type is applicable for the document type.
+     * E.g., UBL only works for invoice/tax_invoice
+     *
+     * @param string $type The document type
+     * @param array $saleData The sale data (to check invoice_number existence)
+     * @return bool
+     */
+    public function isApplicableForType(string $type, array $saleData): bool;
+
+    /**
+     * Get the file extension for this attachment.
+     *
+     * @return string E.g., 'pdf', 'xml'
+     */
+    public function getFileExtension(): string;
+
+    /**
+     * Get the config values that enable this attachment.
+     * Returns array of config values that should generate this attachment.
+     *
+     * @return array E.g., ['pdf_only', 'both'] for PDF
+     */
+    public function getEnabledConfigValues(): array;
+}

app/Libraries/InvoiceAttachment/InvoiceAttachmentGenerator.php

@@ -0,0 +1,75 @@
+<?php
+
+namespace App\Libraries\InvoiceAttachment;
+
+class InvoiceAttachmentGenerator
+{
+    /** @var InvoiceAttachment[] */
+    private array $attachments = [];
+
+    /**
+     * Register an attachment generator.
+     */
+    public function register(InvoiceAttachment $attachment): self
+    {
+        $this->attachments[] = $attachment;
+        return $this;
+    }
+
+    /**
+     * Create generator with attachments based on config.
+     * Factory method that instantiates the right attachments.
+     *
+     * @param string $invoiceFormat Config value: 'pdf_only', 'ubl_only', or 'both'
+     * @return self
+     */
+    public static function createFromConfig(string $invoiceFormat): self
+    {
+        $generator = new self();
+
+        if (in_array($invoiceFormat, ['pdf_only', 'both'], true)) {
+            $generator->register(new PdfAttachment());
+        }
+
+        if (in_array($invoiceFormat, ['ubl_only', 'both'], true)) {
+            $generator->register(new UblAttachment());
+        }
+
+        return $generator;
+    }
+
+    /**
+     * Generate all applicable attachments for a sale.
+     *
+     * @param array $saleData The sale data
+     * @param string $type The document type
+     * @return string[] Array of file paths to generated attachments
+     */
+    public function generateAttachments(array $saleData, string $type): array
+    {
+        $files = [];
+
+        foreach ($this->attachments as $attachment) {
+            if ($attachment->isApplicableForType($type, $saleData)) {
+                $filepath = $attachment->generate($saleData, $type);
+                if ($filepath !== null) {
+                    $files[] = $filepath;
+                }
+            }
+        }
+
+        return $files;
+    }
+
+    /**
+     * Clean up temporary attachment files.
+     *
+     * @param string[] $files
+     */
+    public static function cleanup(array $files): void
+    {
+        foreach ($files as $file) {
+            @unlink($file);
+        }
+    }
+}

app/Libraries/InvoiceAttachment/PdfAttachment.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Libraries\InvoiceAttachment;
+
+use CodeIgniter\Config\Services;
+
+class PdfAttachment implements InvoiceAttachment
+{
+    /**
+     * @inheritDoc
+     */
+    public function generate(array $saleData, string $type): ?string
+    {
+        $view = Services::renderer();
+        $html = $view->setData($saleData)->render("sales/{$type}_email");
+
+        helper(['dompdf', 'file']);
+
+        $tempPath = tempnam(sys_get_temp_dir(), 'ospos_pdf_');
+        if ($tempPath === false) {
+            log_message('error', 'PDF attachment: failed to create temp file');
+            return null;
+        }
+
+        $filename = $tempPath . '.pdf';
+        rename($tempPath, $filename);
+
+        $pdfContent = create_pdf($html);
+        if (file_put_contents($filename, $pdfContent) === false) {
+            log_message('error', 'PDF attachment: failed to write content');
+            @unlink($filename);
+            return null;
+        }
+
+        return $filename;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function isApplicableForType(string $type, array $saleData): bool
+    {
+        return true;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFileExtension(): string
+    {
+        return 'pdf';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getEnabledConfigValues(): array
+    {
+        return ['pdf_only', 'both'];
+    }
+}

app/Libraries/InvoiceAttachment/UblAttachment.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Libraries\InvoiceAttachment;
+
+use App\Libraries\UBLGenerator;
+
+class UblAttachment implements InvoiceAttachment
+{
+    public function __construct()
+    {
+        require_once ROOTPATH . 'vendor/autoload.php';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function generate(array $saleData, string $type): ?string
+    {
+        try {
+            $generator = new UBLGenerator();
+            $xml = $generator->generateUblInvoice($saleData);
+
+            $tempPath = tempnam(sys_get_temp_dir(), 'ospos_ubl_');
+            if ($tempPath === false) {
+                log_message('error', 'UBL attachment: failed to create temp file');
+                return null;
+            }
+
+            $filename = $tempPath . '.xml';
+            rename($tempPath, $filename);
+
+            if (file_put_contents($filename, $xml) === false) {
+                log_message('error', 'UBL attachment: failed to write content');
+                @unlink($filename);
+                return null;
+            }
+
+            return $filename;
+        } catch (\Exception $e) {
+            log_message('error', 'UBL attachment generation failed: ' . $e->getMessage());
+            return null;
+        }
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function isApplicableForType(string $type, array $saleData): bool
+    {
+        return in_array($type, ['invoice', 'tax_invoice'], true)
+            && !empty($saleData['invoice_number']);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFileExtension(): string
+    {
+        return 'xml';
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getEnabledConfigValues(): array
+    {
+        return ['ubl_only', 'both'];
+    }
+}

app/Libraries/MY_Migration.php

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

app/Libraries/Sale_lib.php

@@ -23,6 +23,19 @@ use ReflectionException;
  */
 class Sale_lib
 {
+    private const KEY_SHORTCUT_DEFAULTS = [
+        'cancel'    => ['value' => '27 | ESC', 'code' => 27, 'label' => 'ESC'],
+        'items'     => ['value' => '49 | ALT + 1', 'code' => 49, 'label' => 'ALT + 1'],
+        'customers' => ['value' => '50 | ALT + 2', 'code' => 50, 'label' => 'ALT + 2'],
+        'suspend'   => ['value' => '51 | ALT + 3', 'code' => 51, 'label' => 'ALT + 3'],
+        'suspended' => ['value' => '52 | ALT + 4', 'code' => 52, 'label' => 'ALT + 4'],
+        'amount'    => ['value' => '53 | ALT + 5', 'code' => 53, 'label' => 'ALT + 5'],
+        'payment'   => ['value' => '54 | ALT + 6', 'code' => 54, 'label' => 'ALT + 6'],
+        'complete'  => ['value' => '55 | ALT + 7', 'code' => 55, 'label' => 'ALT + 7'],
+        'finish'    => ['value' => '56 | ALT + 8', 'code' => 56, 'label' => 'ALT + 8'],
+        'help'      => ['value' => '57 | ALT + 9', 'code' => 57, 'label' => 'ALT + 9'],
+    ];
+
     private Attribute $attribute;
     private Customer $customer;
     private Dinner_table $dinner_table;
@@ -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
      */

app/Libraries/UBLGenerator.php

@@ -0,0 +1,369 @@
+<?php
+
+namespace App\Libraries;
+
+use DateTime;
+use NumNum\UBL\AccountingParty;
+use NumNum\UBL\Address;
+use NumNum\UBL\AllowanceCharge;
+use NumNum\UBL\Contact;
+use NumNum\UBL\Country;
+use NumNum\UBL\Generator;
+use NumNum\UBL\Invoice;
+use NumNum\UBL\InvoiceLine;
+use NumNum\UBL\Item;
+use NumNum\UBL\LegalMonetaryTotal;
+use NumNum\UBL\Party;
+use NumNum\UBL\PartyTaxScheme;
+use NumNum\UBL\Price;
+use NumNum\UBL\TaxCategory;
+use NumNum\UBL\TaxScheme;
+use NumNum\UBL\TaxSubTotal;
+use NumNum\UBL\TaxTotal;
+use NumNum\UBL\UnitCode;
+
+helper(['country']);
+
+class UBLGenerator
+{
+    /**
+     * Generate UBL invoice XML from sale data
+     *
+     * @param array $saleData Sale data from _load_sale_data()
+     *
+     * @return string UBL XML string
+     */
+    public function generateUblInvoice(array $saleData): string
+    {
+        $taxScheme     = (new TaxScheme())->setId('VAT');
+        $isTaxIncluded = ! empty($saleData['tax_included']);
+
+        $supplierParty = $this->buildSupplierParty($saleData, $taxScheme);
+        $customerParty = $this->buildCustomerParty($saleData['customer_object'] ?? null, $taxScheme);
+        $invoiceLines  = $this->buildInvoiceLines($saleData, $taxScheme, $isTaxIncluded);
+        $taxTotal      = $this->buildTaxTotal($saleData['taxes'] ?? [], $taxScheme);
+        $monetaryTotal = $this->buildMonetaryTotal($saleData);
+
+        $invoice = (new Invoice())
+            ->setUBLVersionId('2.1')
+            ->setCustomizationId('urn:cen.eu:en16931:2017')
+            ->setProfileId('urn:fdc:peppol.eu:2017:poacc:billing:01:1.0')
+            ->setId($saleData['invoice_number'] ?? '')
+            ->setIssueDate(new DateTime($saleData['transaction_date'] ?? 'now'))
+            ->setInvoiceTypeCode(380)
+            ->setAccountingSupplierParty($supplierParty)
+            ->setAccountingCustomerParty($customerParty)
+            ->setInvoiceLines($invoiceLines)
+            ->setTaxTotal($taxTotal)
+            ->setLegalMonetaryTotal($monetaryTotal);
+
+        // Set currency if available
+        if (! empty($saleData['currency_code'])) {
+            Generator::$currencyID = $saleData['currency_code'];
+        }
+
+        $generator = new Generator();
+
+        return $generator->invoice($invoice);
+    }
+
+    /**
+     * Build supplier (seller) party
+     */
+    protected function buildSupplierParty(array $saleData, TaxScheme $taxScheme): AccountingParty
+    {
+        $config = $saleData['config'] ?? [];
+
+        $addressParts = $this->parseAddress($config['address'] ?? '');
+        $countryCode  = getCountryCode($config['country'] ?? '');
+
+        $country = (new Country())->setIdentificationCode($countryCode);
+        $address = (new Address())
+            ->setStreetName($addressParts['street'] ?? '')
+            ->setBuildingNumber($addressParts['number'] ?? '')
+            ->setCityName($addressParts['city'] ?? '')
+            ->setPostalZone($addressParts['zip'] ?? '')
+            ->setCountrySubentity($config['state'] ?? '')
+            ->setCountry($country);
+
+        $party = (new Party())
+            ->setName($config['company'] ?? '')
+            ->setPostalAddress($address);
+
+        $partyTaxScheme = null;
+        if (! empty($config['account_number'])) {
+            $partyTaxScheme = (new PartyTaxScheme())
+                ->setCompanyId($config['account_number'])
+                ->setTaxScheme($taxScheme);
+            $party->setPartyTaxScheme($partyTaxScheme);
+        } elseif (! empty($config['tax_id'])) {
+            // Use tax_id if account_number is not set
+            $partyTaxScheme = (new PartyTaxScheme())
+                ->setCompanyId($config['tax_id'])
+                ->setTaxScheme($taxScheme);
+            $party->setPartyTaxScheme($partyTaxScheme);
+        }
+
+        return (new AccountingParty())->setParty($party);
+    }
+
+    /**
+     * Build customer (buyer) party
+     */
+    protected function buildCustomerParty(?object $customerInfo, TaxScheme $taxScheme): AccountingParty
+    {
+        if ($customerInfo === null) {
+            return (new AccountingParty())->setParty(new Party());
+        }
+
+        $countryCode = getCountryCode($customerInfo->country ?? '');
+
+        $country = (new Country())->setIdentificationCode($countryCode);
+        $address = (new Address())
+            ->setStreetName($customerInfo->address_1 ?? '')
+            ->setAddressLine([$customerInfo->address_2 ?? ''])
+            ->setCityName($customerInfo->city ?? '')
+            ->setPostalZone($customerInfo->zip ?? '')
+            ->setCountrySubentity($customerInfo->state ?? '')
+            ->setCountry($country);
+
+        $partyName = ! empty($customerInfo->company_name)
+            ? $customerInfo->company_name
+            : trim(($customerInfo->first_name ?? '') . ' ' . ($customerInfo->last_name ?? ''));
+
+        $party = (new Party())
+            ->setName($partyName)
+            ->setPostalAddress($address);
+
+        if (! empty($customerInfo->email)) {
+            $contact = (new Contact())
+                ->setElectronicMail($customerInfo->email)
+                ->setTelephone($customerInfo->phone_number ?? '');
+            $party->setContact($contact);
+        }
+
+        $accountingParty = (new AccountingParty())->setParty($party);
+
+        if (! empty($customerInfo->account_number)) {
+            $accountingParty->setSupplierAssignedAccountId($customerInfo->account_number);
+        }
+
+        if (! empty($customerInfo->tax_id)) {
+            $partyTaxScheme = (new PartyTaxScheme())
+                ->setCompanyId($customerInfo->tax_id)
+                ->setTaxScheme($taxScheme);
+            $party->setPartyTaxScheme($partyTaxScheme);
+        }
+
+        return $accountingParty;
+    }
+
+    /**
+     * Build invoice lines
+     */
+    protected function buildInvoiceLines(array $saleData, TaxScheme $taxScheme, bool $isTaxIncluded): array
+    {
+        $lines     = [];
+        $itemTaxes = $saleData['item_taxes'] ?? [];
+        $cart      = $saleData['cart'] ?? [];
+
+        foreach ($cart as $item) {
+            $itemId       = $item['item_id'] ?? 0;
+            $quantity     = (float) ($item['quantity'] ?? 0);
+            $unitPrice    = (float) ($item['price'] ?? 0);
+            $discount     = (float) ($item['discount'] ?? 0);
+            $discountType = (int) ($item['discount_type'] ?? 0);
+
+            // Calculate discount amount per unit
+            if ($discountType === PERCENT && $discount > 0) {
+                // Percentage discount
+                $discountAmountPerUnit = round($unitPrice * $discount / 100, 4);
+            } else {
+                // Fixed discount (discount is total for the line, divide by quantity)
+                $discountAmountPerUnit = $quantity > 0 ? round($discount / $quantity, 4) : 0;
+            }
+
+            // Net price per unit (after discount)
+            $netPricePerUnit = round($unitPrice - $discountAmountPerUnit, 4);
+            if ($netPricePerUnit < 0) {
+                $netPricePerUnit = 0;
+            }
+
+            // Get tax rate for this item
+            $taxRate     = 0.0;
+            $taxCategory = (new TaxCategory())
+                ->setId('S')
+                ->setPercent(0)
+                ->setTaxScheme($taxScheme);
+
+            if (isset($itemTaxes[$itemId]) && ! empty($itemTaxes[$itemId])) {
+                // Use the first (primary) tax for this item
+                $itemTax = $itemTaxes[$itemId][0];
+                $taxRate = (float) ($itemTax['percent'] ?? 0);
+
+                if (abs($taxRate) < 0.001) {
+                    $taxCategory->setId('Z'); // Zero rated
+                } elseif ($taxRate < 0) {
+                    $taxCategory->setId('E'); // Exempt
+                } else {
+                    $taxCategory->setId('S'); // Standard
+                }
+                $taxCategory->setPercent(round($taxRate, 2));
+            }
+
+            // Calculate line extension amount (net line total)
+            $lineExtensionAmount = round($netPricePerUnit * $quantity, 2);
+
+            // Build Price - PriceAmount MUST be the net price excluding VAT per Peppol EN16931 (BR-27)
+            // "The price of an item, exclusive of VAT, after subtracting discount"
+            $price = (new Price())
+                ->setBaseQuantity(1.0)
+                ->setUnitCode(UnitCode::UNIT);
+
+            if ($isTaxIncluded && $taxRate > 0) {
+                // Tax-inclusive: cart price includes VAT, so extract the net price
+                // net_price = gross_price / (1 + tax_rate/100)
+                $taxExclusivePricePerUnit = round($netPricePerUnit / (1 + $taxRate / 100), 4);
+                $price->setPriceAmount($taxExclusivePricePerUnit);
+
+                // Recalculate line extension amount with tax-exclusive price
+                $lineExtensionAmount = round($taxExclusivePricePerUnit * $quantity, 2);
+            } else {
+                // Tax-exclusive: cart price is already the net price
+                $price->setPriceAmount(round($netPricePerUnit, 4));
+            }
+
+            // Add AllowanceCharge if there's a discount (gross-to-net price reduction)
+            if ($discountAmountPerUnit > 0) {
+                $allowanceCharge = (new AllowanceCharge())
+                    ->setChargeIndicator(false) // false = allowance/discount
+                    ->setAllowanceChargeReason('Discount')
+                    ->setAmount(round($discountAmountPerUnit, 4))
+                    ->setBaseAmount(round((float) ($item['price'] ?? 0), 4));
+
+                $price->setAllowanceCharge($allowanceCharge);
+            }
+
+            // Build Item
+            $itemObj = (new Item())
+                ->setName($item['name'] ?? '')
+                ->setDescription($item['description'] ?? '')
+                ->setClassifiedTaxCategory($taxCategory);
+
+            // Add SellersItemIdentification if item_number exists (BR-25)
+            if (! empty($item['item_number'])) {
+                $itemObj->setSellersItemIdentification((string) $item['item_number']);
+            }
+
+            // Build InvoiceLine
+            $line = (new InvoiceLine())
+                ->setId(isset($item['line']) ? (string) $item['line'] : '1')
+                ->setInvoicedQuantity($quantity)
+                ->setLineExtensionAmount($lineExtensionAmount)
+                ->setItem($itemObj)
+                ->setPrice($price);
+
+            $lines[] = $line;
+        }
+
+        return $lines;
+    }
+
+    /**
+     * Build tax total from sales_taxes table data
+     */
+    protected function buildTaxTotal(array $taxes, TaxScheme $taxScheme): TaxTotal
+    {
+        $totalTax     = '0';
+        $taxSubTotals = [];
+
+        foreach ($taxes as $tax) {
+            if (isset($tax['tax_rate'])) {
+                $taxRate   = (string) $tax['tax_rate'];
+                $taxAmount = (string) ($tax['sale_tax_amount'] ?? '0');
+
+                // Use sale_tax_basis directly from DB instead of reverse-computing
+                $taxableAmount = (string) ($tax['sale_tax_basis'] ?? '0');
+
+                // Determine category ID based on tax rate
+                $categoryId = 'S'; // Standard
+                $floatRate  = (float) $taxRate;
+                if (abs($floatRate) < 0.001) {
+                    $categoryId = 'Z'; // Zero rated
+                } elseif ($floatRate < 0) {
+                    $categoryId = 'E'; // Exempt
+                }
+
+                $taxCategory = (new TaxCategory())
+                    ->setId($categoryId)
+                    ->setPercent(round($floatRate, 2))
+                    ->setTaxScheme($taxScheme);
+
+                $taxSubTotal = (new TaxSubTotal())
+                    ->setTaxableAmount(round((float) $taxableAmount, 2))
+                    ->setTaxAmount(round((float) $taxAmount, 2))
+                    ->setTaxCategory($taxCategory);
+
+                $taxSubTotals[] = $taxSubTotal;
+                $totalTax       = bcadd($totalTax, $taxAmount);
+            }
+        }
+
+        $taxTotal = new TaxTotal();
+        $taxTotal->setTaxAmount(round((float) $totalTax, 2));
+
+        foreach ($taxSubTotals as $subTotal) {
+            $taxTotal->addTaxSubTotal($subTotal);
+        }
+
+        return $taxTotal;
+    }
+
+    /**
+     * Build monetary total
+     */
+    protected function buildMonetaryTotal(array $saleData): LegalMonetaryTotal
+    {
+        // In OSPOS, after get_totals(): subtotal is ALWAYS tax-exclusive (net)
+        // total is ALWAYS tax-inclusive (gross)
+        $subtotal  = (float) ($saleData['subtotal'] ?? 0);
+        $total     = (float) ($saleData['total'] ?? 0);
+        $amountDue = (float) ($saleData['amount_due'] ?? 0);
+
+        return (new LegalMonetaryTotal())
+            ->setLineExtensionAmount(round($subtotal, 2))
+            ->setTaxExclusiveAmount(round($subtotal, 2))
+            ->setTaxInclusiveAmount(round($total, 2))
+            ->setPayableAmount(round($amountDue, 2));
+    }
+
+    /**
+     * Parse address string into components
+     */
+    protected function parseAddress(string $address): array
+    {
+        $parts = array_filter(array_map('trim', explode("\n", $address)));
+
+        $result = [
+            'street' => '',
+            'number' => '',
+            'city'   => '',
+            'zip'    => '',
+        ];
+
+        if (! empty($parts)) {
+            $result['street'] = $parts[0];
+            if (isset($parts[1])) {
+                // Match 4-5 digit postal codes (e.g., 1234, 12345) followed by city name
+                if (preg_match('/(\d{4,5})\s*(.+)/', $parts[1], $matches)) {
+                    $result['zip']  = $matches[1];
+                    $result['city'] = $matches[2];
+                } else {
+                    $result['city'] = $parts[1];
+                }
+            }
+        }
+
+        return $result;
+    }
+}

app/Models/Attribute.php

@@ -601,6 +601,10 @@ class Attribute extends Model
      */
     public function saveAttributeLink(int $itemId, int $definitionId, int $attributeId): bool
     {
+        if ($attributeId <= 0) {
+            return false;
+        }
+
         $normalizedItemId = empty($itemId) ? null : $itemId;
         $normalizedAttributeId = empty($attributeId) ? null : $attributeId;
 

app/Models/Item.php

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

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

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

app/Models/Sale.php

@@ -2,10 +2,10 @@
 
 namespace App\Models;
 
+use App\Libraries\Sale_lib;
 use CodeIgniter\Database\BaseBuilder;
 use CodeIgniter\Database\ResultInterface;
 use CodeIgniter\Model;
-use App\Libraries\Sale_lib;
 use Config\OSPOS;
 use ReflectionException;
 
@@ -14,11 +14,11 @@ use ReflectionException;
  */
 class Sale extends Model
 {
-    protected $table = 'sales';
-    protected $primaryKey = 'sale_id';
+    protected $table            = 'sales';
+    protected $primaryKey       = 'sale_id';
     protected $useAutoIncrement = true;
-    protected $useSoftDeletes = false;
-    protected $allowedFields = [
+    protected $useSoftDeletes   = false;
+    protected $allowedFields    = [
         'sale_time',
         'customer_id',
         'employee_id',
@@ -28,7 +28,7 @@ class Sale extends Model
         'invoice_number',
         'dinner_table_id',
         'work_order_number',
-        'sale_type'
+        'sale_type',
     ];
 
     public function __construct()
@@ -45,16 +45,16 @@ class Sale extends Model
         $config = config(OSPOS::class)->settings;
         $this->create_temp_table(['sale_id' => $sale_id]);
 
-        $decimals = totals_decimals();
-        $sales_tax = 'IFNULL(SUM(sales_items_taxes.sales_tax), 0)';
+        $decimals        = totals_decimals();
+        $sales_tax       = 'IFNULL(SUM(sales_items_taxes.sales_tax), 0)';
         $cash_adjustment = 'IFNULL(SUM(payments.sale_cash_adjustment), 0)';
-        $sale_price = 'CASE WHEN sales_items.discount_type = ' . PERCENT
-            . " THEN sales_items.quantity_purchased * sales_items.item_unit_price - ROUND(sales_items.quantity_purchased * sales_items.item_unit_price * sales_items.discount / 100, $decimals) "
+        $sale_price      = 'CASE WHEN sales_items.discount_type = ' . PERCENT
+            . " THEN sales_items.quantity_purchased * sales_items.item_unit_price - ROUND(sales_items.quantity_purchased * sales_items.item_unit_price * sales_items.discount / 100, {$decimals}) "
             . 'ELSE sales_items.quantity_purchased * (sales_items.item_unit_price - sales_items.discount) END';
 
         $sale_total = $config['tax_included']
-            ? "ROUND(SUM($sale_price), $decimals) + $cash_adjustment"
-            : "ROUND(SUM($sale_price), $decimals) + $sales_tax + $cash_adjustment";
+            ? "ROUND(SUM({$sale_price}), {$decimals}) + {$cash_adjustment}"
+            : "ROUND(SUM({$sale_price}), {$decimals}) + {$sales_tax} + {$cash_adjustment}";
 
         $sql = 'sales.sale_id AS sale_id,
                 MAX(DATE(sales.sale_time)) AS sale_date,
@@ -73,9 +73,9 @@ class Sale extends Model
                 MAX(IFnull(payments.sale_cash_adjustment, 0)) AS cash_adjustment,
                 MAX(IFnull(payments.sale_cash_refund, 0)) AS cash_refund,
                 ' . "
-                $sale_total AS amount_due,
+                {$sale_total} AS amount_due,
                 MAX(IFnull(payments.sale_payment_amount, 0)) AS amount_tendered,
-                (MAX(payments.sale_payment_amount)) - ($sale_total) AS change_due,
+                (MAX(payments.sale_payment_amount)) - ({$sale_total}) AS change_due,
                 " . '
                 MAX(payments.payment_type) AS payment_type';
 
@@ -89,7 +89,7 @@ class Sale extends Model
         $builder->join(
             'sales_items_taxes_temp AS sales_items_taxes',
             'sales_items.sale_id = sales_items_taxes.sale_id AND sales_items.item_id = sales_items_taxes.item_id AND sales_items.line = sales_items_taxes.line',
-            'LEFT OUTER'
+            'LEFT OUTER',
         );
 
         $builder->where('sales.sale_id', $sale_id);
@@ -114,15 +114,25 @@ class Sale extends Model
     public function search(?string $search, array $filters, ?int $rows = 0, ?int $limit_from = 0, ?string $sort = 'sales.sale_time', ?string $order = 'desc', ?bool $count_only = false)
     {
         // Set default values
-        if ($rows == null) $rows = 0;
-        if ($limit_from == null) $limit_from = 0;
-        if ($sort == null) $sort = 'sales.sale_time';
-        if ($order == null) $order = 'desc';
-        if ($count_only == null) $count_only = false;
+        if ($rows === null) {
+            $rows = 0;
+        }
+        if ($limit_from === null) {
+            $limit_from = 0;
+        }
+        if ($sort === null) {
+            $sort = 'sales.sale_time';
+        }
+        if ($order === null) {
+            $order = 'desc';
+        }
+        if ($count_only === null) {
+            $count_only = false;
+        }
 
-        $config = config(OSPOS::class)->settings;
+        $config    = config(OSPOS::class)->settings;
         $db_prefix = $this->db->getPrefix();
-        $decimals = totals_decimals();
+        $decimals  = totals_decimals();
 
         // Only non-suspended records
         $where = 'sales.sale_status = 0 AND ';
@@ -133,18 +143,18 @@ class Sale extends Model
         $this->create_temp_table_sales_payments_data($where);
 
         $sale_price = 'CASE WHEN `sales_items`.`discount_type` = ' . PERCENT
-            . " THEN `sales_items`.`quantity_purchased` * `sales_items`.`item_unit_price` - ROUND(`sales_items`.`quantity_purchased` * `sales_items`.`item_unit_price` * `sales_items`.`discount` / 100, $decimals) "
+            . " THEN `sales_items`.`quantity_purchased` * `sales_items`.`item_unit_price` - ROUND(`sales_items`.`quantity_purchased` * `sales_items`.`item_unit_price` * `sales_items`.`discount` / 100, {$decimals}) "
             . 'ELSE `sales_items`.`quantity_purchased` * (`sales_items`.`item_unit_price` - `sales_items`.`discount`) END';
 
         $sale_cost = 'SUM(`sales_items`.`item_cost_price` * `sales_items`.`quantity_purchased`)';
 
-        $tax = 'IFNULL(SUM(`sales_items_taxes`.`tax`), 0)';
-        $sales_tax = 'IFNULL(SUM(`sales_items_taxes`.`sales_tax`), 0)';
-        $internal_tax = 'IFNULL(SUM(`sales_items_taxes`.`internal_tax`), 0)';
+        $tax             = 'IFNULL(SUM(`sales_items_taxes`.`tax`), 0)';
+        $sales_tax       = 'IFNULL(SUM(`sales_items_taxes`.`sales_tax`), 0)';
+        $internal_tax    = 'IFNULL(SUM(`sales_items_taxes`.`internal_tax`), 0)';
         $cash_adjustment = 'IFNULL(SUM(`payments`.`sale_cash_adjustment`), 0)';
 
-        $sale_subtotal = "ROUND(SUM($sale_price), $decimals) - $internal_tax";
-        $sale_total = "ROUND(SUM($sale_price), $decimals) + $sales_tax + $cash_adjustment";
+        $sale_subtotal = "ROUND(SUM({$sale_price}), {$decimals}) - {$internal_tax}";
+        $sale_total    = "ROUND(SUM({$sale_price}), {$decimals}) + {$sales_tax} + {$cash_adjustment}";
 
         $this->create_temp_table_sales_items_taxes_data($where);
 
@@ -171,7 +181,7 @@ class Sale extends Model
                 $sale_total . ' AS amount_due',
                 'MAX(`payments`.`sale_payment_amount`) AS amount_tendered',
                 '(MAX(`payments`.`sale_payment_amount`)) - (' . $sale_total . ') AS change_due',
-                'MAX(`payments`.`payment_type`) AS payment_type'
+                'MAX(`payments`.`payment_type`) AS payment_type',
             ], false);
         }
 
@@ -182,7 +192,7 @@ class Sale extends Model
         $builder->join(
             'sales_items_taxes_temp AS sales_items_taxes',
             'sales_items.sale_id = sales_items_taxes.sale_id AND sales_items.item_id = sales_items_taxes.item_id AND sales_items.line = sales_items_taxes.line',
-            'LEFT OUTER'
+            'LEFT OUTER',
         );
 
         $builder->where($where);
@@ -227,7 +237,7 @@ class Sale extends Model
             $builder->where('sales.sale_time BETWEEN ' . $this->db->escape(rawurldecode($filters['start_date'])) . ' AND ' . $this->db->escape(rawurldecode($filters['end_date'])));
         }
 
-        if (!empty($search)) {    // TODO: duplicated code.  We should think about refactoring out a method.
+        if (! empty($search)) {    // TODO: duplicated code.  We should think about refactoring out a method.
             if ($filters['is_valid_receipt']) {
                 $pieces = explode(' ', $search);
                 $builder->where('sales.sale_id', $pieces[1]);
@@ -242,13 +252,13 @@ class Sale extends Model
         }
 
         // TODO: This needs to be converted to a switch statement
-        if ($filters['sale_type'] == 'sales') {    // TODO: we need to think about refactoring this block to a switch statement.
+        if ($filters['sale_type'] === 'sales') {    // TODO: we need to think about refactoring this block to a switch statement.
             $builder->where('sales.sale_status = ' . COMPLETED . ' AND payment_amount > 0');
-        } elseif ($filters['sale_type'] == 'quotes') {
+        } elseif ($filters['sale_type'] === 'quotes') {
             $builder->where('sales.sale_status = ' . SUSPENDED . ' AND sales.quote_number IS NOT NULL');
-        } elseif ($filters['sale_type'] == 'returns') {
+        } elseif ($filters['sale_type'] === 'returns') {
             $builder->where('sales.sale_status = ' . COMPLETED . ' AND payment_amount < 0');
-        } elseif ($filters['sale_type'] == 'all') {
+        } elseif ($filters['sale_type'] === 'all') {
             $builder->where('sales.sale_status = ' . COMPLETED);
         }
 
@@ -277,17 +287,25 @@ 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();
 
         // Consider Gift Card as only one type of payment and do not show "Gift Card: 1, Gift Card: 2, etc." in the total
-        $gift_card_count = 0;
+        $gift_card_count  = 0;
         $gift_card_amount = 0;
 
         foreach ($payments as $key => $payment) {
             if (strstr($payment['payment_type'], lang('Sales.giftcard'))) {
-                $gift_card_count  += $payment['count'];
+                $gift_card_count += $payment['count'];
                 $gift_card_amount += $payment['payment_amount'];
 
                 // Remove the "Gift Card: 1", "Gift Card: 2", etc. payment string
@@ -319,7 +337,7 @@ class Sale extends Model
     {
         $suggestions = [];
 
-        if (!$this->is_valid_receipt($search)) {
+        if (! $this->is_valid_receipt($search)) {
             $builder = $this->db->table('sales');
             $builder->distinct()->select('first_name, last_name');
             $builder->join('people', 'people.person_id = sales.customer_id');
@@ -361,21 +379,11 @@ class Sale extends Model
         return $builder->get();
     }
 
-    /**
-     * @param string $year
-     * @param int $start_from
-     * @return int
-     */
     public function get_invoice_number_for_year(string $year = '', int $start_from = 0): int
     {
         return $this->get_number_for_year('invoice_number', $year, $start_from);
     }
 
-    /**
-     * @param string $year
-     * @param int $start_from
-     * @return int
-     */
     public function get_quote_number_for_year(string $year = '', int $start_from = 0): int
     {
         return $this->get_number_for_year('quote_number', $year, $start_from);
@@ -386,31 +394,32 @@ class Sale extends Model
      */
     private function get_number_for_year(string $field, string $year = '', int $start_from = 0): int
     {
-        $year = $year == '' ? date('Y') : $year;
+        $year = $year === '' ? date('Y') : $year;
 
         $builder = $this->db->table('sales');
         $builder->select('COUNT( 1 ) AS number_year');
         $builder->where('DATE_FORMAT(sale_time, "%Y" ) = ', $year);
-        $builder->where("$field IS NOT NULL");
+        $builder->where("{$field} IS NOT NULL");
         $result = $builder->get()->getRowArray();
 
-        return ($start_from + $result['number_year']);
+        return $start_from + $result['number_year'];
     }
 
     /**
      * Checks if valid receipt
      */
-    public function is_valid_receipt(string|null &$receipt_sale_id): bool    // TODO: like the others, maybe this should be an array rather than a delimited string... either that or the parameter name needs to be changed. $receipt_sale_id implies that it's an int.
+    public function is_valid_receipt(?string &$receipt_sale_id): bool    // TODO: like the others, maybe this should be an array rather than a delimited string... either that or the parameter name needs to be changed. $receipt_sale_id implies that it's an int.
     {
         $config = config(OSPOS::class)->settings;
 
-        if (!empty($receipt_sale_id)) {
+        if (! empty($receipt_sale_id)) {
             // POS #
             $pieces = explode(' ', $receipt_sale_id);
 
-            if (count($pieces) == 2 && preg_match('/(POS)/i', $pieces[0])) {
+            if (count($pieces) === 2 && preg_match('/(POS)/i', $pieces[0])) {
                 return $this->exists($pieces[1]);
-            } elseif ($config['invoice_enable']) {
+            }
+            if ($config['invoice_enable']) {
                 $sale_info = $this->get_sale_by_invoice_number($receipt_sale_id);
 
                 if ($sale_info->getNumRows() > 0) {
@@ -432,11 +441,14 @@ class Sale extends Model
         $builder = $this->db->table('sales');
         $builder->where('sale_id', $sale_id);
 
-        return ($builder->get()->getNumRows() == 1);    // TODO: ===
+        return $builder->get()->getNumRows() === 1;    // TODO: ===
     }
 
     /**
      * Update sale
+     *
+     * @param mixed|null $sale_id
+     * @param mixed|null $sale_data
      */
     public function update($sale_id = null, $sale_data = null): bool
     {
@@ -447,7 +459,7 @@ class Sale extends Model
         $success = $builder->update($update_data);
 
         // Touch payment only if update sale is successful and there is a payments object otherwise the result would be to delete all the payments associated to the sale
-        if ($success && !empty($sale_data['payments'])) {
+        if ($success && ! empty($sale_data['payments'])) {
             // Run these queries as a transaction, we want to make sure we do all or nothing
             $this->db->transStart();
 
@@ -455,14 +467,14 @@ class Sale extends Model
 
             // Add new payments
             foreach ($sale_data['payments'] as $payment) {
-                $payment_id = $payment['payment_id'];
-                $payment_type = $payment['payment_type'];
-                $payment_amount = $payment['payment_amount'];
-                $cash_refund = $payment['cash_refund'];
+                $payment_id      = $payment['payment_id'];
+                $payment_type    = $payment['payment_type'];
+                $payment_amount  = $payment['payment_amount'];
+                $cash_refund     = $payment['cash_refund'];
                 $cash_adjustment = $payment['cash_adjustment'];
-                $employee_id = $payment['employee_id'];
+                $employee_id     = $payment['employee_id'];
 
-                if ($payment_id == NEW_ENTRY && $payment_amount != 0) {
+                if ($payment_id === NEW_ENTRY && $payment_amount !== 0) {
                     // Add a new payment transaction
                     $sales_payments_data = [
                         'sale_id'         => $sale_id,
@@ -470,17 +482,17 @@ class Sale extends Model
                         'payment_amount'  => $payment_amount,
                         'cash_refund'     => $cash_refund,
                         'cash_adjustment' => $cash_adjustment,
-                        'employee_id'     => $employee_id
+                        'employee_id'     => $employee_id,
                     ];
                     $success = $builder->insert($sales_payments_data);
-                } elseif ($payment_id != NEW_ENTRY) {
-                    if ($payment_amount != 0) {
+                } elseif ($payment_id !== NEW_ENTRY) {
+                    if ($payment_amount !== 0) {
                         // Update existing payment transactions (payment_type only)
                         $sales_payments_data = [
                             'payment_type'    => $payment_type,
                             'payment_amount'  => $payment_amount,
                             'cash_refund'     => $cash_refund,
-                            'cash_adjustment' => $cash_adjustment
+                            'cash_adjustment' => $cash_adjustment,
                         ];
 
                         $builder->where('payment_id', $payment_id);
@@ -502,6 +514,7 @@ class Sale extends Model
     /**
      * Save the sale information after the sales is complete but before the final document is printed
      * The sales_taxes variable needs to be initialized to an empty array before calling
+     *
      * @throws ReflectionException
      */
     public function save_value(
@@ -517,22 +530,22 @@ class Sale extends Model
         int $sale_type,
         ?array $payments,
         ?int $dinner_table_id,
-        ?array &$sales_taxes
+        ?array &$sales_taxes,
     ): int {    // TODO: this method returns the sale_id but the override is expecting it to return a bool. The signature needs to be reworked.  Generally when there are more than 3 maybe 4 parameters, there's a good chance that an object needs to be passed rather than so many params.
-        $config = config(OSPOS::class)->settings;
+        $config    = config(OSPOS::class)->settings;
         $attribute = model(Attribute::class);
-        $customer = model(Customer::class);
-        $giftcard = model(Giftcard::class);
+        $customer  = model(Customer::class);
+        $giftcard  = model(Giftcard::class);
         $inventory = model('Inventory');
-        $item = model(Item::class);
+        $item      = model(Item::class);
 
         $item_quantity = model(Item_quantity::class);
 
-        if ($sale_id != NEW_ENTRY) {
+        if ($sale_id !== NEW_ENTRY) {
             $this->clear_suspended_sale_detail($sale_id);
         }
 
-        if (count($items) == 0) {    // TODO: ===
+        if (count($items) === 0) {    // TODO: ===
             return -1;    // TODO: Replace -1 with a constant
         }
 
@@ -546,13 +559,13 @@ class Sale extends Model
             'quote_number'      => $quote_number,
             'work_order_number' => $work_order_number,
             'dinner_table_id'   => $dinner_table_id,
-            'sale_type'         => $sale_type
+            'sale_type'         => $sale_type,
         ];
 
         // Run these queries as a transaction, we want to make sure we do all or nothing
         $this->db->transStart();
 
-        if ($sale_id == NEW_ENTRY) {
+        if ($sale_id === NEW_ENTRY) {
             $builder = $this->db->table('sales');
             $builder->insert($sales_data);
             $sale_id = $this->db->insertID();
@@ -562,19 +575,19 @@ class Sale extends Model
             $builder->update($sales_data);
         }
 
-        $total_amount = 0;
+        $total_amount      = 0;
         $total_amount_used = 0;
 
         foreach ($payments as $payment_id => $payment) {
-            if (!empty(strstr($payment['payment_type'], lang('Sales.giftcard')))) {
+            if (! empty(strstr($payment['payment_type'], lang('Sales.giftcard')))) {
                 // We have a gift card, and we have to deduct the used value from the total value of the card.
-                $splitpayment = explode(':', $payment['payment_type']);    // TODO: this variable doesn't follow our naming conventions.  Probably should be refactored to split_payment.
+                $splitpayment       = explode(':', $payment['payment_type']);    // TODO: this variable doesn't follow our naming conventions.  Probably should be refactored to split_payment.
                 $cur_giftcard_value = $giftcard->get_giftcard_value($splitpayment[1]);    // TODO: this should be refactored to $current_giftcard_value
                 $giftcard->update_giftcard_value($splitpayment[1], $cur_giftcard_value - $payment['payment_amount']);
-            } elseif (!empty(strstr($payment['payment_type'], lang('Sales.rewards')))) {
+            } elseif (! empty(strstr($payment['payment_type'], lang('Sales.rewards')))) {
                 $cur_rewards_value = $customer->get_info($customer_id)->points;
                 $customer->update_reward_points_value($customer_id, $cur_rewards_value - $payment['payment_amount']);
-                $total_amount_used = floatval($total_amount_used) + floatval($payment['payment_amount']);
+                $total_amount_used = (float) $total_amount_used + (float) ($payment['payment_amount']);
             }
 
             $sales_payments_data = [
@@ -583,13 +596,13 @@ class Sale extends Model
                 'payment_amount'  => $payment['payment_amount'],
                 'cash_refund'     => $payment['cash_refund'],
                 'cash_adjustment' => $payment['cash_adjustment'],
-                'employee_id'     => $employee_id
+                'employee_id'     => $employee_id,
             ];
 
             $builder = $this->db->table('sales_payments');
             $builder->insert($sales_payments_data);
 
-            $total_amount = floatval($total_amount) + floatval($payment['payment_amount']) - floatval($payment['cash_refund']);
+            $total_amount = (float) $total_amount + (float) ($payment['payment_amount']) - (float) ($payment['cash_refund']);
         }
 
         $this->save_customer_rewards($customer_id, $sale_id, $total_amount, $total_amount_used);
@@ -599,7 +612,7 @@ class Sale extends Model
         foreach ($items as $line => $item_data) {
             $cur_item_info = $item->get_info($item_data['item_id']);
 
-            if ($item_data['price'] == 0.00) {
+            if ($item_data['price'] === 0.00) {
                 $item_data['discount'] = 0.00;
             }
 
@@ -615,13 +628,13 @@ class Sale extends Model
                 'item_cost_price'    => $item_data['cost_price'],
                 'item_unit_price'    => $item_data['price'],
                 'item_location'      => $item_data['item_location'],
-                'print_option'       => $item_data['print_option']
+                'print_option'       => $item_data['print_option'],
             ];
 
             $builder = $this->db->table('sales_items');
             $builder->insert($sales_items_data);
 
-            if ($cur_item_info->stock_type == HAS_STOCK && $sale_status == COMPLETED) {    // TODO: === ?
+            if ($cur_item_info->stock_type === HAS_STOCK && $sale_status === COMPLETED) {    // TODO: === ?
                 // Update stock quantity if item type is a standard stock item and the sale is a standard sale
                 $item_quantity_data = $item_quantity->get_item_quantity($item_data['item_id'], $item_data['item_location']);
 
@@ -629,10 +642,10 @@ class Sale extends Model
                     [
                         'quantity'    => $item_quantity_data->quantity - $item_data['quantity'],
                         'item_id'     => $item_data['item_id'],
-                        'location_id' => $item_data['item_location']
+                        'location_id' => $item_data['item_location'],
                     ],
                     $item_data['item_id'],
-                    $item_data['item_location']
+                    $item_data['item_location'],
                 );
 
                 // If an items was deleted but later returned it's restored with this rule
@@ -642,13 +655,13 @@ class Sale extends Model
 
                 // Inventory Count Details
                 $sale_remarks = 'POS ' . $sale_id;    // TODO: Use string interpolation here.
-                $inv_data = [
+                $inv_data     = [
                     'trans_date'      => date('Y-m-d H:i:s'),
                     'trans_items'     => $item_data['item_id'],
                     'trans_user'      => $employee_id,
                     'trans_location'  => $item_data['item_location'],
                     'trans_comment'   => $sale_remarks,
-                    'trans_inventory' => -$item_data['quantity']
+                    'trans_inventory' => -$item_data['quantity'],
                 ];
 
                 $inventory->insert($inv_data, false);
@@ -657,14 +670,14 @@ class Sale extends Model
             $attribute->copy_attribute_links($item_data['item_id'], 'sale_id', $sale_id);
         }
 
-        if ($customer_id == NEW_ENTRY || $customer->taxable) {
+        if ($customer_id === NEW_ENTRY || $customer->taxable) {
             $this->save_sales_tax($sale_id, $sales_taxes[0]);
             $this->save_sales_items_taxes($sale_id, $sales_taxes[1]);
         }
 
         if ($config['dinner_table_enable']) {
             $dinner_table = model(Dinner_table::class);
-            if ($sale_status == COMPLETED) {    // TODO: === ?
+            if ($sale_status === COMPLETED) {    // TODO: === ?
                 $dinner_table->release($dinner_table_id);
             } else {
                 $dinner_table->occupy($dinner_table_id);
@@ -713,7 +726,7 @@ class Sale extends Model
                 'item_tax_amount'   => $tax_item['item_tax_amount'],
                 'sales_tax_code_id' => $tax_item['sales_tax_code_id'],
                 'tax_category_id'   => $tax_item['tax_category_id'],
-                'jurisdiction_id'   => $tax_item['jurisdiction_id']
+                'jurisdiction_id'   => $tax_item['jurisdiction_id'],
             ];
 
             $builder->insert($sales_items_taxes);
@@ -748,8 +761,36 @@ class Sale extends Model
         return $builder->get()->getResultArray();
     }
 
+    /**
+     * Return all item taxes for a sale (for UBL invoice generation)
+     * Returns array keyed by item_id, each containing array of tax info
+     */
+    public function get_sale_item_taxes_by_sale(int $sale_id): array
+    {
+        $builder = $this->db->table('sales_items_taxes');
+        $builder->select('item_id, line, name, percent, tax_type, item_tax_amount');
+        $builder->where('sale_id', $sale_id);
+        $builder->orderBy('line', 'asc');
+
+        $results = $builder->get()->getResultArray();
+
+        // Group by item_id
+        $itemTaxes = [];
+
+        foreach ($results as $row) {
+            $itemId = $row['item_id'];
+            if (! isset($itemTaxes[$itemId])) {
+                $itemTaxes[$itemId] = [];
+            }
+            $itemTaxes[$itemId][] = $row;
+        }
+
+        return $itemTaxes;
+    }
+
     /**
      * Deletes list of sales
+     *
      * @throws ReflectionException
      */
     public function delete_list(array $sale_ids, int $employee_id, bool $update_inventory = true): bool
@@ -779,6 +820,10 @@ class Sale extends Model
      * Delete sale.  Hard deletes are not supported for sales transactions.
      * When a sale is "deleted" it is simply changed to a status of canceled.
      * However, if applicable the inventory still needs to be updated
+     *
+     * @param mixed|null $sale_id
+     * @param mixed|null $employee_id
+     *
      * @throws ReflectionException
      */
     public function delete($sale_id = null, bool $purge = false, bool $update_inventory = true, $employee_id = null): bool
@@ -788,11 +833,11 @@ class Sale extends Model
 
         $sale_status = $this->get_sale_status($sale_id);
 
-        if ($update_inventory && $sale_status == COMPLETED) {
+        if ($update_inventory && $sale_status === COMPLETED) {
             // Defect, not all item deletions will be undone?
             // Get array with all the items involved in the sale to update the inventory tracking
-            $inventory = model('Inventory');
-            $item = model(Item::class);
+            $inventory     = model('Inventory');
+            $item          = model(Item::class);
             $item_quantity = model(Item_quantity::class);
 
             $items = $this->get_sale_items($sale_id)->getResultArray();
@@ -800,7 +845,7 @@ class Sale extends Model
             foreach ($items as $item_data) {
                 $cur_item_info = $item->get_info($item_data['item_id']);
 
-                if ($cur_item_info->stock_type == HAS_STOCK) {
+                if ($cur_item_info->stock_type === HAS_STOCK) {
                     // Create query to update inventory tracking
                     $inv_data = [
                         'trans_date'      => date('Y-m-d H:i:s'),
@@ -808,7 +853,7 @@ class Sale extends Model
                         'trans_user'      => $employee_id,
                         'trans_comment'   => 'Deleting sale ' . $sale_id,
                         'trans_location'  => $item_data['item_location'],
-                        'trans_inventory' => $item_data['quantity_purchased']
+                        'trans_inventory' => $item_data['quantity_purchased'],
                     ];
                     // Update inventory
                     $inventory->insert($inv_data, false);
@@ -844,7 +889,7 @@ class Sale extends Model
     public function get_sale_items_ordered(int $sale_id): ResultInterface
     {
         $config = config(OSPOS::class)->settings;
-        $item = model(Item::class);
+        $item   = model(Item::class);
 
         $builder = $this->db->table('sales_items AS sales_items');
         $builder->select('
@@ -868,18 +913,18 @@ class Sale extends Model
         $builder->where('sales_items.sale_id', $sale_id);
 
         // Entry sequence (this will render kits in the expected sequence)
-        if ($config['line_sequence'] == '0') {    // TODO: Replace these with constants and this should be converted to a switch.
+        if ($config['line_sequence'] === '0') {    // TODO: Replace these with constants and this should be converted to a switch.
             $builder->orderBy('line', 'asc');
         }
         // Group by Stock Type (nonstock first - type 1, stock next - type 0)
-        elseif ($config['line_sequence'] == '1') {
+        elseif ($config['line_sequence'] === '1') {
             $builder->orderBy('stock_type', 'desc');
             $builder->orderBy('sales_items.description', 'asc');
             $builder->orderBy('items.name', 'asc');
             $builder->orderBy('items.qty_per_pack', 'asc');
         }
         // Group by Item Category
-        elseif ($config['line_sequence'] == '2') {
+        elseif ($config['line_sequence'] === '2') {
             $builder->orderBy('category', 'asc');
             $builder->orderBy('sales_items.description', 'asc');
             $builder->orderBy('items.name', 'asc');
@@ -919,8 +964,8 @@ class Sale extends Model
             $payments[lang('Sales.rewards')] = lang('Sales.rewards');
         }
         $sale_lib = new Sale_lib();
-        if ($sale_lib->get_mode() == 'sale_work_order') {
-            $payments[lang('Sales.cash_deposit')] = lang('Sales.cash_deposit');
+        if ($sale_lib->get_mode() === 'sale_work_order') {
+            $payments[lang('Sales.cash_deposit')]   = lang('Sales.cash_deposit');
             $payments[lang('Sales.credit_deposit')] = lang('Sales.credit_deposit');
         }
 
@@ -961,11 +1006,11 @@ class Sale extends Model
         $builder = $this->db->table('sales');
         $builder->where('quote_number', $quote_number);
 
-        if (!empty($sale_id)) {
+        if (! empty($sale_id)) {
             $builder->where('sale_id !=', $sale_id);
         }
 
-        return ($builder->get()->getNumRows() == 1);    // TODO: ===
+        return $builder->get()->getNumRows() === 1;    // TODO: ===
     }
 
     /**
@@ -976,11 +1021,11 @@ class Sale extends Model
         $builder = $this->db->table('sales');
         $builder->where('invoice_number', $invoice_number);
 
-        if (!empty($sale_id)) {
+        if (! empty($sale_id)) {
             $builder->where('sale_id !=', $sale_id);
         }
 
-        return ($builder->get()->getNumRows() == 1);    // TODO: ===
+        return $builder->get()->getNumRows() === 1;    // TODO: ===
     }
 
     /**
@@ -990,11 +1035,11 @@ class Sale extends Model
     {
         $builder = $this->db->table('sales');
         $builder->where('invoice_number', $work_order_number);
-        if (!empty($sale_id)) {
+        if (! empty($sale_id)) {
             $builder->where('sale_id !=', $sale_id);
         }
 
-        return ($builder->get()->getNumRows() == 1);    // TODO: ===
+        return $builder->get()->getNumRows() === 1;    // TODO: ===
     }
 
     /**
@@ -1004,7 +1049,7 @@ class Sale extends Model
     {
         $giftcard = model(Giftcard::class);
 
-        if (!$giftcard->exists($giftcard->get_giftcard_id($giftcardNumber))) {    // TODO: camelCase is used here for the variable name but we are using _ everywhere else. CI4 moved to camelCase... we should pick one and do that.
+        if (! $giftcard->exists($giftcard->get_giftcard_id($giftcardNumber))) {    // TODO: camelCase is used here for the variable name but we are using _ everywhere else. CI4 moved to camelCase... we should pick one and do that.
             return 0;
         }
 
@@ -1035,22 +1080,22 @@ class Sale extends Model
         $decimals = totals_decimals();
 
         $sale_price = 'CASE WHEN sales_items.discount_type = ' . PERCENT
-            . " THEN sales_items.quantity_purchased * sales_items.item_unit_price - ROUND(sales_items.quantity_purchased * sales_items.item_unit_price * sales_items.discount / 100, $decimals) "
+            . " THEN sales_items.quantity_purchased * sales_items.item_unit_price - ROUND(sales_items.quantity_purchased * sales_items.item_unit_price * sales_items.discount / 100, {$decimals}) "
             . 'ELSE sales_items.quantity_purchased * (sales_items.item_unit_price - sales_items.discount) END';
 
         $sale_cost = 'SUM(sales_items.item_cost_price * sales_items.quantity_purchased)';
 
-        $tax = 'IFNULL(SUM(sales_items_taxes.tax), 0)';
-        $sales_tax = 'IFNULL(SUM(sales_items_taxes.sales_tax), 0)';
-        $internal_tax = 'IFNULL(SUM(sales_items_taxes.internal_tax), 0)';
+        $tax             = 'IFNULL(SUM(sales_items_taxes.tax), 0)';
+        $sales_tax       = 'IFNULL(SUM(sales_items_taxes.sales_tax), 0)';
+        $internal_tax    = 'IFNULL(SUM(sales_items_taxes.internal_tax), 0)';
         $cash_adjustment = 'IFNULL(SUM(payments.sale_cash_adjustment), 0)';
 
         if ($config['tax_included']) {
-            $sale_total = "ROUND(SUM($sale_price), $decimals) + $cash_adjustment";
-            $sale_subtotal = "$sale_total - $internal_tax";
+            $sale_total    = "ROUND(SUM({$sale_price}), {$decimals}) + {$cash_adjustment}";
+            $sale_subtotal = "{$sale_total} - {$internal_tax}";
         } else {
-            $sale_subtotal = "ROUND(SUM($sale_price), $decimals) - $internal_tax + $cash_adjustment";
-            $sale_total = "ROUND(SUM($sale_price), $decimals) + $sales_tax + $cash_adjustment";
+            $sale_subtotal = "ROUND(SUM({$sale_price}), {$decimals}) - {$internal_tax} + {$cash_adjustment}";
+            $sale_total    = "ROUND(SUM({$sale_price}), {$decimals}) + {$sales_tax} + {$cash_adjustment}";
         }
 
         // Create a temporary table to contain all the sum of taxes per sale item
@@ -1092,7 +1137,7 @@ class Sale extends Model
 
         $this->db->query($sql);
         $item = model(Item::class);
-        $sql = 'CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->prefixTable('sales_items_temp') .
+        $sql  = 'CREATE TEMPORARY TABLE IF NOT EXISTS ' . $this->db->prefixTable('sales_items_temp') .
             ' (INDEX(sale_date), INDEX(sale_time), INDEX(sale_id))
             (
                 SELECT
@@ -1114,7 +1159,7 @@ class Sale extends Model
                     MAX(sales.employee_id) AS employee_id,
                     MAX(CONCAT(employee.first_name, " ", employee.last_name)) AS employee_name,
                     items.item_id AS item_id,
-                    MAX(' . $item->get_item_name() . ') AS name,
+                    MAX(' . $item->get_item_name() . ") AS name,
                     MAX(items.item_number) AS item_number,
                     MAX(items.category) AS category,
                     MAX(items.supplier_id) AS supplier_id,
@@ -1129,12 +1174,12 @@ class Sale extends Model
                     MAX(sales_items.description) AS description,
                     MAX(payments.payment_type) AS payment_type,
                     MAX(payments.sale_payment_amount) AS sale_payment_amount,
-                    ' . "
-                    $sale_subtotal AS subtotal,
-                    $tax AS tax,
-                    $sale_total AS total,
-                    $sale_cost AS cost,
-                    ($sale_subtotal - $sale_cost) AS profit
+
+                    {$sale_subtotal} AS subtotal,
+                    {$tax} AS tax,
+                    {$sale_total} AS total,
+                    {$sale_cost} AS cost,
+                    ({$sale_subtotal} - {$sale_cost}) AS profit
                     " . '
                 FROM ' . $this->db->prefixTable('sales_items') . ' AS sales_items
                 INNER JOIN ' . $this->db->prefixTable('sales') . ' AS sales
@@ -1165,7 +1210,7 @@ class Sale extends Model
      */
     public function get_all_suspended(?int $customer_id = null): array
     {
-        if ($customer_id == NEW_ENTRY) {
+        if ($customer_id === NEW_ENTRY) {
             $query = $this->db->query("SELECT sale_id, case when sale_type = '" . SALE_TYPE_QUOTE . "' THEN quote_number WHEN sale_type = '" . SALE_TYPE_WORK_ORDER . "' THEN work_order_number else sale_id end as doc_id, sale_id as suspended_sale_id, sale_status, sale_time, dinner_table_id, customer_id, employee_id, comment FROM "
                 . $this->db->prefixTable('sales') . ' where sale_status = ' . SUSPENDED);
         } else {
@@ -1181,7 +1226,7 @@ class Sale extends Model
      */
     public function get_dinner_table(int $sale_id)    // TODO: this is returning null or the table_id.  We can keep it this way but multiple return types can't be declared until PHP 8.x
     {
-        if ($sale_id == NEW_ENTRY) {
+        if ($sale_id === NEW_ENTRY) {
             return null;
         }
 
@@ -1213,11 +1258,6 @@ class Sale extends Model
         return $builder->get()->getRow()->sale_status;
     }
 
-    /**
-     * @param int $sale_id
-     * @param int $sale_status
-     * @return void
-     */
     public function update_sale_status(int $sale_id, int $sale_status): void
     {
         $builder = $this->db->table('sales');
@@ -1236,7 +1276,7 @@ class Sale extends Model
 
         $row = $builder->get()->getRow();
 
-        if ($row != null) {
+        if ($row !== null) {
             return $row->quote_number;
         }
 
@@ -1253,7 +1293,7 @@ class Sale extends Model
 
         $row = $builder->get()->getRow();
 
-        if ($row != null) {    // TODO: === ?
+        if ($row !== null) {    // TODO: === ?
             return $row->work_order_number;
         }
 
@@ -1270,7 +1310,7 @@ class Sale extends Model
 
         $row = $builder->get()->getRow();
 
-        if ($row != null) {    // TODO: === ?
+        if ($row !== null) {    // TODO: === ?
             return $row->comment;
         }
 
@@ -1300,7 +1340,7 @@ class Sale extends Model
         $config = config(OSPOS::class)->settings;
 
         if ($config['dinner_table_enable']) {
-            $dinner_table = model(Dinner_table::class);
+            $dinner_table    = model(Dinner_table::class);
             $dinner_table_id = $this->get_dinner_table($sale_id);
             $dinner_table->release($dinner_table_id);
         }
@@ -1322,7 +1362,7 @@ class Sale extends Model
         $config = config(OSPOS::class)->settings;
 
         if ($config['dinner_table_enable']) {
-            $dinner_table = model(Dinner_table::class);
+            $dinner_table    = model(Dinner_table::class);
             $dinner_table_id = $this->get_dinner_table($sale_id);
             $dinner_table->release($dinner_table_id);
         }
@@ -1357,30 +1397,24 @@ class Sale extends Model
         return $builder->get();
     }
 
-    /**
-     * @param int $customer_id
-     * @param int $sale_id
-     * @param float $total_amount
-     * @param float $total_amount_used
-     */
     private function save_customer_rewards(int $customer_id, int $sale_id, float $total_amount, float $total_amount_used): void
     {
         $config = config(OSPOS::class)->settings;
 
-        if (!empty($customer_id) && $config['customer_reward_enable']) {
-            $customer = model(Customer::class);
+        if (! empty($customer_id) && $config['customer_reward_enable']) {
+            $customer         = model(Customer::class);
             $customer_rewards = model(Customer_rewards::class);
-            $rewards = model(Rewards::class);
+            $rewards          = model(Rewards::class);
 
             $package_id = $customer->get_info($customer_id)->package_id;
 
-            if (!empty($package_id)) {
-                $points_percent = $customer_rewards->get_points_percent($package_id);
-                $points = $customer->get_info($customer_id)->points;
-                $points = ($points == null ? 0 : $points);
-                $points_percent = ($points_percent == null ? 0 : $points_percent);
+            if (! empty($package_id)) {
+                $points_percent      = $customer_rewards->get_points_percent($package_id);
+                $points              = $customer->get_info($customer_id)->points;
+                $points              = ($points === null ? 0 : $points);
+                $points_percent      = ($points_percent === null ? 0 : $points_percent);
                 $total_amount_earned = ($total_amount * $points_percent / 100);
-                $points = $points + $total_amount_earned;
+                $points += $total_amount_earned;
 
                 $customer->update_reward_points_value($customer_id, $points);
 
@@ -1394,7 +1428,6 @@ class Sale extends Model
     /**
      * Creates a temporary table to store the sales_payments data
      *
-     * @param string $where
      * @return array
      */
     private function create_temp_table_sales_payments_data(string $where): void
@@ -1404,7 +1437,7 @@ class Sale extends Model
             'payments.sale_id',
             'SUM(CASE WHEN `payments`.`cash_adjustment` = 0 THEN `payments`.`payment_amount` ELSE 0 END) AS sale_payment_amount',
             'SUM(CASE WHEN `payments`.`cash_adjustment` = 1 THEN `payments`.`payment_amount` ELSE 0 END) AS sale_cash_adjustment',
-            'GROUP_CONCAT(CONCAT(`payments`.`payment_type`, " ", (`payments`.`payment_amount` - `payments`.`cash_refund`)) SEPARATOR ", ") AS payment_type'
+            'GROUP_CONCAT(CONCAT(`payments`.`payment_type`, " ", (`payments`.`payment_amount` - `payments`.`cash_refund`)) SEPARATOR ", ") AS payment_type',
         ]);
         $builder->join('sales', 'sales.sale_id = payments.sale_id', 'inner');
         $builder->where($where);
@@ -1421,12 +1454,10 @@ class Sale extends Model
     /**
      * Temporary table to store the sales_items_taxes data
      *
-     * @param string $where
-     * @return \CodeIgniter\Database\BaseBuilder
+     * @return BaseBuilder
      */
     private function create_temp_table_sales_items_taxes_data(string $where): void
     {
-
         $builder = $this->db->table('sales_items_taxes AS sales_items_taxes');
         $builder->select([
             'sales_items_taxes.sale_id AS sale_id',
@@ -1434,7 +1465,7 @@ class Sale extends Model
             'sales_items_taxes.line AS line',
             'SUM(sales_items_taxes.item_tax_amount) AS tax',
             'SUM(CASE WHEN sales_items_taxes.tax_type = 0 THEN sales_items_taxes.item_tax_amount ELSE 0 END) AS internal_tax',
-            'SUM(CASE WHEN sales_items_taxes.tax_type = 1 THEN sales_items_taxes.item_tax_amount ELSE 0 END) AS sales_tax'
+            'SUM(CASE WHEN sales_items_taxes.tax_type = 1 THEN sales_items_taxes.item_tax_amount ELSE 0 END) AS sales_tax',
         ]);
         $builder->join('sales', 'sales.sale_id = sales_items_taxes.sale_id', 'inner');
         $builder->join('sales_items', 'sales_items.sale_id = sales_items_taxes.sale_id AND sales_items.line = sales_items_taxes.line', 'inner');
@@ -1447,15 +1478,9 @@ class Sale extends Model
             . ' (INDEX(sale_id), INDEX(item_id)) ENGINE=MEMORY AS (' . $sub_query . ')');
     }
 
-    /**
-     * @param string $search
-     * @param array $filters
-     * @param BaseBuilder $builder
-     * @return void
-     */
     private function add_filters_to_query(?string $search, array $filters, BaseBuilder $builder): void
     {
-        if (!empty($search)) {    // TODO: this is duplicated code.  We should think about refactoring out a method
+        if (! empty($search)) {    // TODO: this is duplicated code.  We should think about refactoring out a method
             if ($filters['is_valid_receipt']) {
                 $pieces = explode(' ', $search);
                 $builder->where('sales.sale_id', $pieces[1]);
@@ -1473,16 +1498,15 @@ class Sale extends Model
             }
         }
 
-        if ($filters['location_id'] != 'all') {
+        if ($filters['location_id'] !== 'all') {
             $builder->where('sales_items.item_location', $filters['location_id']);
         }
 
-        if ($filters['selected_customer'] != false) {
+        if ($filters['selected_customer'] !== false) {
             $sale_lib = new Sale_lib();
             $builder->where('sales.customer_id', $sale_lib->get_customer());
         }
 
-
         if ($filters['only_invoices']) {
             $builder->where('sales.invoice_number IS NOT NULL');
         }
@@ -1509,5 +1533,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'));
+        }
     }
 }

app/Views/barcodes/barcode_sheet.php

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

app/Views/configs/barcode_config.php

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

app/Views/configs/email_config.php

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

app/Views/configs/info_config.php

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

app/Views/configs/manage.php

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

app/Views/configs/shortcuts_config.php

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

app/Views/configs/system_info.php

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

app/Views/configs/tax_config.php

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

app/Views/errors/html/debug.css

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

app/Views/login.php

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

app/Views/partial/header.php

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

app/Views/sales/help.php

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

app/Views/sales/invoice.php

@@ -69,6 +69,7 @@ if (isset($error_message)) {
             <div class="btn btn-info btn-sm" id="show_email_button"><?= '<span class="glyphicon glyphicon-envelope">&nbsp;</span>' . lang('Sales.send_invoice') ?></div>
         </a>
     <?php endif; ?>
+    <?= anchor("sales/ublInvoice/$sale_id_num", '<span class="glyphicon glyphicon-download">&nbsp;</span>' . lang('Sales.download_ubl'), ['class' => 'btn btn-info btn-sm']) ?>
     <?= anchor("sales", '<span class="glyphicon glyphicon-shopping-cart">&nbsp;</span>' . lang('Sales.register'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_sales_button']) ?>
     <?= anchor("sales/manage", '<span class="glyphicon glyphicon-list-alt">&nbsp;</span>' . lang('Sales.takings'), ['class' => 'btn btn-info btn-sm', 'id' => 'show_takings_button']) ?>
 </div>

app/Views/sales/quote_email.php

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

app/Views/sales/receipt.php

@@ -2,11 +2,14 @@
 /**
  * @var int $sale_id_num
  * @var bool $print_after_sale
+ * @var string $receipt_template_view
  * @var array $config
  */
 
 use App\Models\Employee;
 
+$template = $receipt_template_view ?? 'receipt_default';
+
 ?>
 
 <?= view('partial/header') ?>
@@ -61,6 +64,6 @@ if (isset($error_message)) {
     <?php endif; ?>
 </div>
 
-<?= view('sales/' . $config['receipt_template']) ?>
+<?= view('sales/' . $template) ?>
 
 <?= view('partial/footer') ?>

app/Views/sales/register.php

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

app/Views/sales/work_order_email.php

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

composer.json

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

docker-compose.dev.yml

@@ -46,6 +46,7 @@ services:
             - .:/app
         environment:
             - CI_ENVIRONMENT=development
+            - ALLOWED_HOSTNAMES=localhost
             - MYSQL_USERNAME=admin
             - MYSQL_PASSWORD=pointofsale
             - MYSQL_DB_NAME=ospos

docker-compose.yml

@@ -16,6 +16,7 @@ services:
             - logs:/app/writable/logs
         environment:
             - CI_ENVIRONMENT=production
+            - ALLOWED_HOSTNAMES=localhost
             - FORCE_HTTPS=false
             - PHP_TIMEZONE=UTC
             - MYSQL_USERNAME=admin

gulpfile.js

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

package.json

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

public/index.php

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

spark

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

tests/Config/AppTest.php

@@ -18,6 +18,7 @@ class AppTest extends CIUnitTestCase
         // Clean up environment
         putenv('CI_ENVIRONMENT');
         putenv('app.allowedHostnames');
+        putenv('ALLOWED_HOSTNAMES');
         unset($_SERVER['HTTP_HOST']);
     }
 
@@ -281,4 +282,106 @@ class AppTest extends CIUnitTestCase
         putenv('app.allowedHostnames');
         putenv('CI_ENVIRONMENT');
     }
+
+    public function testAllowedHostnamesEnvVarParsedAsCommaSeparated(): void
+    {
+        // Set ALLOWED_HOSTNAMES environment variable
+        putenv('ALLOWED_HOSTNAMES=example.com,www.example.com,demo.example.com');
+
+        $_SERVER['HTTP_HOST'] = 'www.example.com';
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
+        $_SERVER['HTTPS'] = null;
+
+        $app = new App();
+
+        // Constructor should parse comma-separated values
+        $this->assertEquals(['example.com', 'www.example.com', 'demo.example.com'], $app->allowedHostnames);
+        $this->assertStringContainsString('www.example.com', $app->baseURL);
+
+        // Clean up
+        putenv('ALLOWED_HOSTNAMES');
+    }
+
+    public function testAllowedHostnamesEnvVarTakesPrecedenceOverDotEnv(): void
+    {
+        // Set both environment variables
+        putenv('ALLOWED_HOSTNAMES=allowed1.com,allowed2.com');
+        putenv('app.allowedHostnames=dotenv1.com,dotenv2.com');
+
+        $_SERVER['HTTP_HOST'] = 'allowed1.com';
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
+        $_SERVER['HTTPS'] = null;
+
+        $app = new App();
+
+        // ALLOWED_HOSTNAMES should take precedence
+        $this->assertEquals(['allowed1.com', 'allowed2.com'], $app->allowedHostnames);
+        $this->assertStringContainsString('allowed1.com', $app->baseURL);
+
+        // Clean up
+        putenv('ALLOWED_HOSTNAMES');
+        putenv('app.allowedHostnames');
+    }
+
+    public function testAllowedHostnamesEnvVarFallsBackToDotEnv(): void
+    {
+        // Only set app.allowedHostnames, not ALLOWED_HOSTNAMES
+        putenv('app.allowedHostnames=dotenv1.com,dotenv2.com');
+
+        $_SERVER['HTTP_HOST'] = 'dotenv1.com';
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
+        $_SERVER['HTTPS'] = null;
+
+        $app = new App();
+
+        // Should fall back to app.allowedHostnames
+        $this->assertEquals(['dotenv1.com', 'dotenv2.com'], $app->allowedHostnames);
+        $this->assertStringContainsString('dotenv1.com', $app->baseURL);
+
+        // Clean up
+        putenv('app.allowedHostnames');
+    }
+
+    public function testAllowedHostnamesEnvVarTrimmedWhitespace(): void
+    {
+        // Set environment variable with whitespace
+        putenv('ALLOWED_HOSTNAMES= example.com , www.example.com , demo.example.com ');
+
+        $_SERVER['HTTP_HOST'] = 'example.com';
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
+        $_SERVER['HTTPS'] = null;
+
+        $app = new App();
+
+        // Values should be trimmed
+        $this->assertEquals(['example.com', 'www.example.com', 'demo.example.com'], $app->allowedHostnames);
+
+        // Clean up
+        putenv('ALLOWED_HOSTNAMES');
+    }
+
+    public function testAllowedHostnamesEnvVarFiltersEmptyEntries(): void
+    {
+        // Trailing comma should not produce empty entry
+        putenv('ALLOWED_HOSTNAMES=example.com,');
+        $_SERVER['HTTP_HOST'] = 'example.com';
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
+        $_SERVER['HTTPS'] = null;
+
+        $app = new App();
+        $this->assertEquals(['example.com'], $app->allowedHostnames);
+
+        // Clean up
+        putenv('ALLOWED_HOSTNAMES');
+
+        // Whitespace-only entry should be filtered
+        putenv('ALLOWED_HOSTNAMES=example.com, ,www.example.com');
+        $_SERVER['HTTP_HOST'] = 'example.com';
+
+        $app = new App();
+        $this->assertEquals(['example.com', 'www.example.com'], $app->allowedHostnames);
+
+        // Clean up
+        putenv('ALLOWED_HOSTNAMES');
+    }
 }

tests/Libraries/InvoiceAttachment/InvoiceAttachmentGeneratorTest.php

@@ -0,0 +1,121 @@
+<?php
+
+namespace Tests\Libraries\InvoiceAttachment;
+
+use CodeIgniter\Test\CIUnitTestCase;
+use App\Libraries\InvoiceAttachment\InvoiceAttachmentGenerator;
+use App\Libraries\InvoiceAttachment\InvoiceAttachment;
+use App\Libraries\InvoiceAttachment\PdfAttachment;
+use App\Libraries\InvoiceAttachment\UblAttachment;
+
+class InvoiceAttachmentGeneratorTest extends CIUnitTestCase
+{
+    public function testCreateFromConfigPdfOnly(): void
+    {
+        $generator = InvoiceAttachmentGenerator::createFromConfig('pdf_only');
+        $this->assertInstanceOf(InvoiceAttachmentGenerator::class, $generator);
+    }
+
+    public function testCreateFromConfigUblOnly(): void
+    {
+        $generator = InvoiceAttachmentGenerator::createFromConfig('ubl_only');
+        $this->assertInstanceOf(InvoiceAttachmentGenerator::class, $generator);
+    }
+
+    public function testCreateFromConfigBoth(): void
+    {
+        $generator = InvoiceAttachmentGenerator::createFromConfig('both');
+        $this->assertInstanceOf(InvoiceAttachmentGenerator::class, $generator);
+    }
+
+    public function testCreateFromConfigPdfOnlyRegistersPdfAttachment(): void
+    {
+        $generator = InvoiceAttachmentGenerator::createFromConfig('pdf_only');
+        $attachments = $this->getPrivateProperty($generator, 'attachments');
+        
+        $this->assertCount(1, $attachments);
+        $this->assertInstanceOf(PdfAttachment::class, $attachments[0]);
+    }
+
+    public function testCreateFromConfigUblOnlyRegistersUblAttachment(): void
+    {
+        $generator = InvoiceAttachmentGenerator::createFromConfig('ubl_only');
+        $attachments = $this->getPrivateProperty($generator, 'attachments');
+        
+        $this->assertCount(1, $attachments);
+        $this->assertInstanceOf(UblAttachment::class, $attachments[0]);
+    }
+
+    public function testCreateFromConfigBothRegistersBothAttachments(): void
+    {
+        $generator = InvoiceAttachmentGenerator::createFromConfig('both');
+        $attachments = $this->getPrivateProperty($generator, 'attachments');
+        
+        $this->assertCount(2, $attachments);
+        $this->assertInstanceOf(PdfAttachment::class, $attachments[0]);
+        $this->assertInstanceOf(UblAttachment::class, $attachments[1]);
+    }
+
+    public function testRegisterAddsAttachment(): void
+    {
+        $generator = new InvoiceAttachmentGenerator();
+        $mockAttachment = new class implements InvoiceAttachment {
+            public function generate(array $saleData, string $type): ?string { return null; }
+            public function isApplicableForType(string $type, array $saleData): bool { return true; }
+            public function getFileExtension(): string { return 'test'; }
+            public function getEnabledConfigValues(): array { return ['test']; }
+        };
+        
+        $result = $generator->register($mockAttachment);
+        
+        $this->assertSame($generator, $result);
+        $attachments = $this->getPrivateProperty($generator, 'attachments');
+        $this->assertCount(1, $attachments);
+    }
+
+    public function testRegisterIsChainable(): void
+    {
+        $generator = new InvoiceAttachmentGenerator();
+        $mockAttachment = new class implements InvoiceAttachment {
+            public function generate(array $saleData, string $type): ?string { return null; }
+            public function isApplicableForType(string $type, array $saleData): bool { return true; }
+            public function getFileExtension(): string { return 'test'; }
+            public function getEnabledConfigValues(): array { return ['test']; }
+        };
+        
+        $result = $generator->register($mockAttachment)->register($mockAttachment);
+        
+        $attachments = $this->getPrivateProperty($result, 'attachments');
+        $this->assertCount(2, $attachments);
+    }
+
+    public function testGenerateAttachmentsReturnsEmptyArrayWhenNoAttachmentsRegistered(): void
+    {
+        $generator = new InvoiceAttachmentGenerator();
+        $result = $generator->generateAttachments([], 'invoice');
+        
+        $this->assertIsArray($result);
+        $this->assertEmpty($result);
+    }
+
+    public function testCleanupRemovesFiles(): void
+    {
+        $tempFile1 = tempnam(sys_get_temp_dir(), 'test_');
+        $tempFile2 = tempnam(sys_get_temp_dir(), 'test_');
+        
+        $this->assertFileExists($tempFile1);
+        $this->assertFileExists($tempFile2);
+        
+        InvoiceAttachmentGenerator::cleanup([$tempFile1, $tempFile2]);
+        
+        $this->assertFileDoesNotExist($tempFile1);
+        $this->assertFileDoesNotExist($tempFile2);
+    }
+
+    public function testCleanupHandlesNonExistentFiles(): void
+    {
+        // Should not throw an exception
+        InvoiceAttachmentGenerator::cleanup(['/non/existent/file1', '/non/existent/file2']);
+        $this->assertTrue(true);
+    }
+}

tests/Libraries/InvoiceAttachment/PdfAttachmentTest.php

@@ -0,0 +1,70 @@
+<?php
+
+namespace Tests\Libraries\InvoiceAttachment;
+
+use CodeIgniter\Test\CIUnitTestCase;
+use App\Libraries\InvoiceAttachment\PdfAttachment;
+
+class PdfAttachmentTest extends CIUnitTestCase
+{
+    private PdfAttachment $attachment;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->attachment = new PdfAttachment();
+    }
+
+    public function testGetFileExtensionReturnsPdf(): void
+    {
+        $this->assertEquals('pdf', $this->attachment->getFileExtension());
+    }
+
+    public function testGetEnabledConfigValuesReturnsCorrectArray(): void
+    {
+        $values = $this->attachment->getEnabledConfigValues();
+        
+        $this->assertIsArray($values);
+        $this->assertContains('pdf_only', $values);
+        $this->assertContains('both', $values);
+        $this->assertCount(2, $values);
+    }
+
+    public function testIsApplicableForTypeReturnsTrueForInvoice(): void
+    {
+        $this->assertTrue($this->attachment->isApplicableForType('invoice', []));
+    }
+
+    public function testIsApplicableForTypeReturnsTrueForTaxInvoice(): void
+    {
+        $this->assertTrue($this->attachment->isApplicableForType('tax_invoice', []));
+    }
+
+    public function testIsApplicableForTypeReturnsTrueForQuote(): void
+    {
+        $this->assertTrue($this->attachment->isApplicableForType('quote', []));
+    }
+
+    public function testIsApplicableForTypeReturnsTrueForWorkOrder(): void
+    {
+        $this->assertTrue($this->attachment->isApplicableForType('work_order', []));
+    }
+
+    public function testIsApplicableForTypeReturnsTrueForReceipt(): void
+    {
+        $this->assertTrue($this->attachment->isApplicableForType('receipt', []));
+    }
+
+    public function testIsApplicableForTypeReturnsTrueForAnyType(): void
+    {
+        // PDF should work for any document type
+        $this->assertTrue($this->attachment->isApplicableForType('random_type', []));
+    }
+
+    public function testIsApplicableForTypeIgnoresSaleData(): void
+    {
+        // PDF attachment doesn't depend on invoice_number
+        $this->assertTrue($this->attachment->isApplicableForType('invoice', ['invoice_number' => null]));
+        $this->assertTrue($this->attachment->isApplicableForType('invoice', ['invoice_number' => 'INV-001']));
+    }
+}

tests/Libraries/InvoiceAttachment/UblAttachmentTest.php

@@ -0,0 +1,103 @@
+<?php
+
+namespace Tests\Libraries\InvoiceAttachment;
+
+use CodeIgniter\Test\CIUnitTestCase;
+use App\Libraries\InvoiceAttachment\UblAttachment;
+
+class UblAttachmentTest extends CIUnitTestCase
+{
+    private UblAttachment $attachment;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->attachment = new UblAttachment();
+    }
+
+    public function testGetFileExtensionReturnsXml(): void
+    {
+        $this->assertEquals('xml', $this->attachment->getFileExtension());
+    }
+
+    public function testGetEnabledConfigValuesReturnsCorrectArray(): void
+    {
+        $values = $this->attachment->getEnabledConfigValues();
+        
+        $this->assertIsArray($values);
+        $this->assertContains('ubl_only', $values);
+        $this->assertContains('both', $values);
+        $this->assertCount(2, $values);
+    }
+
+    public function testIsApplicableForTypeReturnsTrueForInvoiceWithInvoiceNumber(): void
+    {
+        $saleData = ['invoice_number' => 'INV-001'];
+        
+        $this->assertTrue($this->attachment->isApplicableForType('invoice', $saleData));
+    }
+
+    public function testIsApplicableForTypeReturnsTrueForTaxInvoiceWithInvoiceNumber(): void
+    {
+        $saleData = ['invoice_number' => 'INV-001'];
+        
+        $this->assertTrue($this->attachment->isApplicableForType('tax_invoice', $saleData));
+    }
+
+    public function testIsApplicableForTypeReturnsFalseForInvoiceWithoutInvoiceNumber(): void
+    {
+        $saleData = ['invoice_number' => null];
+        
+        $this->assertFalse($this->attachment->isApplicableForType('invoice', $saleData));
+    }
+
+    public function testIsApplicableForTypeReturnsFalseForInvoiceWithEmptyInvoiceNumber(): void
+    {
+        $saleData = ['invoice_number' => ''];
+        
+        $this->assertFalse($this->attachment->isApplicableForType('invoice', $saleData));
+    }
+
+    public function testIsApplicableForTypeReturnsFalseForInvoiceWithoutInvoiceNumberKey(): void
+    {
+        $saleData = [];
+        
+        $this->assertFalse($this->attachment->isApplicableForType('invoice', $saleData));
+    }
+
+    public function testIsApplicableForTypeReturnsFalseForQuoteEvenWithInvoiceNumber(): void
+    {
+        $saleData = ['invoice_number' => 'INV-001'];
+        
+        $this->assertFalse($this->attachment->isApplicableForType('quote', $saleData));
+    }
+
+    public function testIsApplicableForTypeReturnsFalseForWorkOrderEvenWithInvoiceNumber(): void
+    {
+        $saleData = ['invoice_number' => 'INV-001'];
+        
+        $this->assertFalse($this->attachment->isApplicableForType('work_order', $saleData));
+    }
+
+    public function testIsApplicableForTypeReturnsFalseForReceiptEvenWithInvoiceNumber(): void
+    {
+        $saleData = ['invoice_number' => 'INV-001'];
+        
+        $this->assertFalse($this->attachment->isApplicableForType('receipt', $saleData));
+    }
+
+    public function testIsApplicableForTypeReturnsFalseForUnknownType(): void
+    {
+        $saleData = ['invoice_number' => 'INV-001'];
+        
+        $this->assertFalse($this->attachment->isApplicableForType('unknown_type', $saleData));
+    }
+
+    public function testGenerateReturnsNullForMissingConfig(): void
+    {
+        // Without proper sale_data, generate should fail gracefully
+        $result = $this->attachment->generate([], 'invoice');
+        
+        $this->assertNull($result);
+    }
+}