Merge branch 'master' into fix/4554-encryption-docker-issue

fix: cast string returns to int in MY_Migration (#4560 )
basename() returns string and database column values are strings, but get_latest_migration() and get_current_version() declare int return types. PHP 8.0+ enforces strict return types and no longer silently coerces strings to int, causing a TypeError on fresh installs. Fixes #4559 Co-authored-by: Ollama <ollama@steganos.dev>
2026-05-25 08:44:42 -04:00 · 2026-05-22 16:08:37 +02:00 · 2026-05-22 16:07:21 +02:00 · 2026-05-22 14:57:37 +02:00 · 2026-05-22 01:38:30 +02:00 · 2026-05-22 01:28:35 +02:00
18 changed files with 4571 additions and 5254 deletions
--- a/app/Config/Encryption.php
+++ b/app/Config/Encryption.php
@@ -106,4 +106,54 @@ class Encryption extends BaseConfig
     * by CI3 Encryption default configuration.
     */
    public string $cipher = 'AES-256-CTR';
+
+    /**
+     * Constructor - loads encryption key from fallback location if not set.
+     *
+     * This supports Docker/container environments where ROOTPATH/.env may be
+     * read-only or ephemeral. The fallback key file is stored in WRITEPATH/config/.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+
+        // If key not set from .env or environment, try WRITEPATH fallback
+        if (empty($this->key) || strlen($this->key) < 64) {
+            $fallbackKey = $this->loadKeyFromWritable();
+            if ($fallbackKey !== null) {
+                $this->key = $fallbackKey;
+            }
+        }
+    }
+
+    /**
+     * Loads encryption key from WRITEPATH/config/encryption.key.
+     *
+     * @return string|null The encryption key if found, null otherwise
+     */
+    private function loadKeyFromWritable(): ?string
+    {
+        $keyFile = WRITEPATH . 'config' . DIRECTORY_SEPARATOR . 'encryption.key';
+
+        if (!file_exists($keyFile) || !is_readable($keyFile)) {
+            return null;
+        }
+
+        $content = file_get_contents($keyFile);
+        if ($content === false) {
+            return null;
+        }
+
+        $data = json_decode($content, true);
+        if (
+            !is_array($data)
+            || !isset($data['key'])
+            || !is_string($data['key'])
+            || strlen($data['key']) < 64
+        ) {
+            return null;
+        }
+
+        return $data['key'];
+    }
 }
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -1,4 +1,4 @@
-<?php
+<?php

 use CodeIgniter\Router\RouteCollection;

@@ -12,40 +12,6 @@ $routes->get('login', 'Login::index');
 $routes->post('login', 'Login::index');
 $routes->post('migrate', 'Login::migrate');

-$routes->get('sales', 'Sales::getIndex');
-$routes->get('sales/customerDisplay', 'Sales::getCustomerDisplay');
-$routes->get('sales/itemSearch', 'Sales::getItemSearch');
-$routes->post('sales/selectCustomer', 'Sales::postSelectCustomer');
-$routes->post('sales/changeMode', 'Sales::postChangeMode');
-$routes->post('sales/setComment', 'Sales::postSetComment');
-$routes->post('sales/setInvoiceNumber', 'Sales::postSetInvoiceNumber');
-$routes->post('sales/setPaymentType', 'Sales::postSetPaymentType');
-$routes->post('sales/setPrintAfterSale', 'Sales::postSetPrintAfterSale');
-$routes->post('sales/setPriceWorkOrders', 'Sales::postSetPriceWorkOrders');
-$routes->post('sales/setEmailReceipt', 'Sales::postSetEmailReceipt');
-$routes->post('sales/addPayment', 'Sales::postAddPayment');
-$routes->post('sales/add', 'Sales::postAdd');
-$routes->post('sales/editItem/(:segment)', 'Sales::postEditItem/$1');
-$routes->post('sales/deleteItem/(:segment)', 'Sales::getDeleteItem/$1');
-$routes->post('sales/deletePayment/(:segment)', 'Sales::getDeletePayment/$1');
-$routes->post('sales/removeCustomer', 'Sales::getRemoveCustomer');
-$routes->post('sales/complete', 'Sales::postComplete');
-$routes->post('sales/cancel', 'Sales::postCancel');
-$routes->post('sales/suspend', 'Sales::postSuspend');
-$routes->post('sales/unsuspend', 'Sales::postUnsuspend');
-$routes->post('sales/checkInvoiceNumber', 'Sales::postCheckInvoiceNumber');
-$routes->post('sales/changeItemNumber', 'Sales::postChangeItemNumber');
-$routes->post('sales/changeItemName', 'Sales::postChangeItemName');
-$routes->post('sales/changeItemDescription', 'Sales::postChangeItemDescription');
-$routes->get('sales/suspended', 'Sales::getSuspended');
-$routes->get('sales/discardSuspendedSale', 'Sales::getDiscardSuspendedSale');
-$routes->get('sales/sales_keyboard_help', 'Sales::getSalesKeyboardHelp');
-$routes->get('sales/receipt/(:num)', 'Sales::getReceipt/$1');
-$routes->get('sales/invoice/(:num)', 'Sales::getInvoice/$1');
-$routes->get('sales/edit/(:num)', 'Sales::getEdit/$1');
-$routes->post('sales/delete/(:num)', 'Sales::postDelete/$1');
-$routes->post('sales/save/(:num)', 'Sales::postSave/$1');
-
 $routes->add('no_access/index/(:segment)', 'No_access::index/$1');
 $routes->add('no_access/index/(:segment)/(:segment)', 'No_access::index/$1/$2');

@@ -73,4 +39,4 @@ $routes->add('reports/specific_(:any)/(:any)/(:any)/(:any)', 'Reports::Specific_
 $routes->add('reports/specific_customers', 'Reports::specific_customer_input');
 $routes->add('reports/specific_employees', 'Reports::specific_employee_input');
 $routes->add('reports/specific_discounts', 'Reports::specific_discount_input');
-$routes->add('reports/specific_suppliers', 'Reports::specific_supplier_input');
+$routes->add('reports/specific_suppliers', 'Reports::specific_supplier_input');
--- a/app/Controllers/Config.php
+++ b/app/Controllers/Config.php
--- a/app/Controllers/Customers.php
+++ b/app/Controllers/Customers.php
@@ -31,13 +31,7 @@ class Customers extends Persons
        $this->tax_code = model(Tax_code::class);
        $this->config = config(OSPOS::class)->settings;

-        $encrypter = Services::encrypter();
-
-        if (!empty($this->config['mailchimp_list_id'])) {
-            $this->_list_id = $encrypter->decrypt($this->config['mailchimp_list_id']);
-        } else {
-            $this->_list_id = '';
-        }
+        $this->_list_id = decrypt_value($this->config['mailchimp_list_id'] ?? null);
    }

    /**
--- a/app/Controllers/Sales.php
+++ b/app/Controllers/Sales.php
--- a/app/Helpers/locale_helper.php
+++ b/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;
 }

@@ -365,74 +368,6 @@ function to_currency_no_money(?string $number): string
    return to_decimals($number, 'currency_decimals');
 }

-/**
- * Build the secondary currency rendering context from app config values.
- *
- * @param array $config
- * @return array{show:bool,rate:float,symbol:string,code:string,decimals:int}
- */
-function secondary_currency_context(array $config): array
-{
-    $rate = (float) ($config['secondary_currency_rate'] ?? 0);
-    $symbol = trim((string) ($config['secondary_currency_symbol'] ?? ''));
-    $code = trim((string) ($config['secondary_currency_code'] ?? ''));
-    $decimals = (int) ($config['secondary_currency_decimals'] ?? ($config['currency_decimals'] ?? DEFAULT_PRECISION));
-
-    return [
-        'show'     => (($config['secondary_currency_enabled'] ?? false) == 1) && $rate > 0,
-        'rate'     => $rate,
-        'symbol'   => $symbol,
-        'code'     => $code,
-        'decimals' => $decimals,
-    ];
-}
-
-/**
- * Render a value in the secondary currency.
- *
- * @param float|int|string|null $number
- * @param array{show:bool,rate:float,symbol:string,code:string,decimals:int} $secondaryCurrency
- * @return string
- */
-function to_secondary_currency(float|int|string|null $number, array $secondaryCurrency): string
-{
-    if (!isset($number) || !$secondaryCurrency['show']) {
-        return '';
-    }
-
-    $config = config(OSPOS::class)->settings;
-    $amount = (float) $number * (float) $secondaryCurrency['rate'];
-    $fmt = new NumberFormatter($config['number_locale'], NumberFormatter::CURRENCY);
-    $fmt->setAttribute(NumberFormatter::MIN_FRACTION_DIGITS, $secondaryCurrency['decimals']);
-    $fmt->setAttribute(NumberFormatter::MAX_FRACTION_DIGITS, $secondaryCurrency['decimals']);
-
-    if (empty($config['thousands_separator'])) {
-        $fmt->setTextAttribute(NumberFormatter::GROUPING_SEPARATOR_SYMBOL, '');
-    }
-
-    $fmt->setSymbol(NumberFormatter::CURRENCY_SYMBOL, $secondaryCurrency['symbol'] !== '' ? $secondaryCurrency['symbol'] : ($secondaryCurrency['code'] !== '' ? $secondaryCurrency['code'] : ''));
-
-    return $fmt->format($amount);
-}
-
-/**
- * Render the secondary and primary currency amounts together.
- *
- * @param float|int|string|null $number
- * @param array{show:bool,rate:float,symbol:string,code:string,decimals:int} $secondaryCurrency
- * @return string
- */
-function to_secondary_currency_dual(float|int|string|null $number, array $secondaryCurrency): string
-{
-    $secondary = to_secondary_currency($number, $secondaryCurrency);
-
-    if ($secondary === '') {
-        return to_currency((string) $number);
-    }
-
-    return $secondary . '<br>' . to_currency((string) $number);
-}
-
 /**
 * @param string|null $number
 * @return string
--- a/app/Helpers/security_helper.php
+++ b/app/Helpers/security_helper.php
@@ -4,67 +4,227 @@ use CodeIgniter\Encryption\Encryption;
 use Config\Services;

 /**
- * @return bool
+ * Checks and initializes encryption key.
+ *
+ * This function ensures a valid encryption key exists for the application.
+ * It tries multiple storage locations to support different deployment scenarios:
+ * 1. ROOTPATH/.env - Standard location for non-containerized deployments
+ * 2. WRITEPATH/config/encryption.key - Fallback for Docker/container environments where .env is read-only
+ *
+ * @return bool True if encryption key is available, false if key generation/persistence failed
 */
 function check_encryption(): bool
 {
    $old_key = config('Encryption')->key;

-    if ((empty($old_key)) || (strlen($old_key) < 64)) {
-        $encryption = new Encryption();
-        $key = bin2hex($encryption->createKey());
-        config('Encryption')->key = $key;
+    // Key already exists and is valid (64+ hex chars = 32+ bytes)
+    if (!empty($old_key) && strlen($old_key) >= 64) {
+        return true;
+    }

-        $config_path = ROOTPATH . '.env';
-        $backup_path = WRITEPATH . '/backup/.env.bak';
-        $backup_folder = WRITEPATH . '/backup';
+    // Generate a new key
+    $encryption = new Encryption();
+    $key = bin2hex($encryption->createKey());
+    config('Encryption')->key = $key;

-        if (!file_exists($backup_folder)) {
-            @mkdir($backup_folder, 0750, true);
-        }
+    // Try to persist the key - attempt multiple locations
+    // Write both locations when possible. The writable copy is the durable one
+    // in containerized deployments where .env may be ephemeral.
+    $envPersisted = write_encryption_key_to_env($key, $old_key);
+    $writablePersisted = write_encryption_key_to_writable($key, $old_key);
+    $persisted = $envPersisted || $writablePersisted;

-        if (!file_exists($config_path)) {
-            $example_path = ROOTPATH . '.env.example';
-            if (file_exists($example_path)) {
-                @copy($example_path, $config_path);
-            } else {
-                @file_put_contents($config_path, "# OSPOS Configuration\n\n");
-            }
-            @chmod($config_path, 0640);
-        }
+    if ($persisted) {
+        log_message('info', 'Encryption key initialized successfully');
+    } else {
+        log_message('error', 'Failed to persist encryption key to any location. Encryption may not survive container restarts.');
+    }

-        if (file_exists($config_path)) {
-            @copy($config_path, $backup_path);
-            @chmod($backup_path, 0640);
-            @chmod($config_path, 0640);
+    return $persisted;
+}

-            $config_file = file_get_contents($config_path);
+/**
+ * Writes encryption key to ROOTPATH/.env file.
+ *
+ * @param string      $key     The new encryption key (hex-encoded)
+ * @param string|null $old_key The previous key to preserve for key rotation
+ *
+ * @return bool True if key was written successfully, false otherwise
+ */
+function write_encryption_key_to_env(string $key, ?string $old_key = null): bool
+{
+    $config_path = ROOTPATH . '.env';
+    $backup_path = WRITEPATH . 'backup' . DIRECTORY_SEPARATOR . '.env.bak';
+    $backup_folder = WRITEPATH . 'backup';

-            if (strpos($config_file, 'encryption.key') !== false) {
-                $config_file = preg_replace("/(encryption\.key.*=.*)('.*')/", "$1'$key'", $config_file);
-            } else {
-                $config_file .= "\nencryption.key = '$key'\n";
-            }
-
-            if (!empty($old_key)) {
-                $old_line = "# encryption.key = '$old_key' REMOVE IF UNNEEDED\r\n";
-                $insertion_point = stripos($config_file, 'encryption.key');
-                if ($insertion_point !== false) {
-                    $config_file = substr_replace($config_file, $old_line, $insertion_point, 0);
-                }
-            }
-
-            @file_put_contents($config_path, $config_file);
-            @chmod($config_path, 0640);
-
-            log_message('info', "Updated encryption key in $config_path");
+    // Ensure backup directory exists
+    if (!file_exists($backup_folder)) {
+        if (!@mkdir($backup_folder, 0750, true)) {
+            log_message('debug', 'Could not create backup directory');
        }
    }

+    // Create .env if it doesn't exist
+    if (!file_exists($config_path)) {
+        $example_path = ROOTPATH . '.env.example';
+        if (file_exists($example_path)) {
+            if (!@copy($example_path, $config_path)) {
+                log_message('debug', 'Could not copy .env.example to .env');
+            }
+        } else {
+            if (!@file_put_contents($config_path, "# OSPOS Configuration\n\n") !== false) {
+                log_message('debug', 'Could not create .env file');
+            }
+        }
+        @chmod($config_path, 0640);
+    }
+
+    // Check if .env is writable
+    if (!is_writable($config_path)) {
+        log_message('debug', '.env file is not writable');
+        return false;
+    }
+
+    // Backup existing .env
+    if (file_exists($config_path)) {
+        @copy($config_path, $backup_path);
+        @chmod($backup_path, 0640);
+    }
+
+    // Read current content
+    $config_file = file_get_contents($config_path);
+    if ($config_file === false) {
+        log_message('debug', 'Could not read .env file');
+        return false;
+    }
+
+    if (strpos($config_file, 'encryption.key') !== false) {
+        $config_file = preg_replace("/(encryption\.key.*=.*)(['\"])([^'\"]*)\\2/", "$1'$key'", $config_file);
+    } else {
+        $config_file .= "\nencryption.key = '$key'\n";
+    }
+
+    // Preserve old key for rotation if present
+    if (!empty($old_key)) {
+        $old_line = "# encryption.key = '$old_key' REMOVE IF UNNEEDED\r\n";
+        $insertion_point = stripos($config_file, 'encryption.key');
+        if ($insertion_point !== false) {
+            $config_file = substr_replace($config_file, $old_line, $insertion_point, 0);
+        }
+    }
+
+    // Write updated content
+    $result = file_put_contents($config_path, $config_file);
+    if ($result === false) {
+        log_message('debug', 'Could not write to .env file');
+        return false;
+    }
+
+    @chmod($config_path, 0640);
+    log_message('info', "Updated encryption key in $config_path");
+
    return true;
 }

 /**
+ * Writes encryption key to WRITEPATH/config/encryption.key file.
+ *
+ * This is the fallback location for Docker/container environments where
+ * the ROOTPATH/.env file may be read-only or ephemeral.
+ *
+ * @param string      $key     The new encryption key (hex-encoded)
+ * @param string|null $old_key The previous key to preserve for key rotation
+ *
+ * @return bool True if key was written successfully, false otherwise
+ */
+function write_encryption_key_to_writable(string $key, ?string $old_key = null): bool
+{
+    $key_file = WRITEPATH . 'config' . DIRECTORY_SEPARATOR . 'encryption.key';
+    $key_dir = dirname($key_file);
+
+    // Ensure directory exists
+    if (!is_dir($key_dir)) {
+        if (!@mkdir($key_dir, 0750, true)) {
+            log_message('error', 'Could not create config directory: ' . $key_dir);
+            return false;
+        }
+    }
+
+    // Check if directory is writable
+    if (!is_writable($key_dir)) {
+        log_message('error', 'Config directory is not writable: ' . $key_dir);
+        return false;
+    }
+
+    // Build key data structure
+    $data = [
+        'key' => $key,
+        'previous_keys' => [],
+        'generated_at' => date('c'),
+        'generated_by' => 'check_encryption()',
+    ];
+
+    if (!empty($old_key)) {
+        $data['previous_keys'][] = $old_key;
+    }
+
+    // Write key file
+    $content = json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+    $result = file_put_contents($key_file, $content);
+
+    if ($result === false) {
+        log_message('error', 'Could not write encryption key file');
+        return false;
+    }
+
+    // Set restrictive permissions
+    @chmod($key_file, 0640);
+
+    log_message('info', "Stored encryption key in $key_file");
+
+    return true;
+}
+
+/**
+ * Loads encryption key from WRITEPATH/config/encryption.key file.
+ *
+ * This is the fallback key loader for Docker/container environments.
+ *
+ * @return string|null The encryption key if found, null otherwise
+ */
+function load_encryption_key_from_writable(): ?string
+{
+    $key_file = WRITEPATH . 'config' . DIRECTORY_SEPARATOR . 'encryption.key';
+
+    if (!file_exists($key_file)) {
+        return null;
+    }
+
+    if (!is_readable($key_file)) {
+        log_message('error', 'Encryption key file exists but is not readable: ' . $key_file);
+        return null;
+    }
+
+    $content = file_get_contents($key_file);
+    if ($content === false) {
+        log_message('error', 'Could not read encryption key file');
+        return null;
+    }
+
+    $data = json_decode($content, true);
+    if (!is_array($data) || empty($data['key'])) {
+        log_message('error', 'Encryption key file has invalid format');
+        return null;
+    }
+
+    log_message('info', 'Loaded encryption key from WRITEPATH config');
+
+    return $data['key'];
+}
+
+/**
+ * Restores .env from backup (used by migration rollback).
+ *
 * @return void
 */
 function abort_encryption_conversion(): void
@@ -83,14 +243,77 @@ function abort_encryption_conversion(): void
 }

 /**
+ * Removes backup file (used after successful migration).
+ *
 * @return void
 */
 function remove_backup(): void
 {
    $backup_path = WRITEPATH . '/backup/.env.bak';
-    if (!file_exists($backup_path)) {
-        return;
+
+    if (file_exists($backup_path)) {
+        unlink($backup_path);
    }
-    @unlink($backup_path);
-    log_message('info', "Removed $backup_path");
 }
+
+/**
+ * Decrypts an encrypted value with proper error handling.
+ *
+ * This function provides a consistent decryption pattern across the codebase,
+ * handling cases where encryption key may not be available or decryption fails.
+ *
+ * @param string|null $encrypted_value The encrypted value to decrypt
+ * @param string      $default         Default value to return if decryption fails
+ *
+ * @return string The decrypted value, or default if decryption fails
+ */
+function decrypt_value(?string $encrypted_value, string $default = ''): string
+{
+    if (empty($encrypted_value)) {
+        return $default;
+    }
+
+    if (!check_encryption()) {
+        log_message('warning', 'Cannot decrypt value: encryption key not available');
+        return $default;
+    }
+
+    try {
+        $encrypter = Services::encrypter();
+        return $encrypter->decrypt($encrypted_value);
+    } catch (\CodeIgniter\Encryption\Exceptions\EncryptionException $e) {
+        log_message('error', 'Decryption failed: ' . $e->getMessage());
+        return $default;
+    }
+}
+
+/**
+ * Encrypts a value with proper error handling.
+ *
+ * This function provides a consistent encryption pattern across the codebase,
+ * handling cases where encryption key may not be available.
+ *
+ * @param string|null $value   The value to encrypt
+ * @param bool        $require  If true, return empty string on failure instead of plaintext fallback
+ *
+ * @return string The encrypted value, or empty string if encryption fails when required
+ */
+function encrypt_value(?string $value, bool $require = true): string
+{
+    if ($value === null || $value === '') {
+        return '';
+    }
+
+    if (!check_encryption()) {
+        log_message('error', 'Cannot encrypt value: encryption key not available');
+        return $require ? '' : $value;
+    }
+
+    try {
+        $encrypter = Services::encrypter();
+        return $encrypter->encrypt($value);
+    } catch (\CodeIgniter\Encryption\Exceptions\EncryptionException $e) {
+        log_message('error', 'Encryption failed: ' . $e->getMessage());
+        return $require ? '' : $value;
+    }
+}
--- a/app/Language/en/Config.php
+++ b/app/Language/en/Config.php
@@ -1,344 +1,337 @@
-<?php
-
-return [
-    "address"                                   => "Company Address",
-    "address_required"                          => "Company address is a required field.",
-    "all_set"                                   => "All file permissions are set correctly!",
-    "allow_duplicate_barcodes"                  => "Allow Duplicate Barcodes",
-    "apostrophe"                                => "apostrophe",
-    "backup_button"                             => "Backup",
-    "backup_database"                           => "Backup Database",
-    "barcode"                                   => "Barcode",
-    "barcode_company"                           => "Company Name",
-    "barcode_configuration"                     => "Barcode Configuration",
-    "barcode_content"                           => "Barcode Content",
-    "barcode_first_row"                         => "Row 1",
-    "barcode_font"                              => "Font",
-    "barcode_formats"                           => "Input Formats",
-    "barcode_generate_if_empty"                 => "Generate if empty.",
-    "barcode_height"                            => "Height (px)",
-    "barcode_id"                                => "Item Id/Name",
-    "barcode_info"                              => "Barcode Configuration Information",
-    "barcode_layout"                            => "Barcode Layout",
-    "barcode_name"                              => "Name",
-    "barcode_number"                            => "Barcode",
-    "barcode_number_in_row"                     => "Number in row",
-    "barcode_page_cellspacing"                  => "Display page cellspacing.",
-    "barcode_page_width"                        => "Display page width",
-    "barcode_price"                             => "Price",
-    "barcode_second_row"                        => "Row 2",
-    "barcode_third_row"                         => "Row 3",
-    "barcode_tooltip"                           => "Warning: This feature can cause duplicate items to be imported or created. Do not use if you do not want duplicate barcodes.",
-    "barcode_type"                              => "Barcode Type",
-    "barcode_width"                             => "Width (px)",
-    "bottom"                                    => "Bottom",
-    "cash_button"                               => "",
-    "cash_button_1"                             => "",
-    "cash_button_2"                             => "",
-    "cash_button_3"                             => "",
-    "cash_button_4"                             => "",
-    "cash_button_5"                             => "",
-    "cash_button_6"                             => "",
-    "cash_decimals"                             => "Cash Decimals",
-    "cash_decimals_tooltip"                     => "If Cash Decimals and Currency Decimals are the same then no cash triggered rounding will take place, unless Cash Rounding is set to Half Five.",
-    "cash_rounding"                             => "Cash Rounding",
-    "category_dropdown"                         => "Show Category as a dropdown",
-    "center"                                    => "Center",
-    "change_apperance_tooltip"                  => "",
-    "comma"                                     => "comma",
-    "company"                                   => "Company Name",
-    "company_avatar"                            => "",
-    "company_change_image"                      => "Change Image",
-    "company_logo"                              => "Company Logo",
-    "company_remove_image"                      => "Remove Image",
-    "company_required"                          => "Company name is a required field",
-    "company_select_image"                      => "Select Image",
-    "company_website_url"                       => "Company website is not a valid URL (http://...).",
-    "country_codes"                             => "Country Codes",
-    "country_codes_tooltip"                     => "Comma separated list of country codes for nominatim address lookup.",
-    "currency_code"                             => "Currency Code",
-    "currency_decimals"                         => "Currency Decimals",
-    "currency_symbol"                           => "Currency Symbol",
-    "current_employee_only"                     => "",
-    "customer_reward"                           => "Reward",
-    "customer_reward_duplicate"                 => "Reward must be unique.",
-    "customer_reward_enable"                    => "Enable Customer Rewards",
-    "customer_reward_invalid_chars"             => "Reward can not contain '_'",
-    "customer_reward_required"                  => "Reward is a required field",
-    "customer_sales_tax_support"                => "",
-    "date_or_time_format"                       => "Date and Time Filter",
-    "datetimeformat"                            => "Date and Time Format",
-    "decimal_point"                             => "Decimal Point",
-    "default_barcode_font_size_number"          => "Default Barcode Font Size must be a number.",
-    "default_barcode_font_size_required"        => "Default Barcode Font Size is a required field.",
-    "default_barcode_height_number"             => "Default Barcode Height must be a number.",
-    "default_barcode_height_required"           => "Default Barcode Height is a required field.",
-    "default_barcode_num_in_row_number"         => "Default Barcode Number in Row must be a number.",
-    "default_barcode_num_in_row_required"       => "Default Barcode Number in Row is a required field.",
-    "default_barcode_page_cellspacing_number"   => "Default Barcode Page Cellspacing must be a number.",
-    "default_barcode_page_cellspacing_required" => "Default Barcode Page Cellspacing is a required field.",
-    "default_barcode_page_width_number"         => "Default Barcode Page Width must be a number.",
-    "default_barcode_page_width_required"       => "Default Barcode Page Width is a required field.",
-    "default_barcode_width_number"              => "Default Barcode Width must be a number.",
-    "default_barcode_width_required"            => "Default Barcode Width is a required field.",
-    "default_item_columns"                      => "Default Visible Item Columns",
-    "default_origin_tax_code"                   => "Default Origin Tax Code",
-    "default_receivings_discount"               => "Default Receivings Discount",
-    "default_receivings_discount_number"        => "Default Receivings Discount must be a number.",
-    "default_receivings_discount_required"      => "Default Receivings Discount is a required field.",
-    "default_sales_discount"                    => "Default Sales Discount",
-    "default_sales_discount_number"             => "Default Sales Discount must be a number.",
-    "default_sales_discount_required"           => "Default Sales Discount is a required field.",
-    "default_tax_category"                      => "Default Tax Category",
-    "default_tax_code"                          => "Default Tax Code",
-    "default_tax_jurisdiction"                  => "Default Tax Jurisdiction",
-    "default_tax_name_number"                   => "Default Tax Name must be a string.",
-    "default_tax_name_required"                 => "Default Tax Name is a required field.",
-    "default_tax_rate"                          => "Default Tax Rate %",
-    "default_tax_rate_1"                        => "Tax 1 Rate",
-    "default_tax_rate_2"                        => "Tax 2 Rate",
-    "default_tax_rate_3"                        => "",
-    "default_tax_rate_number"                   => "Default Tax Rate must be a number.",
-    "default_tax_rate_required"                 => "Default Tax Rate is a required field.",
-    "derive_sale_quantity"                      => "Allow Derived Sale Quantity",
-    "derive_sale_quantity_tooltip"              => "If checked then a new item type will be provided for items ordered by extended amount",
-    "dinner_table"                              => "Table",
-    "dinner_table_duplicate"                    => "Table must be unique.",
-    "dinner_table_enable"                       => "Enable Dinner Tables",
-    "dinner_table_invalid_chars"                => "Table Name can not contain '_'.",
-    "dinner_table_required"                     => "Table is a required field.",
-    "dot"                                       => "dot",
-    "email"                                     => "Email",
-    "email_configuration"                       => "Email Configuration",
-    "email_mailpath"                            => "Path to Sendmail",
-    "email_protocol"                            => "Protocol",
-    "email_receipt_check_behaviour"             => "Email Receipt checkbox",
-    "email_receipt_check_behaviour_always"      => "Always checked",
-    "email_receipt_check_behaviour_last"        => "Remember last selection",
-    "email_receipt_check_behaviour_never"       => "Always unchecked",
-    "email_smtp_crypto"                         => "SMTP Encryption",
-    "email_smtp_host"                           => "SMTP Server",
-    "email_smtp_pass"                           => "SMTP Password",
-    "email_smtp_port"                           => "SMTP Port",
-    "email_smtp_timeout"                        => "SMTP Timeout (s)",
-    "email_smtp_user"                           => "SMTP Username",
-    "enable_avatar"                             => "",
-    "enable_avatar_tooltip"                     => "",
-    "enable_dropdown_tooltip"                   => "",
-    "enable_new_look"                           => "",
-    "enable_right_bar"                          => "",
-    "enable_right_bar_tooltip"                  => "",
-    "enforce_privacy"                           => "Enforce privacy",
-    "enforce_privacy_tooltip"                   => "Protect Customers privacy enforcing data scrambling in case of their data being deleted",
-    "fax"                                       => "Fax",
-    "file_perm"                                 => "There are problems with file permissions. Please fix and reload this page.",
-    "financial_year"                            => "Fiscal Year Start",
-    "financial_year_apr"                        => "1st of April",
-    "financial_year_aug"                        => "1st of August",
-    "financial_year_dec"                        => "1st of December",
-    "financial_year_feb"                        => "1st of February",
-    "financial_year_jan"                        => "1st of January",
-    "financial_year_jul"                        => "1st of July",
-    "financial_year_jun"                        => "1st of June",
-    "financial_year_mar"                        => "1st of March",
-    "financial_year_may"                        => "1st of May",
-    "financial_year_nov"                        => "1st of November",
-    "financial_year_oct"                        => "1st of October",
-    "financial_year_sep"                        => "1st of September",
-    "floating_labels"                           => "Floating Labels",
-    "gcaptcha_enable"                           => "Login Page reCAPTCHA",
-    "gcaptcha_secret_key"                       => "reCAPTCHA Secret Key",
-    "gcaptcha_secret_key_required"              => "reCAPTCHA Secret Key is a required field",
-    "gcaptcha_site_key"                         => "reCAPTCHA Site Key",
-    "gcaptcha_site_key_required"                => "reCAPTCHA Site Key is a required field",
-    "gcaptcha_tooltip"                          => "Protect the Login page with Google reCAPTCHA, click the icon for an API key pair.",
-    "general"                                   => "General",
-    "general_configuration"                     => "General Configuration",
-    "giftcard_number"                           => "Gift Card Number",
-    "giftcard_random"                           => "Generate Random",
-    "giftcard_series"                           => "Generate in Series",
-    "image_allowed_file_types"                  => "Allowed file types",
-    "image_max_height_tooltip"                  => "Maximum allowed height of image uploads in pixels (px).",
-    "image_max_size_tooltip"                    => "Maximum allowed file size of image uploads in kilobytes (kb).",
-    "image_max_width_tooltip"                   => "Maximum allowed width of image uploads in pixels (px).",
-    "image_restrictions"                        => "Image Upload Restrictions",
-    "include_hsn"                               => "Include Support for HSN Codes",
-    "info"                                      => "Information",
-    "info_configuration"                        => "Store Information",
-    "input_groups"                              => "Input Groups",
-    "integrations"                              => "Integrations",
-    "integrations_configuration"                => "Third Party Integrations",
-    "invoice"                                   => "Invoice",
-    "invoice_configuration"                     => "Invoice Print Settings",
-    "invoice_default_comments"                  => "Default Invoice Comments",
-    "invoice_email_message"                     => "Invoice Email Template",
-    "invoice_enable"                            => "Enable Invoicing",
-    "invoice_printer"                           => "Invoice Printer",
-    "invoice_type"                              => "Invoice Type",
-    "is_readable"                               => "is readable, but the permissions are incorrectly set. Please set it to 640 or 660 and refresh.",
-    "is_writable"                               => "is writable, but the permissions are incorrectly set. Please set it to 750 and refresh.",
-    "item_markup"                               => "",
-    "jsprintsetup_required"                     => "Warning: This functionality will only work if you have the FireFox jsPrintSetup addon installed. Save anyway?",
-    "language"                                  => "Language",
-    "last_used_invoice_number"                  => "Last used Invoice Number",
-    "last_used_quote_number"                    => "Last used Quote Number",
-    "last_used_work_order_number"               => "Last used W/O Number",
-    "left"                                      => "Left",
-    "license"                                   => "License",
-    "license_configuration"                     => "License Statement",
-    "line_sequence"                             => "Line Sequence",
-    "lines_per_page"                            => "Lines per Page",
-    "lines_per_page_number"                     => "Lines per Page must be a number.",
-    "lines_per_page_required"                   => "Lines per Page is a required field.",
-    "locale"                                    => "Localization",
-    "locale_configuration"                      => "Localization Configuration",
-    "locale_info"                               => "Localization Configuration Information",
-    "location"                                  => "Stock",
-    "location_configuration"                    => "Stock Locations",
-    "location_info"                             => "Location Configuration Information",
-    "login_form"                                => "Login Form Style",
-    "logout"                                    => "Do you want to make a backup before logging out? Click [OK] to backup or [Cancel] to logout.",
-    "mailchimp"                                 => "MailChimp",
-    "mailchimp_api_key"                         => "MailChimp API Key",
-    "mailchimp_configuration"                   => "MailChimp Configuration",
-    "mailchimp_key_successfully"                => "API Key is valid.",
-    "mailchimp_key_unsuccessfully"              => "API Key is invalid.",
-    "mailchimp_lists"                           => "MailChimp List(s)",
-    "mailchimp_tooltip"                         => "Click the icon for an API Key.",
-    "message"                                   => "Message",
-    "message_configuration"                     => "Message Configuration",
-    "msg_msg"                                   => "Saved Text Message",
-    "msg_msg_placeholder"                       => "If you wish to use a SMS template save your message here, otherwise leave the box blank.",
-    "msg_pwd"                                   => "SMS-API Password",
-    "msg_pwd_required"                          => "SMS-API Password is a required field",
-    "msg_src"                                   => "SMS-API Sender ID",
-    "msg_src_required"                          => "SMS-API Sender ID is a required field",
-    "msg_uid"                                   => "SMS-API Username",
-    "msg_uid_required"                          => "SMS-API Username is a required field",
-    "multi_pack_enabled"                        => "Multiple Packages per Item",
-    "no_risk"                                   => "No security/vulnerability risks.",
-    "none"                                      => "none",
-    "notify_alignment"                          => "Notification Popup Position",
-    "number_format"                             => "Number Format",
-    "number_locale"                             => "Localization",
-    "number_locale_invalid"                     => "The entered locale is invalid. Check the link in the tooltip to find a valid locale.",
-    "number_locale_required"                    => "Number Locale is a required field.",
-    "number_locale_tooltip"                     => "Find a suitable locale through this link.",
-    "os_timezone"                               => "OSPOS Timezone:",
-    "ospos_info"                                => "OSPOS Installation Info",
-    "payment_options_order"                     => "Payment Options Order",
-    "perm_risk"                                 => "Incorrect permissions leaves this software at risk.",
-    "phone"                                     => "Company Phone",
-    "phone_required"                            => "Company Phone is a required field.",
-    "print_bottom_margin"                       => "Margin Bottom",
-    "print_bottom_margin_number"                => "Margin Bottom must be a number.",
-    "print_bottom_margin_required"              => "Margin Bottom is a required field.",
-    "print_delay_autoreturn"                    => "Autoreturn to Sale delay",
-    "print_delay_autoreturn_number"             => "Autoreturn to Sale delay is a required field.",
-    "print_delay_autoreturn_required"           => "Autoreturn to Sale delay must be a number.",
-    "print_footer"                              => "Print Browser Footer",
-    "print_header"                              => "Print Browser Header",
-    "print_left_margin"                         => "Margin Left",
-    "print_left_margin_number"                  => "Margin Left must be a number.",
-    "print_left_margin_required"                => "Margin Left is a required field.",
-    "print_receipt_check_behaviour"             => "Print Receipt checkbox",
-    "print_receipt_check_behaviour_always"      => "Always checked",
-    "print_receipt_check_behaviour_last"        => "Remember last selection",
-    "print_receipt_check_behaviour_never"       => "Always unchecked",
-    "print_right_margin"                        => "Margin Right",
-    "print_right_margin_number"                 => "Margin Right must be a number.",
-    "print_right_margin_required"               => "Margin Right is a required field.",
-    "print_silently"                            => "Show Print Dialog",
-    "print_top_margin"                          => "Margin Top",
-    "print_top_margin_number"                   => "Margin Top must be a number.",
-    "print_top_margin_required"                 => "Margin Top is a required field.",
-    "quantity_decimals"                         => "Quantity Decimals",
-    "quick_cash_enable"                         => "",
-    "quote_default_comments"                    => "Default Quote Comments",
-    "receipt"                                   => "Receipt",
-    "receipt_category"                          => "",
-    "receipt_configuration"                     => "Receipt Print Settings",
-    "receipt_default"                           => "Default",
-    "receipt_font_size"                         => "Font Size",
-    "receipt_font_size_number"                  => "Font Size must be a number.",
-    "receipt_font_size_required"                => "Font Size is a required field.",
-    "receipt_info"                              => "Receipt Configuration Information",
-    "receipt_printer"                           => "Ticket Printer",
-    "receipt_short"                             => "Short",
+<?php
+
+return [
+    "address"                                   => "Company Address",
+    "address_required"                          => "Company address is a required field.",
+    "all_set"                                   => "All file permissions are set correctly!",
+    "allow_duplicate_barcodes"                  => "Allow Duplicate Barcodes",
+    "apostrophe"                                => "apostrophe",
+    "backup_button"                             => "Backup",
+    "backup_database"                           => "Backup Database",
+    "barcode"                                   => "Barcode",
+    "barcode_company"                           => "Company Name",
+    "barcode_configuration"                     => "Barcode Configuration",
+    "barcode_content"                           => "Barcode Content",
+    "barcode_first_row"                         => "Row 1",
+    "barcode_font"                              => "Font",
+    "barcode_formats"                           => "Input Formats",
+    "barcode_generate_if_empty"                 => "Generate if empty.",
+    "barcode_height"                            => "Height (px)",
+    "barcode_id"                                => "Item Id/Name",
+    "barcode_info"                              => "Barcode Configuration Information",
+    "barcode_layout"                            => "Barcode Layout",
+    "barcode_name"                              => "Name",
+    "barcode_number"                            => "Barcode",
+    "barcode_number_in_row"                     => "Number in row",
+    "barcode_page_cellspacing"                  => "Display page cellspacing.",
+    "barcode_page_width"                        => "Display page width",
+    "barcode_price"                             => "Price",
+    "barcode_second_row"                        => "Row 2",
+    "barcode_third_row"                         => "Row 3",
+    "barcode_tooltip"                           => "Warning: This feature can cause duplicate items to be imported or created. Do not use if you do not want duplicate barcodes.",
+    "barcode_type"                              => "Barcode Type",
+    "barcode_width"                             => "Width (px)",
+    "bottom"                                    => "Bottom",
+    "cash_button"                               => "",
+    "cash_button_1"                             => "",
+    "cash_button_2"                             => "",
+    "cash_button_3"                             => "",
+    "cash_button_4"                             => "",
+    "cash_button_5"                             => "",
+    "cash_button_6"                             => "",
+    "cash_decimals"                             => "Cash Decimals",
+    "cash_decimals_tooltip"                     => "If Cash Decimals and Currency Decimals are the same then no cash triggered rounding will take place, unless Cash Rounding is set to Half Five.",
+    "cash_rounding"                             => "Cash Rounding",
+    "category_dropdown"                         => "Show Category as a dropdown",
+    "center"                                    => "Center",
+    "change_apperance_tooltip"                  => "",
+    "comma"                                     => "comma",
+    "company"                                   => "Company Name",
+    "company_avatar"                            => "",
+    "company_change_image"                      => "Change Image",
+    "company_logo"                              => "Company Logo",
+    "company_remove_image"                      => "Remove Image",
+    "company_required"                          => "Company name is a required field",
+    "company_select_image"                      => "Select Image",
+    "company_website_url"                       => "Company website is not a valid URL (http://...).",
+    "country_codes"                             => "Country Codes",
+    "country_codes_tooltip"                     => "Comma separated list of country codes for nominatim address lookup.",
+    "currency_code"                             => "Currency Code",
+    "currency_decimals"                         => "Currency Decimals",
+    "currency_symbol"                           => "Currency Symbol",
+    "current_employee_only"                     => "",
+    "customer_reward"                           => "Reward",
+    "customer_reward_duplicate"                 => "Reward must be unique.",
+    "customer_reward_enable"                    => "Enable Customer Rewards",
+    "customer_reward_invalid_chars"             => "Reward can not contain '_'",
+    "customer_reward_required"                  => "Reward is a required field",
+    "customer_sales_tax_support"                => "",
+    "date_or_time_format"                       => "Date and Time Filter",
+    "datetimeformat"                            => "Date and Time Format",
+    "decimal_point"                             => "Decimal Point",
+    "default_barcode_font_size_number"          => "Default Barcode Font Size must be a number.",
+    "default_barcode_font_size_required"        => "Default Barcode Font Size is a required field.",
+    "default_barcode_height_number"             => "Default Barcode Height must be a number.",
+    "default_barcode_height_required"           => "Default Barcode Height is a required field.",
+    "default_barcode_num_in_row_number"         => "Default Barcode Number in Row must be a number.",
+    "default_barcode_num_in_row_required"       => "Default Barcode Number in Row is a required field.",
+    "default_barcode_page_cellspacing_number"   => "Default Barcode Page Cellspacing must be a number.",
+    "default_barcode_page_cellspacing_required" => "Default Barcode Page Cellspacing is a required field.",
+    "default_barcode_page_width_number"         => "Default Barcode Page Width must be a number.",
+    "default_barcode_page_width_required"       => "Default Barcode Page Width is a required field.",
+    "default_barcode_width_number"              => "Default Barcode Width must be a number.",
+    "default_barcode_width_required"            => "Default Barcode Width is a required field.",
+    "default_item_columns"                      => "Default Visible Item Columns",
+    "default_origin_tax_code"                   => "Default Origin Tax Code",
+    "default_receivings_discount"               => "Default Receivings Discount",
+    "default_receivings_discount_number"        => "Default Receivings Discount must be a number.",
+    "default_receivings_discount_required"      => "Default Receivings Discount is a required field.",
+    "default_sales_discount"                    => "Default Sales Discount",
+    "default_sales_discount_number"             => "Default Sales Discount must be a number.",
+    "default_sales_discount_required"           => "Default Sales Discount is a required field.",
+    "default_tax_category"                      => "Default Tax Category",
+    "default_tax_code"                          => "Default Tax Code",
+    "default_tax_jurisdiction"                  => "Default Tax Jurisdiction",
+    "default_tax_name_number"                   => "Default Tax Name must be a string.",
+    "default_tax_name_required"                 => "Default Tax Name is a required field.",
+    "default_tax_rate"                          => "Default Tax Rate %",
+    "default_tax_rate_1"                        => "Tax 1 Rate",
+    "default_tax_rate_2"                        => "Tax 2 Rate",
+    "default_tax_rate_3"                        => "",
+    "default_tax_rate_number"                   => "Default Tax Rate must be a number.",
+    "default_tax_rate_required"                 => "Default Tax Rate is a required field.",
+    "derive_sale_quantity"                      => "Allow Derived Sale Quantity",
+    "derive_sale_quantity_tooltip"              => "If checked then a new item type will be provided for items ordered by extended amount",
+    "dinner_table"                              => "Table",
+    "dinner_table_duplicate"                    => "Table must be unique.",
+    "dinner_table_enable"                       => "Enable Dinner Tables",
+    "dinner_table_invalid_chars"                => "Table Name can not contain '_'.",
+    "dinner_table_required"                     => "Table is a required field.",
+    "dot"                                       => "dot",
+    "email"                                     => "Email",
+    "email_configuration"                       => "Email Configuration",
+    "email_mailpath"                            => "Path to Sendmail",
+    "email_protocol"                            => "Protocol",
+    "email_receipt_check_behaviour"             => "Email Receipt checkbox",
+    "email_receipt_check_behaviour_always"      => "Always checked",
+    "email_receipt_check_behaviour_last"        => "Remember last selection",
+    "email_receipt_check_behaviour_never"       => "Always unchecked",
+    "email_smtp_crypto"                         => "SMTP Encryption",
+    "email_smtp_host"                           => "SMTP Server",
+    "email_smtp_pass"                           => "SMTP Password",
+    "email_smtp_port"                           => "SMTP Port",
+    "email_smtp_timeout"                        => "SMTP Timeout (s)",
+    "email_smtp_user"                           => "SMTP Username",
+    "encryption_failed"                          => "Failed to encrypt data. Please check encryption configuration.",
+    "enable_avatar"                             => "",
+    "enable_avatar_tooltip"                     => "",
+    "enable_dropdown_tooltip"                   => "",
+    "enable_new_look"                           => "",
+    "enable_right_bar"                          => "",
+    "enable_right_bar_tooltip"                  => "",
+    "enforce_privacy"                           => "Enforce privacy",
+    "enforce_privacy_tooltip"                   => "Protect Customers privacy enforcing data scrambling in case of their data being deleted",
+    "fax"                                       => "Fax",
+    "file_perm"                                 => "There are problems with file permissions. Please fix and reload this page.",
+    "financial_year"                            => "Fiscal Year Start",
+    "financial_year_apr"                        => "1st of April",
+    "financial_year_aug"                        => "1st of August",
+    "financial_year_dec"                        => "1st of December",
+    "financial_year_feb"                        => "1st of February",
+    "financial_year_jan"                        => "1st of January",
+    "financial_year_jul"                        => "1st of July",
+    "financial_year_jun"                        => "1st of June",
+    "financial_year_mar"                        => "1st of March",
+    "financial_year_may"                        => "1st of May",
+    "financial_year_nov"                        => "1st of November",
+    "financial_year_oct"                        => "1st of October",
+    "financial_year_sep"                        => "1st of September",
+    "floating_labels"                           => "Floating Labels",
+    "gcaptcha_enable"                           => "Login Page reCAPTCHA",
+    "gcaptcha_secret_key"                       => "reCAPTCHA Secret Key",
+    "gcaptcha_secret_key_required"              => "reCAPTCHA Secret Key is a required field",
+    "gcaptcha_site_key"                         => "reCAPTCHA Site Key",
+    "gcaptcha_site_key_required"                => "reCAPTCHA Site Key is a required field",
+    "gcaptcha_tooltip"                          => "Protect the Login page with Google reCAPTCHA, click the icon for an API key pair.",
+    "general"                                   => "General",
+    "general_configuration"                     => "General Configuration",
+    "giftcard_number"                           => "Gift Card Number",
+    "giftcard_random"                           => "Generate Random",
+    "giftcard_series"                           => "Generate in Series",
+    "image_allowed_file_types"                  => "Allowed file types",
+    "image_max_height_tooltip"                  => "Maximum allowed height of image uploads in pixels (px).",
+    "image_max_size_tooltip"                    => "Maximum allowed file size of image uploads in kilobytes (kb).",
+    "image_max_width_tooltip"                   => "Maximum allowed width of image uploads in pixels (px).",
+    "image_restrictions"                        => "Image Upload Restrictions",
+    "include_hsn"                               => "Include Support for HSN Codes",
+    "info"                                      => "Information",
+    "info_configuration"                        => "Store Information",
+    "input_groups"                              => "Input Groups",
+    "integrations"                              => "Integrations",
+    "integrations_configuration"                => "Third Party Integrations",
+    "invoice"                                   => "Invoice",
+    "invoice_configuration"                     => "Invoice Print Settings",
+    "invoice_default_comments"                  => "Default Invoice Comments",
+    "invoice_email_message"                     => "Invoice Email Template",
+    "invoice_enable"                            => "Enable Invoicing",
+    "invoice_printer"                           => "Invoice Printer",
+    "invoice_type"                              => "Invoice Type",
+    "is_readable"                               => "is readable, but the permissions are incorrectly set. Please set it to 640 or 660 and refresh.",
+    "is_writable"                               => "is writable, but the permissions are incorrectly set. Please set it to 750 and refresh.",
+    "item_markup"                               => "",
+    "jsprintsetup_required"                     => "Warning: This functionality will only work if you have the FireFox jsPrintSetup addon installed. Save anyway?",
+    "language"                                  => "Language",
+    "last_used_invoice_number"                  => "Last used Invoice Number",
+    "last_used_quote_number"                    => "Last used Quote Number",
+    "last_used_work_order_number"               => "Last used W/O Number",
+    "left"                                      => "Left",
+    "license"                                   => "License",
+    "license_configuration"                     => "License Statement",
+    "line_sequence"                             => "Line Sequence",
+    "lines_per_page"                            => "Lines per Page",
+    "lines_per_page_number"                     => "Lines per Page must be a number.",
+    "lines_per_page_required"                   => "Lines per Page is a required field.",
+    "locale"                                    => "Localization",
+    "locale_configuration"                      => "Localization Configuration",
+    "locale_info"                               => "Localization Configuration Information",
+    "location"                                  => "Stock",
+    "location_configuration"                    => "Stock Locations",
+    "location_info"                             => "Location Configuration Information",
+    "login_form"                                => "Login Form Style",
+    "logout"                                    => "Do you want to make a backup before logging out? Click [OK] to backup or [Cancel] to logout.",
+    "mailchimp"                                 => "MailChimp",
+    "mailchimp_api_key"                         => "MailChimp API Key",
+    "mailchimp_configuration"                   => "MailChimp Configuration",
+    "mailchimp_key_successfully"                => "API Key is valid.",
+    "mailchimp_key_unsuccessfully"              => "API Key is invalid.",
+    "mailchimp_lists"                           => "MailChimp List(s)",
+    "mailchimp_tooltip"                         => "Click the icon for an API Key.",
+    "message"                                   => "Message",
+    "message_configuration"                     => "Message Configuration",
+    "msg_msg"                                   => "Saved Text Message",
+    "msg_msg_placeholder"                       => "If you wish to use a SMS template save your message here, otherwise leave the box blank.",
+    "msg_pwd"                                   => "SMS-API Password",
+    "msg_pwd_required"                          => "SMS-API Password is a required field",
+    "msg_src"                                   => "SMS-API Sender ID",
+    "msg_src_required"                          => "SMS-API Sender ID is a required field",
+    "msg_uid"                                   => "SMS-API Username",
+    "msg_uid_required"                          => "SMS-API Username is a required field",
+    "multi_pack_enabled"                        => "Multiple Packages per Item",
+    "no_risk"                                   => "No security/vulnerability risks.",
+    "none"                                      => "none",
+    "notify_alignment"                          => "Notification Popup Position",
+    "number_format"                             => "Number Format",
+    "number_locale"                             => "Localization",
+    "number_locale_invalid"                     => "The entered locale is invalid. Check the link in the tooltip to find a valid locale.",
+    "number_locale_required"                    => "Number Locale is a required field.",
+    "number_locale_tooltip"                     => "Find a suitable locale through this link.",
+    "os_timezone"                               => "OSPOS Timezone:",
+    "ospos_info"                                => "OSPOS Installation Info",
+    "payment_options_order"                     => "Payment Options Order",
+    "perm_risk"                                 => "Incorrect permissions leaves this software at risk.",
+    "phone"                                     => "Company Phone",
+    "phone_required"                            => "Company Phone is a required field.",
+    "print_bottom_margin"                       => "Margin Bottom",
+    "print_bottom_margin_number"                => "Margin Bottom must be a number.",
+    "print_bottom_margin_required"              => "Margin Bottom is a required field.",
+    "print_delay_autoreturn"                    => "Autoreturn to Sale delay",
+    "print_delay_autoreturn_number"             => "Autoreturn to Sale delay is a required field.",
+    "print_delay_autoreturn_required"           => "Autoreturn to Sale delay must be a number.",
+    "print_footer"                              => "Print Browser Footer",
+    "print_header"                              => "Print Browser Header",
+    "print_left_margin"                         => "Margin Left",
+    "print_left_margin_number"                  => "Margin Left must be a number.",
+    "print_left_margin_required"                => "Margin Left is a required field.",
+    "print_receipt_check_behaviour"             => "Print Receipt checkbox",
+    "print_receipt_check_behaviour_always"      => "Always checked",
+    "print_receipt_check_behaviour_last"        => "Remember last selection",
+    "print_receipt_check_behaviour_never"       => "Always unchecked",
+    "print_right_margin"                        => "Margin Right",
+    "print_right_margin_number"                 => "Margin Right must be a number.",
+    "print_right_margin_required"               => "Margin Right is a required field.",
+    "print_silently"                            => "Show Print Dialog",
+    "print_top_margin"                          => "Margin Top",
+    "print_top_margin_number"                   => "Margin Top must be a number.",
+    "print_top_margin_required"                 => "Margin Top is a required field.",
+    "quantity_decimals"                         => "Quantity Decimals",
+    "quick_cash_enable"                         => "",
+    "quote_default_comments"                    => "Default Quote Comments",
+    "receipt"                                   => "Receipt",
+    "receipt_category"                          => "",
+    "receipt_configuration"                     => "Receipt Print Settings",
+    "receipt_default"                           => "Default",
+    "receipt_font_size"                         => "Font Size",
+    "receipt_font_size_number"                  => "Font Size must be a number.",
+    "receipt_font_size_required"                => "Font Size is a required field.",
+    "receipt_info"                              => "Receipt Configuration Information",
+    "receipt_printer"                           => "Ticket Printer",
+    "receipt_short"                             => "Short",
    "receipt_show_company_name"                 => "Show Company Name",
    "receipt_show_description"                  => "Show Description",
    "receipt_show_serialnumber"                 => "Show Serial Number",
-    "receipt_show_secondary_currency"           => "Show Secondary Currency",
    "receipt_show_tax_ind"                      => "Show Tax Indicator",
    "receipt_show_taxes"                        => "Show Taxes",
    "receipt_show_total_discount"               => "Show Total Discount",
    "receipt_template"                          => "Receipt Template",
-    "secondary_currency"                        => "Secondary Currency",
-    "secondary_currency_decimals"               => "Secondary Currency Decimals",
-    "secondary_currency_code"                    => "Secondary Currency Code",
-    "secondary_currency_enable"                  => "Enable Secondary Currency",
-    "secondary_currency_enable_tooltip"          => "Show secondary currency fields and print/display values across the app.",
-    "secondary_currency_rate"                    => "Secondary Currency Rate",
-    "secondary_currency_settings"                => "Secondary Currency Settings",
-    "secondary_currency_symbol"                  => "Secondary Currency Symbol",
    "receiving_calculate_average_price"         => "Calc avg. Price (Receiving)",
-    "recv_invoice_format"                       => "Receivings Invoice Format",
-    "register_mode_default"                     => "Default Register Mode",
-    "report_an_issue"                           => "Report an issue",
-    "return_policy_required"                    => "Return policy is a required field.",
-    "reward"                                    => "Reward",
-    "reward_configuration"                      => "Reward Configuration",
-    "right"                                     => "Right",
-    "sales_invoice_format"                      => "Sales Invoice Format",
-    "sales_quote_format"                        => "Sales Quote Format",
-    "mailpath_invalid"                          => "Invalid sendmail path. Only letters, numbers, dashes, underscores, slashes and dots are allowed.",
-    "saved_successfully"                        => "Configuration save successful.",
-    "saved_unsuccessfully"                      => "Configuration save failed.",
-    "security_issue"                            => "Security Vulnerability Warning",
+    "recv_invoice_format"                       => "Receivings Invoice Format",
+    "register_mode_default"                     => "Default Register Mode",
+    "report_an_issue"                           => "Report an issue",
+    "return_policy_required"                    => "Return policy is a required field.",
+    "reward"                                    => "Reward",
+    "reward_configuration"                      => "Reward Configuration",
+    "right"                                     => "Right",
+    "sales_invoice_format"                      => "Sales Invoice Format",
+    "sales_quote_format"                        => "Sales Quote Format",
+    "mailpath_invalid"                          => "Invalid sendmail path. Only letters, numbers, dashes, underscores, slashes and dots are allowed.",
+    "saved_successfully"                        => "Configuration save successful.",
+    "saved_unsuccessfully"                      => "Configuration save failed.",
+    "security_issue"                            => "Security Vulnerability Warning",
    "server_notice"                             => "Please use the below info for issue reporting.",
    "service_charge"                            => "",
-    "customer_display"                          => "Customer Display",
    "show_due_enable"                           => "",
-    "show_office_group"                         => "Show office icon",
-    "statistics"                                => "Send Statistics",
-    "statistics_tooltip"                        => "Send statistics for development and feature improvement purposes.",
-    "stock_location"                            => "Stock location",
-    "stock_location_duplicate"                  => "Stock Location must be unique.",
-    "stock_location_invalid_chars"              => "Stock Location can not contain '_'.",
-    "stock_location_required"                   => "Stock location is a required field.",
-    "suggestions_fifth_column"                  => "",
-    "suggestions_first_column"                  => "Column 1",
-    "suggestions_fourth_column"                 => "",
-    "suggestions_layout"                        => "Search Suggestions Layout",
-    "suggestions_second_column"                 => "Column 2",
-    "suggestions_third_column"                  => "Column 3",
-    "system_conf"                               => "Setup & Conf",
-    "system_info"                               => "System Info",
-    "table"                                     => "Table",
-    "table_configuration"                       => "Table Configuration",
-    "takings_printer"                           => "Receipt Printer",
-    "tax"                                       => "Tax",
-    "tax_category"                              => "Tax Category",
-    "tax_category_duplicate"                    => "The entered tax category already exists.",
-    "tax_category_invalid_chars"                => "The entered tax category is invalid.",
-    "tax_category_required"                     => "The tax category is required.",
-    "tax_category_used"                         => "Tax category cannot be deleted because it is being used.",
-    "tax_configuration"                         => "Tax Configuration",
-    "tax_decimals"                              => "Tax Decimals",
-    "tax_id"                                    => "Tax Id",
-    "tax_included"                              => "Tax Included",
-    "theme"                                     => "Theme",
-    "theme_preview"                             => "Preview Theme:",
-    "thousands_separator"                       => "Thousands Separator",
-    "timezone"                                  => "Timezone",
-    "timezone_error"                            => "OSPOS Timezone is Different from your Local Timezone.",
-    "top"                                       => "Top",
-    "use_destination_based_tax"                 => "Use Destination Based Tax",
-    "user_timezone"                             => "Local Timezone:",
-    "website"                                   => "Website",
-    "wholesale_markup"                          => "",
-    "work_order_enable"                         => "Work Order Support",
-    "work_order_format"                         => "Work Order Format",
-];
-
-
+    "show_office_group"                         => "Show office icon",
+    "statistics"                                => "Send Statistics",
+    "statistics_tooltip"                        => "Send statistics for development and feature improvement purposes.",
+    "stock_location"                            => "Stock location",
+    "stock_location_duplicate"                  => "Stock Location must be unique.",
+    "stock_location_invalid_chars"              => "Stock Location can not contain '_'.",
+    "stock_location_required"                   => "Stock location is a required field.",
+    "suggestions_fifth_column"                  => "",
+    "suggestions_first_column"                  => "Column 1",
+    "suggestions_fourth_column"                 => "",
+    "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",
+    "table_configuration"                       => "Table Configuration",
+    "takings_printer"                           => "Receipt Printer",
+    "tax"                                       => "Tax",
+    "tax_category"                              => "Tax Category",
+    "tax_category_duplicate"                    => "The entered tax category already exists.",
+    "tax_category_invalid_chars"                => "The entered tax category is invalid.",
+    "tax_category_required"                     => "The tax category is required.",
+    "tax_category_used"                         => "Tax category cannot be deleted because it is being used.",
+    "tax_configuration"                         => "Tax Configuration",
+    "tax_decimals"                              => "Tax Decimals",
+    "tax_id"                                    => "Tax Id",
+    "tax_included"                              => "Tax Included",
+    "theme"                                     => "Theme",
+    "theme_preview"                             => "Preview Theme:",
+    "thousands_separator"                       => "Thousands Separator",
+    "timezone"                                  => "Timezone",
+    "timezone_error"                            => "OSPOS Timezone is Different from your Local Timezone.",
+    "top"                                       => "Top",
+    "use_destination_based_tax"                 => "Use Destination Based Tax",
+    "user_timezone"                             => "Local Timezone:",
+    "website"                                   => "Website",
+    "wholesale_markup"                          => "",
+    "work_order_enable"                         => "Work Order Support",
+    "work_order_format"                         => "Work Order Format",
+];
--- a/app/Language/en/Sales.php
+++ b/app/Language/en/Sales.php
@@ -7,9 +7,9 @@ return [
    "account_number"                   => "Account #",
    "add_payment"                      => "Add Payment",
    "amount_due"                       => "Amount Due",
-    "amount_due_lbp"                   => "Amount Due LBP",
    "amount_tendered"                  => "Amount Tendered",
    "authorized_signature"             => "Authorized Signature",
+    "bank_transfer"                    => "Bank Transfer",
    "cancel_sale"                      => "Cancel",
    "cash"                             => "Cash",
    "cash_1"                           => "",
@@ -20,8 +20,6 @@ return [
    "cash_deposit"                     => "Cash Deposit",
    "cash_filter"                      => "Cash",
    "change_due"                       => "Change Due",
-    "change"                           => "Change",
-    "currency_rate"                    => "Currency Rate",
    "change_price"                     => "Change Selling Price",
    "check"                            => "Check",
    "check_balance"                    => "Check remainder",
@@ -43,7 +41,6 @@ return [
    "customer_address"                 => "Address",
    "customer_discount"                => "Discount",
    "customer_email"                   => "Email",
-    "customer_name"                    => "Customer Name",
    "customer_location"                => "Location",
    "customer_mailchimp_status"        => "MailChimp Status",
    "customer_optional"                => "(Required for Due Payments)",
@@ -77,6 +74,12 @@ return [
    "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",
@@ -107,7 +110,6 @@ return [
    "item_name"                        => "Item Name",
    "item_number"                      => "Item #",
    "item_out_of_stock"                => "Item is out of stock.",
-    "items"                            => "Items",
    "key_browser"                      => "Helpful Shortcuts",
    "key_cancel"                       => "Cancels Current Quote/Invoice/Sale",
    "key_customer_search"              => "Customer Search",
@@ -149,9 +151,7 @@ return [
    "payment_type"                     => "Type",
    "payments"                         => "",
    "payments_total"                   => "Payments Total",
-    "loyalty_reward_points"            => "Loyalty Reward Points",
    "price"                            => "Price",
-    "price_with_currency"              => "Price (%s)",
    "print_after_sale"                 => "Print after Sale",
    "quantity"                         => "Quantity",
    "quantity_less_than_reorder_level" => "Warning: Desired Quantity is below Reorder Level for that Item.",
@@ -167,13 +167,10 @@ return [
    "receipt_number"                   => "Sale #",
    "receipt_sent"                     => "Receipt sent to",
    "receipt_unsent"                   => "Receipt failed to be sent to",
-    "rate"                             => "Rate",
    "refund"                           => "Refund Type",
    "register"                         => "Sales Register",
    "remove_customer"                  => "Remove Customer",
    "remove_discount"                  => "",
-    "customer_display"                 => "Customer Display",
-    "summary"                          => "Summary",
    "return"                           => "Return",
    "rewards"                          => "Reward Points",
    "rewards_balance"                  => "Reward Points Balance",
@@ -185,7 +182,6 @@ return [
    "sales_total"                      => "",
    "select_customer"                  => "Select Customer",
    "selected_customer"                => "Selected Customer",
-    "walk_in_customer"                 => "Walk-in Customer",
    "send_invoice"                     => "Send Invoice",
    "send_quote"                       => "Send Quote",
    "send_receipt"                     => "Send Receipt",
@@ -216,7 +212,6 @@ return [
    "tax_percent"                      => "Tax %",
    "taxed_ind"                        => "T",
    "total"                            => "Total",
-    "total_lbp"                        => "Total LBP",
    "total_tax_exclusive"              => "Tax excluded",
    "transaction_failed"               => "Sales Transaction failed.",
    "unable_to_add_item"               => "Item add to Sale failed",
@@ -229,6 +224,7 @@ return [
    "update"                           => "Update",
    "upi"                              => "UPI",
    "visa"                             => "",
+    "wallet"                           => "Wallet",
    "wholesale"                        => "",
    "work_order"                       => "Work Order",
    "work_order_number"                => "Work Order Number",
@@ -236,5 +232,3 @@ return [
    "work_order_sent"                  => "Work Order sent to",
    "work_order_unsent"                => "Work Order failed to be sent to",
 ];
-
-
--- a/app/Libraries/Email_lib.php
+++ b/app/Libraries/Email_lib.php
@@ -3,11 +3,7 @@
 namespace app\Libraries;

 use CodeIgniter\Email\Email;
-use CodeIgniter\Encryption\Encryption;
-use CodeIgniter\Encryption\EncrypterInterface;
-use CodeIgniter\Encryption\Exceptions\EncryptionException;
 use Config\OSPOS;
-use Config\Services;


 /**
@@ -26,19 +22,7 @@ class Email_lib
        $this->email = new Email();
        $this->config = config(OSPOS::class)->settings;

-        $encrypter = Services::encrypter();
-
-        $smtp_pass = $this->config['smtp_pass'];
-        if (!empty($smtp_pass) && check_encryption()) {
-            try {
-                $smtp_pass = $encrypter->decrypt($smtp_pass);
-            } catch (\EncryptionException $e) {
-                // Decryption failed, use the original value
-                log_message('error', 'SMTP password decryption failed: ' . $e->getMessage());
-                $smtp_pass = '';
-            }
-
-        }
+        $smtp_pass = decrypt_value($this->config['smtp_pass'] ?? null);

        $email_config = [
            'mailType'    => 'html',
@@ -51,7 +35,7 @@ class Email_lib
            'SMTPPass'    => $smtp_pass,
            'SMTPPort'    => (int)$this->config['smtp_port'],
            'SMTPTimeout' => (int)$this->config['smtp_timeout'],
-            'SMTPCrypto'  => $this->config['smtp_crypto']
+            'SMTPCrypto'  => $this->config['smtp_crypto'],
        ];
        $this->email->initialize($email_config);
    }
--- a/app/Libraries/MY_Migration.php
+++ b/app/Libraries/MY_Migration.php
@@ -25,7 +25,7 @@ class MY_Migration extends MigrationRunner
    public function get_latest_migration(): int
    {
        $migrations = $this->findMigrations();
-        return basename(end($migrations)->version);
+        return (int) basename(end($migrations)->version);
    }

    /**
@@ -41,7 +41,7 @@ class MY_Migration extends MigrationRunner
                $builder = $db->table('migrations');
                $builder->select('version')->orderBy('version', 'DESC')->limit(1);
                $result = $builder->get()->getRow();
-                return $result ? $result->version : 0;
+                return $result ? (int) $result->version : 0;
            }
        } catch (\Exception $e) {
            // Database not available yet (e.g. fresh install before schema).
--- a/app/Libraries/Mailchimp_lib.php
+++ b/app/Libraries/Mailchimp_lib.php
@@ -2,9 +2,7 @@

 namespace app\Libraries;

-use CodeIgniter\Encryption\EncrypterInterface;
 use Config\OSPOS;
-use Config\Services;

 /**
 * MailChimp API v3 REST client Connector
@@ -14,8 +12,6 @@ use Config\Services;
 * Inspired by the work of:
 *   - Rajitha Bandara: https://github.com/rajitha-bandara/ci-mailchimp-v3-rest-client
 *   - Stefan Ashwell: https://github.com/stef686/codeigniter-mailchimp-api-v3
- *
- * @property encrypterinterface encrypter
 */
 class MailchimpConnector
 {
@@ -40,23 +36,19 @@ class MailchimpConnector
    {
        $config = config(OSPOS::class)->settings;

-        $encrypter = Services::encrypter();
-
-        $mailchimp_api_key = (isset($this->config['mailchimp_api_key']) && !empty($this->config['mailchimp_api_key']))
-            ? $this->config['mailchimp_api_key']
-            : '';
+        $mailchimp_api_key = $config['mailchimp_api_key'] ?? '';

        if (!empty($mailchimp_api_key)) {
            $this->_api_key = empty($api_key)
-                ? $encrypter->decrypt($mailchimp_api_key)    // TODO: Hungarian notation
-                : $api_key;    // TODO: Hungarian notation
+                ? decrypt_value($mailchimp_api_key)
+                : $api_key;
        }

-        if (!empty($this->_api_key)) {    // TODO: Hungarian notation
+        if (!empty($this->_api_key)) {
            // Replace <dc> with correct datacenter obtained from the last part of the api key
-            $strings = explode('-', $this->_api_key);    // TODO: Hungarian notation
+            $strings = explode('-', $this->_api_key);
            if (is_array($strings) && !empty($strings[1])) {
-                $this->_api_endpoint = str_replace('<dc>', $strings[1], $this->_api_endpoint);    // TODO: Hungarian notation
+                $this->_api_endpoint = str_replace('<dc>', $strings[1], $this->_api_endpoint);
            }
        }
    }
--- a/app/Libraries/Sms_lib.php
+++ b/app/Libraries/Sms_lib.php
@@ -2,10 +2,7 @@

 namespace app\Libraries;

-use CodeIgniter\Encryption\Encryption;
-use CodeIgniter\Encryption\EncrypterInterface;
 use Config\OSPOS;
-use Config\Services;


 /**
@@ -24,12 +21,7 @@ class Sms_lib
    {
        $config = config(OSPOS::class)->settings;

-        $encrypter = Services::encrypter();
-
-        $password = $config['msg_pwd'];
-        if (!empty($password)) {
-            $password = $encrypter->decrypt($password);
-        }
+        $password = decrypt_value($config['msg_pwd'] ?? null);

        $username = $config['msg_uid'];
        $originator = $config['msg_src'];
--- a/app/Models/Sale.php
+++ b/app/Models/Sale.php
@@ -327,7 +327,7 @@ class Sale extends Model
    {
        $suggestions = [];

-        if (!$this->is_valid_receipt($search)) {
+        if (!$this->isValidReceipt($search)) {
            $builder = $this->db->table('sales');
            $builder->distinct()->select('first_name, last_name');
            $builder->join('people', 'people.person_id = sales.customer_id');
@@ -408,21 +408,21 @@ class Sale extends Model
    /**
     * 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 isValidReceipt(string|null &$receiptSaleId): 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($receiptSaleId)) {
            // POS #
-            $pieces = explode(' ', $receipt_sale_id);
+            $pieces = explode(' ', trim($receiptSaleId));

-            if (count($pieces) == 2 && preg_match('/(POS)/i', $pieces[0])) {
-                return $this->exists($pieces[1]);
+            if (count($pieces) == 2 && strtoupper($pieces[0]) === 'POS' && ctype_digit($pieces[1])) {
+                return $this->exists((int)$pieces[1]);
            } elseif ($config['invoice_enable']) {
-                $sale_info = $this->get_sale_by_invoice_number($receipt_sale_id);
+                $saleInfo = $this->get_sale_by_invoice_number($receiptSaleId);

-                if ($sale_info->getNumRows() > 0) {
-                    $receipt_sale_id = 'POS ' . $sale_info->getRow()->sale_id;
+                if ($saleInfo->getNumRows() > 0) {
+                    $receiptSaleId = 'POS ' . $saleInfo->getRow()->sale_id;

                    return true;
                }
--- a/app/Views/configs/general_config.php
+++ b/app/Views/configs/general_config.php
--- a/app/Views/partial/customer_display_header.php
+++ b/app/Views/partial/customer_display_header.php
@@ -1,249 +0,0 @@
-<?php
-/**
- * @var array $config
- * @var string $companyName
- * @var string $companyDetails
- */
-
-helper('url');
-?>
-
-<!doctype html>
-<html lang="<?= esc(service('request')->getLocale()) ?>">
-<head>
-    <meta charset="utf-8">
-    <title><?= lang('Sales.customer_display') ?></title>
-    <link rel="shortcut icon" type="image/x-icon" href="<?= base_url('images/favicon.ico') ?>">
-    <link rel="stylesheet" href="<?= base_url('resources/bootswatch/' . (empty($config['theme']) ? 'flatly' : esc($config['theme'])) . '/bootstrap.min.css') ?>">
-    <link rel="stylesheet" href="<?= base_url('resources/opensourcepos-8e34d6a398.min.css') ?>">
-    <style>
-        html, body {
-            margin: 0;
-            padding: 0;
-            background: #f8f8f8;
-            color: #333;
-            font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-        }
-
-        body {
-            width: 100%;
-            overflow: hidden;
-        }
-
-        .customer-display-header {
-            background: #1f3143;
-            color: #fff;
-            text-align: center;
-            font-size: 15px;
-            font-weight: 700;
-            letter-spacing: 0.02em;
-            padding: 6px 12px;
-            border-bottom: 1px solid #102131;
-        }
-
-        .customer-display-shell {
-            width: 100%;
-            max-width: 1280px;
-            margin: 0 auto;
-            padding: 12px 18px 18px;
-            box-sizing: border-box;
-        }
-
-        .customer-display-company {
-            text-align: center;
-            margin-bottom: 18px;
-        }
-
-        .customer-display-company img {
-            display: block;
-            margin: 0 auto 6px;
-            max-height: 84px;
-            max-width: 240px;
-        }
-
-        .customer-display-company .company-name {
-            font-size: 20px;
-            font-weight: 600;
-            line-height: 1.2;
-            margin-top: 12px;
-        }
-
-        .customer-display-company .company-details {
-            font-size: 13px;
-            line-height: 1.35;
-            white-space: pre-line;
-        }
-
-        .customer-display-company .company-phone {
-            font-size: 13px;
-            line-height: 1.35;
-            margin-top: 4px;
-        }
-
-        .customer-display-main-row {
-            display: flex;
-            gap: 14px;
-            align-items: flex-start;
-            margin-top: 6px;
-        }
-
-        .customer-display-cart-column {
-            flex: 1 1 auto;
-            min-width: 0;
-        }
-
-        .customer-display-summary-column {
-            flex: 0 0 320px;
-            width: 320px;
-        }
-
-        .customer-display-summary-panel,
-        .customer-display-info-panel,
-        .customer-display-items-panel {
-            margin-bottom: 0;
-        }
-
-        .customer-display-summary-panel .panel-heading,
-        .customer-display-info-panel .panel-heading,
-        .customer-display-items-panel .panel-heading {
-            font-weight: 600;
-        }
-
-        .customer-display-summary-panel .table,
-        .customer-display-info-table {
-            margin-bottom: 0;
-            font-size: 13px;
-        }
-
-        .customer-display-summary-panel .table > tbody > tr > th,
-        .customer-display-info-table > tbody > tr > th {
-            background: #f8fbfd;
-            width: 56%;
-            font-weight: 700;
-        }
-
-        .customer-display-summary-panel .table > tbody > tr > td,
-        .customer-display-info-table > tbody > tr > td {
-            width: 44%;
-            text-align: right;
-            white-space: nowrap;
-            font-weight: 600;
-        }
-
-        .customer-display-summary-panel .rate-row th,
-        .customer-display-summary-panel .rate-row td {
-            color: #c00000;
-        }
-
-        .customer-display-summary-panel .summary-section-row th {
-            background: #eaf2f8;
-            color: #1f3b5b;
-            font-weight: 700;
-        }
-
-        .customer-display-summary-panel .summary-subtable {
-            width: 100%;
-        }
-
-        .customer-display-summary-panel .summary-subtable > tbody > tr > th {
-            background: #fdfefe;
-            font-weight: 600;
-        }
-
-        .customer-display-summary-panel .summary-subtable > tbody > tr > td {
-            font-weight: 600;
-        }
-
-        .register-wrap {
-            width: 100%;
-        }
-
-        #register {
-            width: 100%;
-            margin: 0;
-            table-layout: fixed;
-            background: #fff;
-        }
-
-        #register th,
-        #register td {
-            text-align: center;
-            vertical-align: middle;
-            padding: 6px 5px;
-            word-wrap: break-word;
-        }
-
-        #register thead th {
-            font-size: 12px;
-            font-weight: 600;
-            color: #333;
-        }
-
-        #register tbody td {
-            font-size: 15px;
-        }
-
-        #register tbody td.item-name-cell {
-            font-size: 16px;
-            text-align: left;
-        }
-
-        #register tbody td.price-cell {
-            font-size: 15px;
-        }
-
-        #register tbody td.serial-cell {
-            font-size: 12px;
-            color: #2F4F4F;
-        }
-
-        .customer-display-summary-panel .table > tbody > tr > th,
-        .customer-display-info-table > tbody > tr > th {
-            border-top: 1px solid #e5e5e5;
-        }
-
-        .customer-display-summary-panel .table > tbody > tr > td,
-        .customer-display-info-table > tbody > tr > td {
-            border-top: 1px solid #e5e5e5;
-        }
-
-        .customer-display-summary-panel .panel-body,
-        .customer-display-info-panel .panel-body,
-        .customer-display-items-panel .panel-body {
-            padding: 12px 15px;
-        }
-
-        .customer-display-summary-column .panel-body {
-            padding-top: 8px;
-        }
-
-        .customer-display-summary-column .customer-name-value,
-        .customer-display-summary-column .giftcard-value,
-        .customer-display-summary-column .reward-value {
-            text-align: right;
-        }
-
-        .customer-display-footer {
-            margin-top: 14px;
-            text-align: center;
-            font-size: 12px;
-            color: #777;
-        }
-    </style>
-</head>
-<body>
-    <div class="customer-display-header">Open Source Point of Sale</div>
-    <div class="customer-display-shell">
-        <div class="customer-display-company">
-            <?php if (!empty($config['company_logo'])) { ?>
-                <img src="<?= base_url('uploads/' . esc($config['company_logo'], 'url')) ?>" alt="company_logo">
-            <?php } ?>
-            <div class="company-name"><?= esc($companyName) ?></div>
-            <div class="company-phone">Phone: <?= esc((string)($config['phone'] ?? '')) ?></div>
-            <?php if ($companyDetails !== '') { ?>
-                <div class="company-details"><?= nl2br(esc($companyDetails)) ?></div>
-            <?php } ?>
-        </div>
-
-        <div class="customer-display-main-row">
-
--- a/app/Views/sales/customer_display.php
+++ b/app/Views/sales/customer_display.php
@@ -1,224 +0,0 @@
-<?php
-/**
- * @var array $cart
- * @var array $config
- * @var float $rate
- * @var float $total
- * @var float $subtotal
- * @var float $prediscount_subtotal
- * @var array $taxes
- * @var array $payments
- * @var float $amount_change
- */
-
-$priceWithCurrencyLabel = lang('Sales.price_with_currency');
-
-?>
-
-<?= view('partial/customer_display_header') ?>
-
-            <div class="customer-display-cart-column">
-                <div class="register-wrap">
-                    <div class="panel panel-default customer-display-items-panel">
-                        <div class="panel-heading"><?= lang('Sales.items') ?></div>
-                        <div class="panel-body table-responsive">
-                            <table class="table table-striped table-condensed" id="register">
-                                <thead>
-                                    <tr>
-                                        <th style="width: <?= (int) $cartItemWidth ?>%;"><?= lang('Sales.item_name') ?></th>
-                                        <?php if ($cartHasCustomerDisplay) { ?>
-                                            <th style="width: <?= (int) $cartPriceWidth ?>%;"><?= sprintf($priceWithCurrencyLabel, esc($customerDisplayCurrencyLabel)) ?></th>
-                                        <?php } ?>
-                                        <th style="width: <?= (int) $cartOriginalWidth ?>%;"><?= sprintf($priceWithCurrencyLabel, esc($originalCurrencyLabel)) ?></th>
-                                        <th style="width: <?= (int) $cartQuantityWidth ?>%;"><?= lang('Sales.quantity') ?></th>
-                                        <th style="width: <?= (int) $cartDiscountWidth ?>%;"><?= lang('Sales.discount') ?></th>
-                                        <th style="width: <?= (int) $cartTotalWidth ?>%;"><?= lang('Sales.total') ?></th>
-                                    </tr>
-                                </thead>
-                                <tbody id="cart_contents">
-                                    <?php if (count($cart) == 0) { ?>
-                                        <tr>
-                                            <td colspan="<?= (int) $cartColspan ?>">
-                                                <div class="alert alert-dismissible alert-info"><?= lang('Sales.no_items_in_cart') ?></div>
-                                            </td>
-                                        </tr>
-                                    <?php } else { ?>
-                                        <?php foreach (array_reverse($cart, true) as $line => $item) { ?>
-                                            <tr>
-                                                <td class="item-name-cell">
-                                                    <?= esc($item['name']) ?><br>
-                                                    <?= !empty($item['attribute_values']) ? esc($item['attribute_values']) : '' ?>
-                                                </td>
-                                                <?php if ($cartHasCustomerDisplay) { ?>
-                                                    <td class="price-cell">
-                                                        <?= to_secondary_currency((float)$item['price'], $secondaryCurrency) ?>
-                                                    </td>
-                                                <?php } ?>
-                                                <td class="price-cell">
-                                                    <?= to_currency($item['price']) ?>
-                                                </td>
-                                                <td class="price-cell">
-                                                    <?= to_quantity_decimals($item['quantity']) ?>
-                                                </td>
-                                                <td class="price-cell">
-                                                    <?= to_decimals($item['discount'], 0) ?>
-                                                </td>
-                                                <td class="price-cell">
-                                                    <?= $item['item_type'] == ITEM_AMOUNT_ENTRY ? to_currency_no_money($item['discounted_total']) : to_currency($item['discounted_total']) ?>
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td colspan="<?= $cartHasCustomerDisplay ? 3 : 2 ?>"></td>
-                                                <td class="serial-cell">
-                                                    <?= $item['is_serialized'] == 1 ? lang('Sales.serial') : '' ?>
-                                                </td>
-                                                <td colspan="2" class="serial-cell">
-                                                    <?php if ($item['is_serialized'] == 1) {
-                                                        echo esc($item['serialnumber']);
-                                                    } ?>
-                                                </td>
-                                            </tr>
-                                        <?php } ?>
-                                    <?php } ?>
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="customer-display-summary-column">
-                <div class="panel panel-primary customer-display-summary-panel">
-                    <div class="panel-heading"><?= lang('Sales.summary') ?></div>
-                    <div class="panel-body">
-                        <table class="table table-condensed summary-subtable">
-                            <tbody>
-                                <tr>
-                                    <th><?= lang('Sales.total') ?></th>
-                                    <td><?= to_currency($total) ?></td>
-                                </tr>
-                                <?php if ($showCustomerDisplay): ?>
-                                    <tr>
-                                        <th><?= lang('Sales.total') ?> <?= esc($customerDisplayCurrencyLabel) ?></th>
-                                        <td><?= to_secondary_currency((float)$total, $secondaryCurrency) ?></td>
-                                    </tr>
-                                    <tr class="rate-row">
-                                        <th><?= lang('Sales.rate') ?></th>
-                                        <td><?= number_format((float) $rate, 2) ?></td>
-                                    </tr>
-                                <?php endif; ?>
-                            </tbody>
-                        </table>
-
-                        <table class="table table-condensed summary-subtable" style="margin-top: 10px;">
-                            <tbody>
-                                <tr class="summary-section-row">
-                                    <th colspan="2"><?= lang('Sales.customer') ?></th>
-                                </tr>
-                                <tr>
-                                    <th><?= lang('Sales.customer_name') ?></th>
-                                    <td class="customer-name-value"><?= esc($customerName ?? lang('Sales.walk_in_customer')) ?></td>
-                                </tr>
-                                <tr>
-                                    <th><?= lang('Sales.giftcard_balance') ?></th>
-                                    <td class="giftcard-value"><?= to_currency((float) ($giftcardRemainder ?? 0)) ?></td>
-                                </tr>
-                                <tr>
-                                    <th><?= lang('Sales.loyalty_reward_points') ?></th>
-                                    <td class="reward-value"><?= esc((string)($customerRewardPoints ?? 0)) ?></td>
-                                </tr>
-                            </tbody>
-                        </table>
-
-                        <table class="table table-condensed summary-subtable" style="margin-top: 10px;">
-                            <tbody>
-                                <tr class="summary-section-row">
-                                    <th colspan="2"><?= lang('Sales.change') ?></th>
-                                </tr>
-                                <tr>
-                                    <th><?= lang('Sales.payments_total') ?></th>
-                                    <td><?= to_currency($payments_total) ?></td>
-                                </tr>
-                                <tr>
-                                    <th><?= lang('Sales.amount_due') ?></th>
-                                    <td><?= to_currency($amount_due) ?></td>
-                                </tr>
-                                <?php if ($showCustomerDisplay): ?>
-                                    <tr>
-                                        <th><?= lang('Sales.amount_due') ?> <?= esc($customerDisplayCurrencyLabel) ?></th>
-                                        <td><?= to_secondary_currency((float)$amount_due, $secondaryCurrency) ?></td>
-                                    </tr>
-                                <?php endif; ?>
-                                <tr>
-                                    <th><?= lang('Sales.change_due') ?></th>
-                                    <td><?= to_currency($paymentChangeDue ?? 0) ?></td>
-                                </tr>
-                                <?php if ($showCustomerDisplay): ?>
-                                    <tr>
-                                        <th><?= lang('Sales.change_due') ?> <?= esc($customerDisplayCurrencyLabel) ?></th>
-                                        <td><?= to_secondary_currency((float)($paymentChangeDue ?? 0), $secondaryCurrency) ?></td>
-                                    </tr>
-                                <?php endif; ?>
-                            </tbody>
-                        </table>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class="customer-display-footer"></div>
-    </div>
-
-<script>
-        const customerDisplayId = new URLSearchParams(window.location.search).get('displayId') || '';
-        const customerDisplayStorageSuffix = customerDisplayId !== '' ? '_' + customerDisplayId : '';
-        const customerDisplayStorageKeys = {
-            open: 'customerDisplayOpen' + customerDisplayStorageSuffix,
-            dirtyAt: 'customerDisplayDirtyAt' + customerDisplayStorageSuffix
-        };
-
-        localStorage.setItem(customerDisplayStorageKeys.open, '1');
-
-        let lastDirtyAt = localStorage.getItem(customerDisplayStorageKeys.dirtyAt) || '';
-        let refreshTimer = null;
-
-        const scheduleRefresh = function(dirtyAt) {
-            if (refreshTimer !== null) {
-                clearTimeout(refreshTimer);
-            }
-
-            refreshTimer = setTimeout(function() {
-                if (localStorage.getItem(customerDisplayStorageKeys.open) !== '1') {
-                    return;
-                }
-
-                if (localStorage.getItem(customerDisplayStorageKeys.dirtyAt) === dirtyAt) {
-                    window.location.reload();
-                }
-            }, 700);
-        };
-
-        const checkForRefresh = function() {
-            const dirtyAt = localStorage.getItem(customerDisplayStorageKeys.dirtyAt) || '';
-            if (dirtyAt !== '' && dirtyAt !== lastDirtyAt) {
-                lastDirtyAt = dirtyAt;
-                scheduleRefresh(dirtyAt);
-            }
-        };
-
-        window.addEventListener('storage', function(event) {
-            if (event.key === customerDisplayStorageKeys.dirtyAt) {
-                checkForRefresh();
-            }
-        });
-
-        setInterval(checkForRefresh, 500);
-
-        window.addEventListener('beforeunload', function() {
-            localStorage.removeItem(customerDisplayStorageKeys.open);
-        });
-    </script>
-
-</body>
-</html>
-
-
--- a/app/Views/sales/register.php
+++ b/app/Views/sales/register.php
Author	SHA1	Message	Date
jekkos	629de65e73	Merge branch 'master' into fix/4554-encryption-docker-issue	2026-05-22 16:08:37 +02:00
jekkos	5450404cb2	fix: cast string returns to int in MY_Migration (#4560 ) basename() returns string and database column values are strings, but get_latest_migration() and get_current_version() declare int return types. PHP 8.0+ enforces strict return types and no longer silently coerces strings to int, causing a TypeError on fresh installs. Fixes #4559 Co-authored-by: Ollama <ollama@steganos.dev>	2026-05-22 16:07:21 +02:00
Ollama	bf5af2f2dc	fix: address CodeRabbit review comments for encryption key persistence - Always mirror encryption key to both .env and WRITEPATH (Docker safety) - Guard array key access with isset() before reading in Encryption.php - Fix encrypt_value() to not treat string '0' as empty - Improve error logging for failed encryption attempts	2026-05-22 14:57:37 +02:00
Ollama	71c164ad18	Address CodeRabbit feedback: validate key length, clarify encryption failure handling - loadKeyFromWritable() now validates key length >= 64 before accepting - encrypt_value() renamed param, defaults to failing encryption required - Clearer error message when credentials not saved GitHub-Issue: #4554	2026-05-22 01:38:30 +02:00
Ollama	f7280ea83e	Refactor all encryption/decryption to use helper functions Replaces direct encrypter calls with decrypt_value() and encrypt_value() helpers throughout the codebase for consistent error handling: - Config controller: SMTP, SMS, Mailchimp credential encryption - Email_lib: SMTP password decryption - Sms_lib: SMS password decryption - Mailchimp_lib: API key decryption - Customers controller: Mailchimp list ID decryption Removes nullable EncrypterInterface property from Config controller as encryption is now handled via helper functions. GitHub-Issue: #4554	2026-05-22 01:28:35 +02:00
Ollama	26e8d9d80c	Add decrypt_value() and encrypt_value() helper functions Extracts the recurring decryption/encryption pattern into reusable helper functions with consistent error handling: - decrypt_value(): Safely decrypts encrypted values with try/catch - encrypt_value(): Safely encrypts values with error handling Both functions handle: - Empty/null values gracefully - Missing encryption key (logs warning) - Encryption/decryption failures (logs error, returns default) This pattern appears in 8+ locations across the codebase. GitHub-Issue: #4554	2026-05-22 01:28:30 +02:00
objecttothis	b7384296c1	Bugfix: Sale search in register not handling trailing space properly (#4557 ) * Fix is_valid_receipt method bug Strings submitted with a trailing space and no number caused an unhandled exception because Sale::exists() expects an int but a string was passed to it. - Add guards - Minor PSR refactor Signed-off-by: objec <objecttothis@gmail.com> * Address review comments Signed-off-by: objec <objecttothis@gmail.com> --------- Signed-off-by: objec <objecttothis@gmail.com>	2026-05-22 01:43:24 +04:00
Ollama	403180db7b	Add encryption_failed error message to language file Added localization string for encryption failure error messages. GitHub-Issue: #4554	2026-05-21 21:43:28 +02:00
Ollama	6d970953b6	Handle encryption unavailability gracefully in controllers Changed EncrypterInterface property to nullable and added proper error handling for cases where encryption key is not available. Changes: - Config controller: nullable encrypter property, try/catch around encryption - Email_lib: check encryption before using encrypter - Return meaningful error messages when encryption fails - Log warnings when passwords saved without encryption Users will now see clear error messages instead of unhandled exceptions when encryption key cannot be initialized. GitHub-Issue: #4554	2026-05-21 21:43:24 +02:00
Ollama	b2c2d350a7	Add fallback key loading from WRITEPATH in Encryption config When encryption key is not available from .env or environment variables, the config now attempts to load from WRITEPATH/config/encryption.key. This supports Docker environments where: - .env file is read-only or ephemeral - Key was persisted to the writable volume via check_encryption() GitHub-Issue: #4554	2026-05-21 21:43:18 +02:00
Ollama	9dc58a2c1f	Fix encryption key persistence for Docker environments The check_encryption() function now properly handles Docker/container environments where ROOTPATH/.env may be read-only or ephemeral. Changes: - Returns false when key persistence fails instead of always returning true - Removes error suppression (@) to properly detect write failures - Adds fallback to WRITEPATH/config/encryption.key for container volumes - Splits logic into separate functions for clarity and testability Fixes encryption key being lost on container restarts, which caused stored passwords to become undecryptable. GitHub-Issue: #4554	2026-05-21 21:43:14 +02:00